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

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

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

JavaEE6modelsWTP1a.patch (text/plain), 1.54 MB, created by Carl Anderson

on 2009-10-14 17:46:46 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2009-10-14 17:46:46 EDT

Size: 1.54 MB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee.core
>Index: jee-models/org/eclipse/jst/javaee/application/internal/impl/ModuleImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ModuleImpl.java,v
>retrieving revision 1.6
>diff -u -r1.6 ModuleImpl.java
>--- jee-models/org/eclipse/jst/javaee/application/internal/impl/ModuleImpl.java	4 Aug 2009 17:35:46 -0000	1.6
>+++ jee-models/org/eclipse/jst/javaee/application/internal/impl/ModuleImpl.java	14 Oct 2009 21:44:47 -0000
>@@ -109,7 +109,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Web web = null;
>+	protected Web web;
> 
> 	/**
> 	 * The default value of the '{@link #getAltDd() Alt Dd}' attribute.
>Index: jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationFactoryImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ApplicationFactoryImpl.java
>--- jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationFactoryImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationFactoryImpl.java	14 Oct 2009 21:44:47 -0000
>@@ -130,6 +130,7 @@
> 	 * @deprecated
> 	 * @generated
> 	 */
>+	@Deprecated
> 	public static ApplicationPackage getPackage() {
> 		return ApplicationPackage.eINSTANCE;
> 	}
>Index: jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 ApplicationPackageImpl.java
>--- jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java	14 Oct 2009 21:44:47 -0000
>@@ -41,6 +41,8 @@
> 
> import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
> 
>+import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
> import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
> 
> import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
>@@ -48,6 +50,10 @@
> import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
> 
> import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
>+import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
>+import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
> 
> /**
> * 
>@@ -111,20 +117,10 @@
> 	private static boolean isInited = false;
> 
> 	/**
>-	 * Creates, registers, and initializes the Package for this
>-	 * model, and for any others upon which it depends. Simple
>-	 * dependencies are satisfied by calling this method on all
>-	 * dependent packages before doing anything else. This method drives
>-	 * initialization for interdependent packages directly, in parallel
>-	 * with this package, itself.
>-	 * Of this package and its interdependencies, all packages which
>-	 * have not yet been registered by their URI values are first created
>-	 * and registered. The packages are then initialized in two steps:
>-	 * meta-model objects for all of the packages are created before any
>-	 * are initialized, since one package's meta-model objects may refer to
>-	 * those of another.
>-	 * Invocation of this method will not affect any packages that have
>-	 * already been initialized.
>+	 * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>+	 * 
>+	 * This method is used to initialize {@link ApplicationPackage#eINSTANCE} when that field is accessed.
>+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
> 	 * 
> 	 * 
> 	 * @see #eNS_URI
>@@ -136,7 +132,7 @@
> 		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());
>+		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ApplicationPackageImpl());
> 
> 		isInited = true;
> 
>@@ -145,31 +141,43 @@
> 		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);
>+		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
>+		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
> 		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
>+		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
>+		WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
>+		WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
> 
> 		// Create package meta-data objects
> 		theApplicationPackage.createPackageContents();
>-		theWebPackage.createPackageContents();
> 		theJavaeePackage.createPackageContents();
>-		theEjbPackage.createPackageContents();
> 		theApplicationclientPackage.createPackageContents();
>+		theJcaPackage.createPackageContents();
>+		theEjbPackage.createPackageContents();
> 		theJspPackage.createPackageContents();
>+		theWebPackage.createPackageContents();
>+		theWebappPackage.createPackageContents();
>+		theWebfragmentPackage.createPackageContents();
> 
> 		// Initialize created meta-data
> 		theApplicationPackage.initializePackageContents();
>-		theWebPackage.initializePackageContents();
> 		theJavaeePackage.initializePackageContents();
>-		theEjbPackage.initializePackageContents();
> 		theApplicationclientPackage.initializePackageContents();
>+		theJcaPackage.initializePackageContents();
>+		theEjbPackage.initializePackageContents();
> 		theJspPackage.initializePackageContents();
>+		theWebPackage.initializePackageContents();
>+		theWebappPackage.initializePackageContents();
>+		theWebfragmentPackage.initializePackageContents();
> 
> 		// Mark meta-data to indicate it can't be changed
> 		theApplicationPackage.freeze();
> 
>+ 
>+		// Update the registry and return the package
>+		EPackage.Registry.INSTANCE.put(ApplicationPackage.eNS_URI, theApplicationPackage);
> 		return theApplicationPackage;
> 	}
> 
>@@ -187,8 +195,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getApplication_ApplicationName() {
>+		return (EAttribute)applicationEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EReference getApplication_Descriptions() {
>-		return (EReference)applicationEClass.getEStructuralFeatures().get(0);
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -197,7 +214,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplication_DisplayNames() {
>-		return (EReference)applicationEClass.getEStructuralFeatures().get(1);
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -206,7 +223,16 @@
> 	 * @generated
> 	 */
> 	public EReference getApplication_Icons() {
>-		return (EReference)applicationEClass.getEStructuralFeatures().get(2);
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getApplication_InitializeInOrder() {
>+		return (EAttribute)applicationEClass.getEStructuralFeatures().get(4);
> 	}
> 
> 	/**
>@@ -215,7 +241,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplication_Modules() {
>-		return (EReference)applicationEClass.getEStructuralFeatures().get(3);
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(5);
> 	}
> 
> 	/**
>@@ -224,7 +250,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplication_SecurityRoles() {
>-		return (EReference)applicationEClass.getEStructuralFeatures().get(4);
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(6);
> 	}
> 
> 	/**
>@@ -233,7 +259,106 @@
> 	 * @generated
> 	 */
> 	public EAttribute getApplication_LibraryDirectory() {
>-		return (EAttribute)applicationEClass.getEStructuralFeatures().get(5);
>+		return (EAttribute)applicationEClass.getEStructuralFeatures().get(7);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getApplication_EnvEntry() {
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(8);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getApplication_EjbRef() {
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(9);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getApplication_EjbLocalRef() {
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(10);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getApplication_ServiceRefs() {
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(11);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getApplication_ResourceRef() {
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(12);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getApplication_ResourceEnvRef() {
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(13);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getApplication_MessageDestinationRef() {
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(14);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getApplication_PersistenceContextRef() {
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(15);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getApplication_PersistenceUnitRef() {
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(16);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getApplication_MessageDestination() {
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(17);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getApplication_DataSource() {
>+		return (EReference)applicationEClass.getEStructuralFeatures().get(18);
> 	}
> 
> 	/**
>@@ -242,7 +367,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getApplication_Id() {
>-		return (EAttribute)applicationEClass.getEStructuralFeatures().get(6);
>+		return (EAttribute)applicationEClass.getEStructuralFeatures().get(19);
> 	}
> 
> 	/**
>@@ -251,7 +376,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getApplication_Version() {
>-		return (EAttribute)applicationEClass.getEStructuralFeatures().get(7);
>+		return (EAttribute)applicationEClass.getEStructuralFeatures().get(20);
> 	}
> 
> 	/**
>@@ -427,12 +552,25 @@
> 
> 		// Create classes and their features
> 		applicationEClass = createEClass(APPLICATION);
>+		createEAttribute(applicationEClass, APPLICATION__APPLICATION_NAME);
> 		createEReference(applicationEClass, APPLICATION__DESCRIPTIONS);
> 		createEReference(applicationEClass, APPLICATION__DISPLAY_NAMES);
> 		createEReference(applicationEClass, APPLICATION__ICONS);
>+		createEAttribute(applicationEClass, APPLICATION__INITIALIZE_IN_ORDER);
> 		createEReference(applicationEClass, APPLICATION__MODULES);
> 		createEReference(applicationEClass, APPLICATION__SECURITY_ROLES);
> 		createEAttribute(applicationEClass, APPLICATION__LIBRARY_DIRECTORY);
>+		createEReference(applicationEClass, APPLICATION__ENV_ENTRY);
>+		createEReference(applicationEClass, APPLICATION__EJB_REF);
>+		createEReference(applicationEClass, APPLICATION__EJB_LOCAL_REF);
>+		createEReference(applicationEClass, APPLICATION__SERVICE_REFS);
>+		createEReference(applicationEClass, APPLICATION__RESOURCE_REF);
>+		createEReference(applicationEClass, APPLICATION__RESOURCE_ENV_REF);
>+		createEReference(applicationEClass, APPLICATION__MESSAGE_DESTINATION_REF);
>+		createEReference(applicationEClass, APPLICATION__PERSISTENCE_CONTEXT_REF);
>+		createEReference(applicationEClass, APPLICATION__PERSISTENCE_UNIT_REF);
>+		createEReference(applicationEClass, APPLICATION__MESSAGE_DESTINATION);
>+		createEReference(applicationEClass, APPLICATION__DATA_SOURCE);
> 		createEAttribute(applicationEClass, APPLICATION__ID);
> 		createEAttribute(applicationEClass, APPLICATION__VERSION);
> 
>@@ -480,21 +618,38 @@
> 		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);
>+		JavaeePackage theJavaeePackage = (JavaeePackage)EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI);
>+
>+		// Create type parameters
>+
>+		// Set bounds for type parameters
> 
> 		// 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$
>+		initEAttribute(getApplication_ApplicationName(), theXMLTypePackage.getToken(), "applicationName", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$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$
>+		initEAttribute(getApplication_InitializeInOrder(), theJavaeePackage.getGenericBooleanType(), "initializeInOrder", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, 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$
>+		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$
>+		initEReference(getApplication_EnvEntry(), theJavaeePackage.getEnvEntry(), null, "envEntry", 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_EjbRef(), theJavaeePackage.getEjbRef(), null, "ejbRef", 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_EjbLocalRef(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRef", 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_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", 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_ResourceRef(), theJavaeePackage.getResourceRef(), null, "resourceRef", 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_ResourceEnvRef(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRef", 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_MessageDestinationRef(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRef", 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_PersistenceContextRef(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRef", 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_PersistenceUnitRef(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRef", 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_MessageDestination(), theJavaeePackage.getMessageDestination(), null, "messageDestination", 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_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", 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_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", "6", 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$
>@@ -503,17 +658,17 @@
> 		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$
>+		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$
>+		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$
>+		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);
>@@ -537,6 +692,14 @@
> 		 new String[] {
> 			 "name", "applicationType", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getApplication_ApplicationName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "application-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getApplication_Descriptions(), 
>@@ -563,13 +726,21 @@
> 			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>+		 (getApplication_InitializeInOrder(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "initialize-in-order", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$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, 
>@@ -585,6 +756,94 @@
> 			 "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_EnvEntry(), 
>+		 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
>+		 (getApplication_EjbRef(), 
>+		 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
>+		 (getApplication_EjbLocalRef(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "ejb-local-ref", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getApplication_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
>+		 (getApplication_ResourceRef(), 
>+		 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
>+		 (getApplication_ResourceEnvRef(), 
>+		 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
>+		 (getApplication_MessageDestinationRef(), 
>+		 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
>+		 (getApplication_PersistenceContextRef(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "persistence-context-ref", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getApplication_PersistenceUnitRef(), 
>+		 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
>+		 (getApplication_MessageDestination(), 
>+		 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
>+		 (getApplication_DataSource(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "data-source", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getApplication_Id(), 
>Index: jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationDeploymentDescriptorImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationDeploymentDescriptorImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ApplicationDeploymentDescriptorImpl.java
>--- jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationDeploymentDescriptorImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationDeploymentDescriptorImpl.java	14 Oct 2009 21:44:47 -0000
>@@ -59,7 +59,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected FeatureMap mixed = null;
>+	protected FeatureMap mixed;
> 
> 	/**
> 	 * The cached value of the '{@link #getXMLNSPrefixMap() XMLNS Prefix Map}' map.
>@@ -69,7 +69,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EMap xMLNSPrefixMap = null;
>+	protected EMap<String, String> xMLNSPrefixMap;
> 
> 	/**
> 	 * The cached value of the '{@link #getXSISchemaLocation() XSI Schema Location}' map.
>@@ -79,7 +79,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EMap xSISchemaLocation = null;
>+	protected EMap<String, String> xSISchemaLocation;
> 
> 	/**
> 	 * 
>@@ -117,9 +117,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Map getXMLNSPrefixMap() {
>+	public Map<String, String> getXMLNSPrefixMap() {
> 		if (xMLNSPrefixMap == null) {
>-			xMLNSPrefixMap = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
>+			xMLNSPrefixMap = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
> 		}
> 		return xMLNSPrefixMap.map();
> 	}
>@@ -129,9 +129,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Map getXSISchemaLocation() {
>+	public Map<String, String> getXSISchemaLocation() {
> 		if (xSISchemaLocation == null) {
>-			xSISchemaLocation = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
>+			xSISchemaLocation = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
> 		}
> 		return xSISchemaLocation.map();
> 	}
>@@ -172,11 +172,11 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__MIXED:
>-				return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
> 			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>-				return ((InternalEList)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap()).basicRemove(otherEnd, msgs);
> 			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>-				return ((InternalEList)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap()).basicRemove(otherEnd, msgs);
> 			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION:
> 				return basicSetApplication(null, msgs);
> 		}
>@@ -195,10 +195,10 @@
> 				if (coreType) return getMixed();
> 				return ((FeatureMap.Internal)getMixed()).getWrapper();
> 			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>-				if (coreType) return ((EMap.InternalMapView)getXMLNSPrefixMap()).eMap();
>+				if (coreType) return ((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap();
> 				else return getXMLNSPrefixMap();
> 			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>-				if (coreType) return ((EMap.InternalMapView)getXSISchemaLocation()).eMap();
>+				if (coreType) return ((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap();
> 				else return getXSISchemaLocation();
> 			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION:
> 				return getApplication();
>@@ -218,10 +218,10 @@
> 				((FeatureMap.Internal)getMixed()).set(newValue);
> 				return;
> 			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).set(newValue);
>+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap()).set(newValue);
> 				return;
> 			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).set(newValue);
>+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap()).set(newValue);
> 				return;
> 			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR__APPLICATION:
> 				setApplication((Application)newValue);
>Index: jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ApplicationImpl.java
>--- jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationImpl.java	14 Oct 2009 21:44:47 -0000
>@@ -25,10 +25,22 @@
> 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.DataSourceType;
> import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.DisplayName;
>+import org.eclipse.jst.javaee.core.EjbLocalRef;
>+import org.eclipse.jst.javaee.core.EjbRef;
>+import org.eclipse.jst.javaee.core.EnvEntry;
>+import org.eclipse.jst.javaee.core.GenericBooleanType;
> import org.eclipse.jst.javaee.core.Icon;
>+import org.eclipse.jst.javaee.core.MessageDestination;
>+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.SecurityRole;
>+import org.eclipse.jst.javaee.core.ServiceRef;
> import org.eclipse.jst.jee.application.ICommonApplication;
> import org.eclipse.jst.jee.application.ICommonModule;
> import org.eclipse.wst.common.internal.emf.utilities.StringUtil;
>@@ -40,12 +52,25 @@
> * 
> * The following features are implemented:
> * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getApplicationName Application Name}</li>
> * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getDescriptions Descriptions}</li>
> * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getDisplayNames Display Names}</li>
> * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getIcons Icons}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getInitializeInOrder Initialize In Order}</li>
> * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getModules Modules}</li>
> * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getSecurityRoles Security Roles}</li>
> * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getLibraryDirectory Library Directory}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getEnvEntry Env Entry}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getEjbRef Ejb Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getEjbLocalRef Ejb Local Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getServiceRefs Service Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getResourceRef Resource Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getResourceEnvRef Resource Env Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getMessageDestinationRef Message Destination Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getPersistenceContextRef Persistence Context Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getPersistenceUnitRef Persistence Unit Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getMessageDestination Message Destination}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getDataSource Data Source}</li>
> * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getId Id}</li>
> * <li>{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationImpl#getVersion Version}</li>
> * </ul>
>@@ -55,6 +80,26 @@
> */
> public class ApplicationImpl extends EObjectImpl implements Application, ICommonApplication {
> 	/**
>+	 * The default value of the '{@link #getApplicationName() Application Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getApplicationName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String APPLICATION_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getApplicationName() Application Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getApplicationName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String applicationName = APPLICATION_NAME_EDEFAULT;
>+
>+	/**
> 	 * The cached value of the '{@link #getDescriptions() Descriptions}' containment reference list.
> 	 * 
> 	 * 
>@@ -62,7 +107,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>@@ -72,7 +117,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -82,7 +127,36 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
>+
>+	/**
>+	 * The default value of the '{@link #getInitializeInOrder() Initialize In Order}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getInitializeInOrder()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final GenericBooleanType INITIALIZE_IN_ORDER_EDEFAULT = GenericBooleanType.TRUE;
>+
>+	/**
>+	 * The cached value of the '{@link #getInitializeInOrder() Initialize In Order}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getInitializeInOrder()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected GenericBooleanType initializeInOrder = INITIALIZE_IN_ORDER_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Initialize In Order attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean initializeInOrderESet;
> 
> 	/**
> 	 * The cached value of the '{@link #getModules() Modules}' containment reference list.
>@@ -92,7 +166,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList modules = null;
>+	protected EList<Module> modules;
> 
> 	/**
> 	 * The cached value of the '{@link #getSecurityRoles() Security Roles}' containment reference list.
>@@ -102,7 +176,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList securityRoles = null;
>+	protected EList<SecurityRole> securityRoles;
> 
> 	/**
> 	 * The default value of the '{@link #getLibraryDirectory() Library Directory}' attribute.
>@@ -125,6 +199,116 @@
> 	protected String libraryDirectory = LIBRARY_DIRECTORY_EDEFAULT;
> 
> 	/**
>+	 * The cached value of the '{@link #getEnvEntry() Env Entry}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getEnvEntry()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<EnvEntry> envEntry;
>+
>+	/**
>+	 * The cached value of the '{@link #getEjbRef() Ejb Ref}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getEjbRef()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<EjbRef> ejbRef;
>+
>+	/**
>+	 * The cached value of the '{@link #getEjbLocalRef() Ejb Local Ref}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getEjbLocalRef()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<EjbLocalRef> ejbLocalRef;
>+
>+	/**
>+	 * The cached value of the '{@link #getServiceRefs() Service Refs}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getServiceRefs()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ServiceRef> serviceRefs;
>+
>+	/**
>+	 * The cached value of the '{@link #getResourceRef() Resource Ref}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getResourceRef()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ResourceRef> resourceRef;
>+
>+	/**
>+	 * The cached value of the '{@link #getResourceEnvRef() Resource Env Ref}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getResourceEnvRef()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ResourceEnvRef> resourceEnvRef;
>+
>+	/**
>+	 * The cached value of the '{@link #getMessageDestinationRef() Message Destination Ref}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getMessageDestinationRef()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<MessageDestinationRef> messageDestinationRef;
>+
>+	/**
>+	 * The cached value of the '{@link #getPersistenceContextRef() Persistence Context Ref}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getPersistenceContextRef()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<PersistenceContextRef> persistenceContextRef;
>+
>+	/**
>+	 * The cached value of the '{@link #getPersistenceUnitRef() Persistence Unit Ref}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getPersistenceUnitRef()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<PersistenceUnitRef> persistenceUnitRef;
>+
>+	/**
>+	 * The cached value of the '{@link #getMessageDestination() Message Destination}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getMessageDestination()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<MessageDestination> messageDestination;
>+
>+	/**
>+	 * The cached value of the '{@link #getDataSource() Data Source}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDataSource()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<DataSourceType> dataSource;
>+
>+	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
> 	 * 
> 	 * 
>@@ -152,7 +336,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected static final String VERSION_EDEFAULT = "5"; //$NON-NLS-1$
>+	protected static final String VERSION_EDEFAULT = "6"; //$NON-NLS-1$
> 
> 	/**
> 	 * The cached value of the '{@link #getVersion() Version}' attribute.
>@@ -171,7 +355,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean versionESet = false;
>+	protected boolean versionESet;
> 
> 	/**
> 	 * 
>@@ -197,9 +381,30 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public String getApplicationName() {
>+		return applicationName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setApplicationName(String newApplicationName) {
>+		String oldApplicationName = applicationName;
>+		applicationName = newApplicationName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.APPLICATION__APPLICATION_NAME, oldApplicationName, applicationName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, ApplicationPackage.APPLICATION__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, ApplicationPackage.APPLICATION__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -209,9 +414,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, ApplicationPackage.APPLICATION__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, ApplicationPackage.APPLICATION__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -221,9 +426,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, ApplicationPackage.APPLICATION__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, ApplicationPackage.APPLICATION__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -233,9 +438,55 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getModules() {
>+	public GenericBooleanType getInitializeInOrder() {
>+		return initializeInOrder;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setInitializeInOrder(GenericBooleanType newInitializeInOrder) {
>+		GenericBooleanType oldInitializeInOrder = initializeInOrder;
>+		initializeInOrder = newInitializeInOrder == null ? INITIALIZE_IN_ORDER_EDEFAULT : newInitializeInOrder;
>+		boolean oldInitializeInOrderESet = initializeInOrderESet;
>+		initializeInOrderESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationPackage.APPLICATION__INITIALIZE_IN_ORDER, oldInitializeInOrder, initializeInOrder, !oldInitializeInOrderESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetInitializeInOrder() {
>+		GenericBooleanType oldInitializeInOrder = initializeInOrder;
>+		boolean oldInitializeInOrderESet = initializeInOrderESet;
>+		initializeInOrder = INITIALIZE_IN_ORDER_EDEFAULT;
>+		initializeInOrderESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, ApplicationPackage.APPLICATION__INITIALIZE_IN_ORDER, oldInitializeInOrder, INITIALIZE_IN_ORDER_EDEFAULT, oldInitializeInOrderESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetInitializeInOrder() {
>+		return initializeInOrderESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Module> getModules() {
> 		if (modules == null) {
>-			modules = new EObjectContainmentEList(Module.class, this, ApplicationPackage.APPLICATION__MODULES);
>+			modules = new EObjectContainmentEList<Module>(Module.class, this, ApplicationPackage.APPLICATION__MODULES);
> 		}
> 		return modules;
> 	}
>@@ -245,9 +496,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getSecurityRoles() {
>+	public List<SecurityRole> getSecurityRoles() {
> 		if (securityRoles == null) {
>-			securityRoles = new EObjectContainmentEList(SecurityRole.class, this, ApplicationPackage.APPLICATION__SECURITY_ROLES);
>+			securityRoles = new EObjectContainmentEList<SecurityRole>(SecurityRole.class, this, ApplicationPackage.APPLICATION__SECURITY_ROLES);
> 		}
> 		return securityRoles;
> 	}
>@@ -278,6 +529,138 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public List<EnvEntry> getEnvEntry() {
>+		if (envEntry == null) {
>+			envEntry = new EObjectContainmentEList<EnvEntry>(EnvEntry.class, this, ApplicationPackage.APPLICATION__ENV_ENTRY);
>+		}
>+		return envEntry;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<EjbRef> getEjbRef() {
>+		if (ejbRef == null) {
>+			ejbRef = new EObjectContainmentEList<EjbRef>(EjbRef.class, this, ApplicationPackage.APPLICATION__EJB_REF);
>+		}
>+		return ejbRef;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<EjbLocalRef> getEjbLocalRef() {
>+		if (ejbLocalRef == null) {
>+			ejbLocalRef = new EObjectContainmentEList<EjbLocalRef>(EjbLocalRef.class, this, ApplicationPackage.APPLICATION__EJB_LOCAL_REF);
>+		}
>+		return ejbLocalRef;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ServiceRef> getServiceRefs() {
>+		if (serviceRefs == null) {
>+			serviceRefs = new EObjectContainmentEList<ServiceRef>(ServiceRef.class, this, ApplicationPackage.APPLICATION__SERVICE_REFS);
>+		}
>+		return serviceRefs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ResourceRef> getResourceRef() {
>+		if (resourceRef == null) {
>+			resourceRef = new EObjectContainmentEList<ResourceRef>(ResourceRef.class, this, ApplicationPackage.APPLICATION__RESOURCE_REF);
>+		}
>+		return resourceRef;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ResourceEnvRef> getResourceEnvRef() {
>+		if (resourceEnvRef == null) {
>+			resourceEnvRef = new EObjectContainmentEList<ResourceEnvRef>(ResourceEnvRef.class, this, ApplicationPackage.APPLICATION__RESOURCE_ENV_REF);
>+		}
>+		return resourceEnvRef;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<MessageDestinationRef> getMessageDestinationRef() {
>+		if (messageDestinationRef == null) {
>+			messageDestinationRef = new EObjectContainmentEList<MessageDestinationRef>(MessageDestinationRef.class, this, ApplicationPackage.APPLICATION__MESSAGE_DESTINATION_REF);
>+		}
>+		return messageDestinationRef;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<PersistenceContextRef> getPersistenceContextRef() {
>+		if (persistenceContextRef == null) {
>+			persistenceContextRef = new EObjectContainmentEList<PersistenceContextRef>(PersistenceContextRef.class, this, ApplicationPackage.APPLICATION__PERSISTENCE_CONTEXT_REF);
>+		}
>+		return persistenceContextRef;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<PersistenceUnitRef> getPersistenceUnitRef() {
>+		if (persistenceUnitRef == null) {
>+			persistenceUnitRef = new EObjectContainmentEList<PersistenceUnitRef>(PersistenceUnitRef.class, this, ApplicationPackage.APPLICATION__PERSISTENCE_UNIT_REF);
>+		}
>+		return persistenceUnitRef;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<MessageDestination> getMessageDestination() {
>+		if (messageDestination == null) {
>+			messageDestination = new EObjectContainmentEList<MessageDestination>(MessageDestination.class, this, ApplicationPackage.APPLICATION__MESSAGE_DESTINATION);
>+		}
>+		return messageDestination;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<DataSourceType> getDataSource() {
>+		if (dataSource == null) {
>+			dataSource = new EObjectContainmentEList<DataSourceType>(DataSourceType.class, this, ApplicationPackage.APPLICATION__DATA_SOURCE);
>+		}
>+		return dataSource;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -349,15 +732,37 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case ApplicationPackage.APPLICATION__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 			case ApplicationPackage.APPLICATION__MODULES:
>-				return ((InternalEList)getModules()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getModules()).basicRemove(otherEnd, msgs);
> 			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
>-				return ((InternalEList)getSecurityRoles()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getSecurityRoles()).basicRemove(otherEnd, msgs);
>+			case ApplicationPackage.APPLICATION__ENV_ENTRY:
>+				return ((InternalEList<?>)getEnvEntry()).basicRemove(otherEnd, msgs);
>+			case ApplicationPackage.APPLICATION__EJB_REF:
>+				return ((InternalEList<?>)getEjbRef()).basicRemove(otherEnd, msgs);
>+			case ApplicationPackage.APPLICATION__EJB_LOCAL_REF:
>+				return ((InternalEList<?>)getEjbLocalRef()).basicRemove(otherEnd, msgs);
>+			case ApplicationPackage.APPLICATION__SERVICE_REFS:
>+				return ((InternalEList<?>)getServiceRefs()).basicRemove(otherEnd, msgs);
>+			case ApplicationPackage.APPLICATION__RESOURCE_REF:
>+				return ((InternalEList<?>)getResourceRef()).basicRemove(otherEnd, msgs);
>+			case ApplicationPackage.APPLICATION__RESOURCE_ENV_REF:
>+				return ((InternalEList<?>)getResourceEnvRef()).basicRemove(otherEnd, msgs);
>+			case ApplicationPackage.APPLICATION__MESSAGE_DESTINATION_REF:
>+				return ((InternalEList<?>)getMessageDestinationRef()).basicRemove(otherEnd, msgs);
>+			case ApplicationPackage.APPLICATION__PERSISTENCE_CONTEXT_REF:
>+				return ((InternalEList<?>)getPersistenceContextRef()).basicRemove(otherEnd, msgs);
>+			case ApplicationPackage.APPLICATION__PERSISTENCE_UNIT_REF:
>+				return ((InternalEList<?>)getPersistenceUnitRef()).basicRemove(otherEnd, msgs);
>+			case ApplicationPackage.APPLICATION__MESSAGE_DESTINATION:
>+				return ((InternalEList<?>)getMessageDestination()).basicRemove(otherEnd, msgs);
>+			case ApplicationPackage.APPLICATION__DATA_SOURCE:
>+				return ((InternalEList<?>)getDataSource()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -370,18 +775,44 @@
> 	@Override
> 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
> 		switch (featureID) {
>+			case ApplicationPackage.APPLICATION__APPLICATION_NAME:
>+				return getApplicationName();
> 			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
> 				return getDescriptions();
> 			case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
> 				return getDisplayNames();
> 			case ApplicationPackage.APPLICATION__ICONS:
> 				return getIcons();
>+			case ApplicationPackage.APPLICATION__INITIALIZE_IN_ORDER:
>+				return getInitializeInOrder();
> 			case ApplicationPackage.APPLICATION__MODULES:
> 				return getModules();
> 			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
> 				return getSecurityRoles();
> 			case ApplicationPackage.APPLICATION__LIBRARY_DIRECTORY:
> 				return getLibraryDirectory();
>+			case ApplicationPackage.APPLICATION__ENV_ENTRY:
>+				return getEnvEntry();
>+			case ApplicationPackage.APPLICATION__EJB_REF:
>+				return getEjbRef();
>+			case ApplicationPackage.APPLICATION__EJB_LOCAL_REF:
>+				return getEjbLocalRef();
>+			case ApplicationPackage.APPLICATION__SERVICE_REFS:
>+				return getServiceRefs();
>+			case ApplicationPackage.APPLICATION__RESOURCE_REF:
>+				return getResourceRef();
>+			case ApplicationPackage.APPLICATION__RESOURCE_ENV_REF:
>+				return getResourceEnvRef();
>+			case ApplicationPackage.APPLICATION__MESSAGE_DESTINATION_REF:
>+				return getMessageDestinationRef();
>+			case ApplicationPackage.APPLICATION__PERSISTENCE_CONTEXT_REF:
>+				return getPersistenceContextRef();
>+			case ApplicationPackage.APPLICATION__PERSISTENCE_UNIT_REF:
>+				return getPersistenceUnitRef();
>+			case ApplicationPackage.APPLICATION__MESSAGE_DESTINATION:
>+				return getMessageDestination();
>+			case ApplicationPackage.APPLICATION__DATA_SOURCE:
>+				return getDataSource();
> 			case ApplicationPackage.APPLICATION__ID:
> 				return getId();
> 			case ApplicationPackage.APPLICATION__VERSION:
>@@ -395,32 +826,83 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
>+			case ApplicationPackage.APPLICATION__APPLICATION_NAME:
>+				setApplicationName((String)newValue);
>+				return;
> 			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case ApplicationPackage.APPLICATION__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
>+				return;
>+			case ApplicationPackage.APPLICATION__INITIALIZE_IN_ORDER:
>+				setInitializeInOrder((GenericBooleanType)newValue);
> 				return;
> 			case ApplicationPackage.APPLICATION__MODULES:
> 				getModules().clear();
>-				getModules().addAll((Collection)newValue);
>+				getModules().addAll((Collection<? extends Module>)newValue);
> 				return;
> 			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
> 				getSecurityRoles().clear();
>-				getSecurityRoles().addAll((Collection)newValue);
>+				getSecurityRoles().addAll((Collection<? extends SecurityRole>)newValue);
> 				return;
> 			case ApplicationPackage.APPLICATION__LIBRARY_DIRECTORY:
> 				setLibraryDirectory((String)newValue);
> 				return;
>+			case ApplicationPackage.APPLICATION__ENV_ENTRY:
>+				getEnvEntry().clear();
>+				getEnvEntry().addAll((Collection<? extends EnvEntry>)newValue);
>+				return;
>+			case ApplicationPackage.APPLICATION__EJB_REF:
>+				getEjbRef().clear();
>+				getEjbRef().addAll((Collection<? extends EjbRef>)newValue);
>+				return;
>+			case ApplicationPackage.APPLICATION__EJB_LOCAL_REF:
>+				getEjbLocalRef().clear();
>+				getEjbLocalRef().addAll((Collection<? extends EjbLocalRef>)newValue);
>+				return;
>+			case ApplicationPackage.APPLICATION__SERVICE_REFS:
>+				getServiceRefs().clear();
>+				getServiceRefs().addAll((Collection<? extends ServiceRef>)newValue);
>+				return;
>+			case ApplicationPackage.APPLICATION__RESOURCE_REF:
>+				getResourceRef().clear();
>+				getResourceRef().addAll((Collection<? extends ResourceRef>)newValue);
>+				return;
>+			case ApplicationPackage.APPLICATION__RESOURCE_ENV_REF:
>+				getResourceEnvRef().clear();
>+				getResourceEnvRef().addAll((Collection<? extends ResourceEnvRef>)newValue);
>+				return;
>+			case ApplicationPackage.APPLICATION__MESSAGE_DESTINATION_REF:
>+				getMessageDestinationRef().clear();
>+				getMessageDestinationRef().addAll((Collection<? extends MessageDestinationRef>)newValue);
>+				return;
>+			case ApplicationPackage.APPLICATION__PERSISTENCE_CONTEXT_REF:
>+				getPersistenceContextRef().clear();
>+				getPersistenceContextRef().addAll((Collection<? extends PersistenceContextRef>)newValue);
>+				return;
>+			case ApplicationPackage.APPLICATION__PERSISTENCE_UNIT_REF:
>+				getPersistenceUnitRef().clear();
>+				getPersistenceUnitRef().addAll((Collection<? extends PersistenceUnitRef>)newValue);
>+				return;
>+			case ApplicationPackage.APPLICATION__MESSAGE_DESTINATION:
>+				getMessageDestination().clear();
>+				getMessageDestination().addAll((Collection<? extends MessageDestination>)newValue);
>+				return;
>+			case ApplicationPackage.APPLICATION__DATA_SOURCE:
>+				getDataSource().clear();
>+				getDataSource().addAll((Collection<? extends DataSourceType>)newValue);
>+				return;
> 			case ApplicationPackage.APPLICATION__ID:
> 				setId((String)newValue);
> 				return;
>@@ -439,6 +921,9 @@
> 	@Override
> 	public void eUnset(int featureID) {
> 		switch (featureID) {
>+			case ApplicationPackage.APPLICATION__APPLICATION_NAME:
>+				setApplicationName(APPLICATION_NAME_EDEFAULT);
>+				return;
> 			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
> 				getDescriptions().clear();
> 				return;
>@@ -448,6 +933,9 @@
> 			case ApplicationPackage.APPLICATION__ICONS:
> 				getIcons().clear();
> 				return;
>+			case ApplicationPackage.APPLICATION__INITIALIZE_IN_ORDER:
>+				unsetInitializeInOrder();
>+				return;
> 			case ApplicationPackage.APPLICATION__MODULES:
> 				getModules().clear();
> 				return;
>@@ -457,6 +945,39 @@
> 			case ApplicationPackage.APPLICATION__LIBRARY_DIRECTORY:
> 				setLibraryDirectory(LIBRARY_DIRECTORY_EDEFAULT);
> 				return;
>+			case ApplicationPackage.APPLICATION__ENV_ENTRY:
>+				getEnvEntry().clear();
>+				return;
>+			case ApplicationPackage.APPLICATION__EJB_REF:
>+				getEjbRef().clear();
>+				return;
>+			case ApplicationPackage.APPLICATION__EJB_LOCAL_REF:
>+				getEjbLocalRef().clear();
>+				return;
>+			case ApplicationPackage.APPLICATION__SERVICE_REFS:
>+				getServiceRefs().clear();
>+				return;
>+			case ApplicationPackage.APPLICATION__RESOURCE_REF:
>+				getResourceRef().clear();
>+				return;
>+			case ApplicationPackage.APPLICATION__RESOURCE_ENV_REF:
>+				getResourceEnvRef().clear();
>+				return;
>+			case ApplicationPackage.APPLICATION__MESSAGE_DESTINATION_REF:
>+				getMessageDestinationRef().clear();
>+				return;
>+			case ApplicationPackage.APPLICATION__PERSISTENCE_CONTEXT_REF:
>+				getPersistenceContextRef().clear();
>+				return;
>+			case ApplicationPackage.APPLICATION__PERSISTENCE_UNIT_REF:
>+				getPersistenceUnitRef().clear();
>+				return;
>+			case ApplicationPackage.APPLICATION__MESSAGE_DESTINATION:
>+				getMessageDestination().clear();
>+				return;
>+			case ApplicationPackage.APPLICATION__DATA_SOURCE:
>+				getDataSource().clear();
>+				return;
> 			case ApplicationPackage.APPLICATION__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -475,18 +996,44 @@
> 	@Override
> 	public boolean eIsSet(int featureID) {
> 		switch (featureID) {
>+			case ApplicationPackage.APPLICATION__APPLICATION_NAME:
>+				return APPLICATION_NAME_EDEFAULT == null ? applicationName != null : !APPLICATION_NAME_EDEFAULT.equals(applicationName);
> 			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__INITIALIZE_IN_ORDER:
>+				return isSetInitializeInOrder();
> 			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__ENV_ENTRY:
>+				return envEntry != null && !envEntry.isEmpty();
>+			case ApplicationPackage.APPLICATION__EJB_REF:
>+				return ejbRef != null && !ejbRef.isEmpty();
>+			case ApplicationPackage.APPLICATION__EJB_LOCAL_REF:
>+				return ejbLocalRef != null && !ejbLocalRef.isEmpty();
>+			case ApplicationPackage.APPLICATION__SERVICE_REFS:
>+				return serviceRefs != null && !serviceRefs.isEmpty();
>+			case ApplicationPackage.APPLICATION__RESOURCE_REF:
>+				return resourceRef != null && !resourceRef.isEmpty();
>+			case ApplicationPackage.APPLICATION__RESOURCE_ENV_REF:
>+				return resourceEnvRef != null && !resourceEnvRef.isEmpty();
>+			case ApplicationPackage.APPLICATION__MESSAGE_DESTINATION_REF:
>+				return messageDestinationRef != null && !messageDestinationRef.isEmpty();
>+			case ApplicationPackage.APPLICATION__PERSISTENCE_CONTEXT_REF:
>+				return persistenceContextRef != null && !persistenceContextRef.isEmpty();
>+			case ApplicationPackage.APPLICATION__PERSISTENCE_UNIT_REF:
>+				return persistenceUnitRef != null && !persistenceUnitRef.isEmpty();
>+			case ApplicationPackage.APPLICATION__MESSAGE_DESTINATION:
>+				return messageDestination != null && !messageDestination.isEmpty();
>+			case ApplicationPackage.APPLICATION__DATA_SOURCE:
>+				return dataSource != null && !dataSource.isEmpty();
> 			case ApplicationPackage.APPLICATION__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 			case ApplicationPackage.APPLICATION__VERSION:
>@@ -505,7 +1052,11 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (libraryDirectory: "); //$NON-NLS-1$
>+		result.append(" (applicationName: "); //$NON-NLS-1$
>+		result.append(applicationName);
>+		result.append(", initializeInOrder: "); //$NON-NLS-1$
>+		if (initializeInOrderESet) result.append(initializeInOrder); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", libraryDirectory: "); //$NON-NLS-1$
> 		result.append(libraryDirectory);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
>Index: jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 ApplicationclientPackageImpl.java
>--- jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java	26 Jul 2007 16:56:13 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java	14 Oct 2009 21:44:47 -0000
>@@ -39,6 +39,8 @@
> 
> import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
> 
>+import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
> import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
> 
> import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
>@@ -46,6 +48,10 @@
> import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
> 
> import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
>+import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
>+import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
> 
> /**
> * 
>@@ -95,20 +101,10 @@
> 	private static boolean isInited = false;
> 
> 	/**
>-	 * Creates, registers, and initializes the Package for this
>-	 * model, and for any others upon which it depends. Simple
>-	 * dependencies are satisfied by calling this method on all
>-	 * dependent packages before doing anything else. This method drives
>-	 * initialization for interdependent packages directly, in parallel
>-	 * with this package, itself.
>-	 * Of this package and its interdependencies, all packages which
>-	 * have not yet been registered by their URI values are first created
>-	 * and registered. The packages are then initialized in two steps:
>-	 * meta-model objects for all of the packages are created before any
>-	 * are initialized, since one package's meta-model objects may refer to
>-	 * those of another.
>-	 * Invocation of this method will not affect any packages that have
>-	 * already been initialized.
>+	 * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>+	 * 
>+	 * This method is used to initialize {@link ApplicationclientPackage#eINSTANCE} when that field is accessed.
>+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
> 	 * 
> 	 * 
> 	 * @see #eNS_URI
>@@ -120,7 +116,7 @@
> 		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());
>+		ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ApplicationclientPackageImpl());
> 
> 		isInited = true;
> 
>@@ -129,31 +125,43 @@
> 		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);
>+		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
> 		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
> 		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
>+		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
>+		WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
>+		WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
> 
> 		// Create package meta-data objects
> 		theApplicationclientPackage.createPackageContents();
>-		theWebPackage.createPackageContents();
> 		theApplicationPackage.createPackageContents();
> 		theJavaeePackage.createPackageContents();
>+		theJcaPackage.createPackageContents();
> 		theEjbPackage.createPackageContents();
> 		theJspPackage.createPackageContents();
>+		theWebPackage.createPackageContents();
>+		theWebappPackage.createPackageContents();
>+		theWebfragmentPackage.createPackageContents();
> 
> 		// Initialize created meta-data
> 		theApplicationclientPackage.initializePackageContents();
>-		theWebPackage.initializePackageContents();
> 		theApplicationPackage.initializePackageContents();
> 		theJavaeePackage.initializePackageContents();
>+		theJcaPackage.initializePackageContents();
> 		theEjbPackage.initializePackageContents();
> 		theJspPackage.initializePackageContents();
>+		theWebPackage.initializePackageContents();
>+		theWebappPackage.initializePackageContents();
>+		theWebfragmentPackage.initializePackageContents();
> 
> 		// Mark meta-data to indicate it can't be changed
> 		theApplicationclientPackage.freeze();
> 
>+ 
>+		// Update the registry and return the package
>+		EPackage.Registry.INSTANCE.put(ApplicationclientPackage.eNS_URI, theApplicationclientPackage);
> 		return theApplicationclientPackage;
> 	}
> 
>@@ -171,8 +179,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getApplicationClient_ModuleName() {
>+		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EReference getApplicationClient_Descriptions() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(0);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -181,7 +198,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplicationClient_DisplayNames() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(1);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -190,7 +207,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplicationClient_Icons() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(2);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -199,7 +216,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplicationClient_EnvEntries() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(3);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(4);
> 	}
> 
> 	/**
>@@ -208,7 +225,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplicationClient_EjbRefs() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(4);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(5);
> 	}
> 
> 	/**
>@@ -217,7 +234,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplicationClient_ServiceRefs() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(5);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(6);
> 	}
> 
> 	/**
>@@ -226,7 +243,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplicationClient_ResourceRefs() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(6);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(7);
> 	}
> 
> 	/**
>@@ -235,7 +252,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplicationClient_ResourceEnvRefs() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(7);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(8);
> 	}
> 
> 	/**
>@@ -244,7 +261,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplicationClient_MessageDestinationRefs() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(8);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(9);
> 	}
> 
> 	/**
>@@ -253,7 +270,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplicationClient_PersistenceUnitRefs() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(9);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(10);
> 	}
> 
> 	/**
>@@ -262,7 +279,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplicationClient_PostConstructs() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(10);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(11);
> 	}
> 
> 	/**
>@@ -271,7 +288,7 @@
> 	 * @generated
> 	 */
> 	public EReference getApplicationClient_PreDestroys() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(11);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(12);
> 	}
> 
> 	/**
>@@ -280,7 +297,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getApplicationClient_CallbackHandler() {
>-		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(12);
>+		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(13);
> 	}
> 
> 	/**
>@@ -289,7 +306,16 @@
> 	 * @generated
> 	 */
> 	public EReference getApplicationClient_MessageDestinations() {
>-		return (EReference)applicationClientEClass.getEStructuralFeatures().get(13);
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(14);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getApplicationClient_DataSource() {
>+		return (EReference)applicationClientEClass.getEStructuralFeatures().get(15);
> 	}
> 
> 	/**
>@@ -298,7 +324,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getApplicationClient_Id() {
>-		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(14);
>+		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(16);
> 	}
> 
> 	/**
>@@ -307,7 +333,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getApplicationClient_MetadataComplete() {
>-		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(15);
>+		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(17);
> 	}
> 
> 	/**
>@@ -316,7 +342,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getApplicationClient_Version() {
>-		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(16);
>+		return (EAttribute)applicationClientEClass.getEStructuralFeatures().get(18);
> 	}
> 
> 	/**
>@@ -393,6 +419,7 @@
> 
> 		// Create classes and their features
> 		applicationClientEClass = createEClass(APPLICATION_CLIENT);
>+		createEAttribute(applicationClientEClass, APPLICATION_CLIENT__MODULE_NAME);
> 		createEReference(applicationClientEClass, APPLICATION_CLIENT__DESCRIPTIONS);
> 		createEReference(applicationClientEClass, APPLICATION_CLIENT__DISPLAY_NAMES);
> 		createEReference(applicationClientEClass, APPLICATION_CLIENT__ICONS);
>@@ -407,6 +434,7 @@
> 		createEReference(applicationClientEClass, APPLICATION_CLIENT__PRE_DESTROYS);
> 		createEAttribute(applicationClientEClass, APPLICATION_CLIENT__CALLBACK_HANDLER);
> 		createEReference(applicationClientEClass, APPLICATION_CLIENT__MESSAGE_DESTINATIONS);
>+		createEReference(applicationClientEClass, APPLICATION_CLIENT__DATA_SOURCE);
> 		createEAttribute(applicationClientEClass, APPLICATION_CLIENT__ID);
> 		createEAttribute(applicationClientEClass, APPLICATION_CLIENT__METADATA_COMPLETE);
> 		createEAttribute(applicationClientEClass, APPLICATION_CLIENT__VERSION);
>@@ -442,13 +470,18 @@
> 		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);
>+		JavaeePackage theJavaeePackage = (JavaeePackage)EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI);
>+
>+		// Create type parameters
>+
>+		// Set bounds for type parameters
> 
> 		// 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$
>+		initEAttribute(getApplicationClient_ModuleName(), theXMLTypePackage.getToken(), "moduleName", 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_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$
>@@ -461,11 +494,12 @@
> 		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$
>+		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$
>+		initEReference(getApplicationClient_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", 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", "6", 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$
>@@ -495,6 +529,14 @@
> 		 new String[] {
> 			 "name", "application-clientType", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getApplicationClient_ModuleName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "module-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getApplicationClient_Descriptions(), 
>@@ -607,6 +649,14 @@
> 			 "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_DataSource(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "data-source", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getApplicationClient_Id(), 
>Index: jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ApplicationClientImpl.java
>--- jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientImpl.java	14 Oct 2009 21:44:47 -0000
>@@ -31,6 +31,7 @@
> 
> import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
> 
>+import org.eclipse.jst.javaee.core.DataSourceType;
> import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.DisplayName;
> import org.eclipse.jst.javaee.core.EjbRef;
>@@ -51,6 +52,7 @@
> * 
> * The following features are implemented:
> * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getModuleName Module Name}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getDescriptions Descriptions}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getDisplayNames Display Names}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getIcons Icons}</li>
>@@ -65,6 +67,7 @@
> * <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getPreDestroys Pre Destroys}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getCallbackHandler Callback Handler}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getMessageDestinations Message Destinations}</li>
>+ * <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getDataSource Data Source}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getId Id}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#isMetadataComplete Metadata Complete}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientImpl#getVersion Version}</li>
>@@ -75,6 +78,26 @@
> */
> public class ApplicationClientImpl extends EObjectImpl implements ApplicationClient {
> 	/**
>+	 * The default value of the '{@link #getModuleName() Module Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getModuleName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String MODULE_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getModuleName() Module Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getModuleName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String moduleName = MODULE_NAME_EDEFAULT;
>+
>+	/**
> 	 * The cached value of the '{@link #getDescriptions() Descriptions}' containment reference list.
> 	 * 
> 	 * 
>@@ -82,7 +105,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>@@ -92,7 +115,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -102,7 +125,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
> 
> 	/**
> 	 * The cached value of the '{@link #getEnvEntries() Env Entries}' containment reference list.
>@@ -112,7 +135,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList envEntries = null;
>+	protected EList<EnvEntry> envEntries;
> 
> 	/**
> 	 * The cached value of the '{@link #getEjbRefs() Ejb Refs}' containment reference list.
>@@ -122,7 +145,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList ejbRefs = null;
>+	protected EList<EjbRef> ejbRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getServiceRefs() Service Refs}' containment reference list.
>@@ -132,7 +155,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList serviceRefs = null;
>+	protected EList<ServiceRef> serviceRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getResourceRefs() Resource Refs}' containment reference list.
>@@ -142,7 +165,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList resourceRefs = null;
>+	protected EList<ResourceRef> resourceRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getResourceEnvRefs() Resource Env Refs}' containment reference list.
>@@ -152,7 +175,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList resourceEnvRefs = null;
>+	protected EList<ResourceEnvRef> resourceEnvRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getMessageDestinationRefs() Message Destination Refs}' containment reference list.
>@@ -162,7 +185,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList messageDestinationRefs = null;
>+	protected EList<MessageDestinationRef> messageDestinationRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPersistenceUnitRefs() Persistence Unit Refs}' containment reference list.
>@@ -172,7 +195,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList persistenceUnitRefs = null;
>+	protected EList<PersistenceUnitRef> persistenceUnitRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPostConstructs() Post Constructs}' containment reference list.
>@@ -182,7 +205,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList postConstructs = null;
>+	protected EList<LifecycleCallback> postConstructs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPreDestroys() Pre Destroys}' containment reference list.
>@@ -192,7 +215,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList preDestroys = null;
>+	protected EList<LifecycleCallback> preDestroys;
> 
> 	/**
> 	 * The default value of the '{@link #getCallbackHandler() Callback Handler}' attribute.
>@@ -222,7 +245,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList messageDestinations = null;
>+	protected EList<MessageDestination> messageDestinations;
>+
>+	/**
>+	 * The cached value of the '{@link #getDataSource() Data Source}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDataSource()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<DataSourceType> dataSource;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -271,7 +304,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean metadataCompleteESet = false;
>+	protected boolean metadataCompleteESet;
> 
> 	/**
> 	 * The default value of the '{@link #getVersion() Version}' attribute.
>@@ -281,7 +314,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected static final String VERSION_EDEFAULT = "5"; //$NON-NLS-1$
>+	protected static final String VERSION_EDEFAULT = "6"; //$NON-NLS-1$
> 
> 	/**
> 	 * The cached value of the '{@link #getVersion() Version}' attribute.
>@@ -300,7 +333,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean versionESet = false;
>+	protected boolean versionESet;
> 
> 	/**
> 	 * 
>@@ -326,9 +359,30 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public String getModuleName() {
>+		return moduleName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setModuleName(String newModuleName) {
>+		String oldModuleName = moduleName;
>+		moduleName = newModuleName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, ApplicationclientPackage.APPLICATION_CLIENT__MODULE_NAME, oldModuleName, moduleName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -338,9 +392,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, ApplicationclientPackage.APPLICATION_CLIENT__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, ApplicationclientPackage.APPLICATION_CLIENT__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -350,9 +404,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, ApplicationclientPackage.APPLICATION_CLIENT__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, ApplicationclientPackage.APPLICATION_CLIENT__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -362,9 +416,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEnvEntries() {
>+	public List<EnvEntry> getEnvEntries() {
> 		if (envEntries == null) {
>-			envEntries = new EObjectContainmentEList(EnvEntry.class, this, ApplicationclientPackage.APPLICATION_CLIENT__ENV_ENTRIES);
>+			envEntries = new EObjectContainmentEList<EnvEntry>(EnvEntry.class, this, ApplicationclientPackage.APPLICATION_CLIENT__ENV_ENTRIES);
> 		}
> 		return envEntries;
> 	}
>@@ -374,9 +428,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbRefs() {
>+	public List<EjbRef> getEjbRefs() {
> 		if (ejbRefs == null) {
>-			ejbRefs = new EObjectContainmentEList(EjbRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__EJB_REFS);
>+			ejbRefs = new EObjectContainmentEList<EjbRef>(EjbRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__EJB_REFS);
> 		}
> 		return ejbRefs;
> 	}
>@@ -386,9 +440,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getServiceRefs() {
>+	public List<ServiceRef> getServiceRefs() {
> 		if (serviceRefs == null) {
>-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__SERVICE_REFS);
>+			serviceRefs = new EObjectContainmentEList<ServiceRef>(ServiceRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__SERVICE_REFS);
> 		}
> 		return serviceRefs;
> 	}
>@@ -398,9 +452,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getResourceRefs() {
>+	public List<ResourceRef> getResourceRefs() {
> 		if (resourceRefs == null) {
>-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_REFS);
>+			resourceRefs = new EObjectContainmentEList<ResourceRef>(ResourceRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_REFS);
> 		}
> 		return resourceRefs;
> 	}
>@@ -410,9 +464,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getResourceEnvRefs() {
>+	public List<ResourceEnvRef> getResourceEnvRefs() {
> 		if (resourceEnvRefs == null) {
>-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS);
>+			resourceEnvRefs = new EObjectContainmentEList<ResourceEnvRef>(ResourceEnvRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS);
> 		}
> 		return resourceEnvRefs;
> 	}
>@@ -422,9 +476,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMessageDestinationRefs() {
>+	public List<MessageDestinationRef> getMessageDestinationRefs() {
> 		if (messageDestinationRefs == null) {
>-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS);
>+			messageDestinationRefs = new EObjectContainmentEList<MessageDestinationRef>(MessageDestinationRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS);
> 		}
> 		return messageDestinationRefs;
> 	}
>@@ -434,9 +488,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPersistenceUnitRefs() {
>+	public List<PersistenceUnitRef> getPersistenceUnitRefs() {
> 		if (persistenceUnitRefs == null) {
>-			persistenceUnitRefs = new EObjectContainmentEList(PersistenceUnitRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS);
>+			persistenceUnitRefs = new EObjectContainmentEList<PersistenceUnitRef>(PersistenceUnitRef.class, this, ApplicationclientPackage.APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS);
> 		}
> 		return persistenceUnitRefs;
> 	}
>@@ -446,9 +500,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPostConstructs() {
>+	public List<LifecycleCallback> getPostConstructs() {
> 		if (postConstructs == null) {
>-			postConstructs = new EObjectContainmentEList(LifecycleCallback.class, this, ApplicationclientPackage.APPLICATION_CLIENT__POST_CONSTRUCTS);
>+			postConstructs = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, ApplicationclientPackage.APPLICATION_CLIENT__POST_CONSTRUCTS);
> 		}
> 		return postConstructs;
> 	}
>@@ -458,9 +512,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPreDestroys() {
>+	public List<LifecycleCallback> getPreDestroys() {
> 		if (preDestroys == null) {
>-			preDestroys = new EObjectContainmentEList(LifecycleCallback.class, this, ApplicationclientPackage.APPLICATION_CLIENT__PRE_DESTROYS);
>+			preDestroys = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, ApplicationclientPackage.APPLICATION_CLIENT__PRE_DESTROYS);
> 		}
> 		return preDestroys;
> 	}
>@@ -491,9 +545,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMessageDestinations() {
>+	public List<MessageDestination> getMessageDestinations() {
> 		if (messageDestinations == null) {
>-			messageDestinations = new EObjectContainmentEList(MessageDestination.class, this, ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS);
>+			messageDestinations = new EObjectContainmentEList<MessageDestination>(MessageDestination.class, this, ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS);
> 		}
> 		return messageDestinations;
> 	}
>@@ -503,6 +557,18 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public List<DataSourceType> getDataSource() {
>+		if (dataSource == null) {
>+			dataSource = new EObjectContainmentEList<DataSourceType>(DataSourceType.class, this, ApplicationclientPackage.APPLICATION_CLIENT__DATA_SOURCE);
>+		}
>+		return dataSource;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -620,31 +686,33 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__ENV_ENTRIES:
>-				return ((InternalEList)getEnvEntries()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEnvEntries()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__EJB_REFS:
>-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbRefs()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__SERVICE_REFS:
>-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getServiceRefs()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_REFS:
>-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getResourceRefs()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS:
>-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS:
>-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS:
>-				return ((InternalEList)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__POST_CONSTRUCTS:
>-				return ((InternalEList)getPostConstructs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPostConstructs()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__PRE_DESTROYS:
>-				return ((InternalEList)getPreDestroys()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPreDestroys()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
>-				return ((InternalEList)getMessageDestinations()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMessageDestinations()).basicRemove(otherEnd, msgs);
>+			case ApplicationclientPackage.APPLICATION_CLIENT__DATA_SOURCE:
>+				return ((InternalEList<?>)getDataSource()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -657,6 +725,8 @@
> 	@Override
> 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
> 		switch (featureID) {
>+			case ApplicationclientPackage.APPLICATION_CLIENT__MODULE_NAME:
>+				return getModuleName();
> 			case ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
> 				return getDescriptions();
> 			case ApplicationclientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
>@@ -685,10 +755,12 @@
> 				return getCallbackHandler();
> 			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
> 				return getMessageDestinations();
>+			case ApplicationclientPackage.APPLICATION_CLIENT__DATA_SOURCE:
>+				return getDataSource();
> 			case ApplicationclientPackage.APPLICATION_CLIENT__ID:
> 				return getId();
> 			case ApplicationclientPackage.APPLICATION_CLIENT__METADATA_COMPLETE:
>-				return isMetadataComplete() ? Boolean.TRUE : Boolean.FALSE;
>+				return isMetadataComplete();
> 			case ApplicationclientPackage.APPLICATION_CLIENT__VERSION:
> 				return getVersion();
> 		}
>@@ -700,69 +772,77 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
>+			case ApplicationclientPackage.APPLICATION_CLIENT__MODULE_NAME:
>+				setModuleName((String)newValue);
>+				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__ENV_ENTRIES:
> 				getEnvEntries().clear();
>-				getEnvEntries().addAll((Collection)newValue);
>+				getEnvEntries().addAll((Collection<? extends EnvEntry>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__EJB_REFS:
> 				getEjbRefs().clear();
>-				getEjbRefs().addAll((Collection)newValue);
>+				getEjbRefs().addAll((Collection<? extends EjbRef>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__SERVICE_REFS:
> 				getServiceRefs().clear();
>-				getServiceRefs().addAll((Collection)newValue);
>+				getServiceRefs().addAll((Collection<? extends ServiceRef>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_REFS:
> 				getResourceRefs().clear();
>-				getResourceRefs().addAll((Collection)newValue);
>+				getResourceRefs().addAll((Collection<? extends ResourceRef>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__RESOURCE_ENV_REFS:
> 				getResourceEnvRefs().clear();
>-				getResourceEnvRefs().addAll((Collection)newValue);
>+				getResourceEnvRefs().addAll((Collection<? extends ResourceEnvRef>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS:
> 				getMessageDestinationRefs().clear();
>-				getMessageDestinationRefs().addAll((Collection)newValue);
>+				getMessageDestinationRefs().addAll((Collection<? extends MessageDestinationRef>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS:
> 				getPersistenceUnitRefs().clear();
>-				getPersistenceUnitRefs().addAll((Collection)newValue);
>+				getPersistenceUnitRefs().addAll((Collection<? extends PersistenceUnitRef>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__POST_CONSTRUCTS:
> 				getPostConstructs().clear();
>-				getPostConstructs().addAll((Collection)newValue);
>+				getPostConstructs().addAll((Collection<? extends LifecycleCallback>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__PRE_DESTROYS:
> 				getPreDestroys().clear();
>-				getPreDestroys().addAll((Collection)newValue);
>+				getPreDestroys().addAll((Collection<? extends LifecycleCallback>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__CALLBACK_HANDLER:
> 				setCallbackHandler((String)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
> 				getMessageDestinations().clear();
>-				getMessageDestinations().addAll((Collection)newValue);
>+				getMessageDestinations().addAll((Collection<? extends MessageDestination>)newValue);
>+				return;
>+			case ApplicationclientPackage.APPLICATION_CLIENT__DATA_SOURCE:
>+				getDataSource().clear();
>+				getDataSource().addAll((Collection<? extends DataSourceType>)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__ID:
> 				setId((String)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__METADATA_COMPLETE:
>-				setMetadataComplete(((Boolean)newValue).booleanValue());
>+				setMetadataComplete((Boolean)newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__VERSION:
> 				setVersion((String)newValue);
>@@ -779,6 +859,9 @@
> 	@Override
> 	public void eUnset(int featureID) {
> 		switch (featureID) {
>+			case ApplicationclientPackage.APPLICATION_CLIENT__MODULE_NAME:
>+				setModuleName(MODULE_NAME_EDEFAULT);
>+				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
> 				getDescriptions().clear();
> 				return;
>@@ -821,6 +904,9 @@
> 			case ApplicationclientPackage.APPLICATION_CLIENT__MESSAGE_DESTINATIONS:
> 				getMessageDestinations().clear();
> 				return;
>+			case ApplicationclientPackage.APPLICATION_CLIENT__DATA_SOURCE:
>+				getDataSource().clear();
>+				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -842,6 +928,8 @@
> 	@Override
> 	public boolean eIsSet(int featureID) {
> 		switch (featureID) {
>+			case ApplicationclientPackage.APPLICATION_CLIENT__MODULE_NAME:
>+				return MODULE_NAME_EDEFAULT == null ? moduleName != null : !MODULE_NAME_EDEFAULT.equals(moduleName);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
> 				return descriptions != null && !descriptions.isEmpty();
> 			case ApplicationclientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
>@@ -870,6 +958,8 @@
> 				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__DATA_SOURCE:
>+				return dataSource != null && !dataSource.isEmpty();
> 			case ApplicationclientPackage.APPLICATION_CLIENT__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 			case ApplicationclientPackage.APPLICATION_CLIENT__METADATA_COMPLETE:
>@@ -890,7 +980,9 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (callbackHandler: "); //$NON-NLS-1$
>+		result.append(" (moduleName: "); //$NON-NLS-1$
>+		result.append(moduleName);
>+		result.append(", callbackHandler: "); //$NON-NLS-1$
> 		result.append(callbackHandler);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
>Index: jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientFactoryImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ApplicationclientFactoryImpl.java
>--- jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientFactoryImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientFactoryImpl.java	14 Oct 2009 21:44:47 -0000
>@@ -108,6 +108,7 @@
> 	 * @deprecated
> 	 * @generated
> 	 */
>+	@Deprecated
> 	public static ApplicationclientPackage getPackage() {
> 		return ApplicationclientPackage.eINSTANCE;
> 	}
>Index: jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientDeploymentDescriptorImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientDeploymentDescriptorImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ApplicationClientDeploymentDescriptorImpl.java
>--- jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientDeploymentDescriptorImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationClientDeploymentDescriptorImpl.java	14 Oct 2009 21:44:47 -0000
>@@ -59,7 +59,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected FeatureMap mixed = null;
>+	protected FeatureMap mixed;
> 
> 	/**
> 	 * The cached value of the '{@link #getXMLNSPrefixMap() XMLNS Prefix Map}' map.
>@@ -69,7 +69,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EMap xMLNSPrefixMap = null;
>+	protected EMap<String, String> xMLNSPrefixMap;
> 
> 	/**
> 	 * The cached value of the '{@link #getXSISchemaLocation() XSI Schema Location}' map.
>@@ -79,7 +79,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EMap xSISchemaLocation = null;
>+	protected EMap<String, String> xSISchemaLocation;
> 
> 	/**
> 	 * 
>@@ -117,9 +117,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Map getXMLNSPrefixMap() {
>+	public Map<String, String> getXMLNSPrefixMap() {
> 		if (xMLNSPrefixMap == null) {
>-			xMLNSPrefixMap = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
>+			xMLNSPrefixMap = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
> 		}
> 		return xMLNSPrefixMap.map();
> 	}
>@@ -129,9 +129,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Map getXSISchemaLocation() {
>+	public Map<String, String> getXSISchemaLocation() {
> 		if (xSISchemaLocation == null) {
>-			xSISchemaLocation = new EcoreEMap(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
>+			xSISchemaLocation = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
> 		}
> 		return xSISchemaLocation.map();
> 	}
>@@ -172,11 +172,11 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__MIXED:
>-				return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>-				return ((InternalEList)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>-				return ((InternalEList)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap()).basicRemove(otherEnd, msgs);
> 			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT:
> 				return basicSetApplicationClient(null, msgs);
> 		}
>@@ -195,10 +195,10 @@
> 				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();
>+				if (coreType) return ((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap();
> 				else return getXMLNSPrefixMap();
> 			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>-				if (coreType) return ((EMap.InternalMapView)getXSISchemaLocation()).eMap();
>+				if (coreType) return ((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap();
> 				else return getXSISchemaLocation();
> 			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT:
> 				return getApplicationClient();
>@@ -218,10 +218,10 @@
> 				((FeatureMap.Internal)getMixed()).set(newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXMLNSPrefixMap()).eMap()).set(newValue);
>+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap()).set(newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>-				((EStructuralFeature.Setting)((EMap.InternalMapView)getXSISchemaLocation()).eMap()).set(newValue);
>+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap()).set(newValue);
> 				return;
> 			case ApplicationclientPackage.APPLICATION_CLIENT_DEPLOYMENT_DESCRIPTOR__APPLICATION_CLIENT:
> 				setApplicationClient((ApplicationClient)newValue);
>Index: jee-models/org/eclipse/jst/javaee/core/PersistenceContextType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextType.java,v
>retrieving revision 1.2
>diff -u -r1.2 PersistenceContextType.java
>--- jee-models/org/eclipse/jst/javaee/core/PersistenceContextType.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/PersistenceContextType.java	14 Oct 2009 21:44:47 -0000
>@@ -14,7 +14,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -24,20 +24,40 @@
> * 
> * 
> * 
>- * 	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
>- * 
>+ * 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
>+ * 
>+ * @since Java EE 5
> * 
> * 
> * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextType()
> * @generated
> */
>-public final class PersistenceContextType extends AbstractEnumerator {
>+public enum PersistenceContextType implements Enumerator
>+{
>+	/**
>+	 * The 'Transaction' literal object.
>+	 * 
>+	 * 
>+	 * @see #TRANSACTION
>+	 * @generated
>+	 * @ordered
>+	 */
>+	TRANSACTION_LITERAL(0, "Transaction", "Transaction"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Extended' literal object.
>+	 * 
>+	 * 
>+	 * @see #EXTENDED
>+	 * @generated
>+	 * @ordered
>+	 */
>+	EXTENDED_LITERAL(1, "Extended", "Extended"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The 'Transaction' literal value.
> 	 * 
>@@ -67,26 +87,6 @@
> 	public static final int EXTENDED = 1;
> 
> 	/**
>-	 * The 'Transaction' literal object.
>-	 * 
>-	 * 
>-	 * @see #TRANSACTION
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final PersistenceContextType TRANSACTION_LITERAL = new PersistenceContextType(TRANSACTION, "Transaction", "Transaction"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Extended' literal object.
>-	 * 
>-	 * 
>-	 * @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 'Persistence Context Type' enumerators.
> 	 * 
> 	 * 
>@@ -104,7 +104,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<PersistenceContextType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Persistence Context Type' literal with the specified literal value.
>@@ -149,17 +149,77 @@
> 			case TRANSACTION: return TRANSACTION_LITERAL;
> 			case EXTENDED: return EXTENDED_LITERAL;
> 		}
>-		return null;	
>+		return null;
> 	}
> 
> 	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
> 	 * Only this class can construct instances.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
> 	private PersistenceContextType(int value, String name, String literal) {
>-		super(value, name, literal);
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
> 	}
> 
>-} //PersistenceContextType
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+}
>Index: jee-models/org/eclipse/jst/javaee/core/Icon.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/Icon.java,v
>retrieving revision 1.2
>diff -u -r1.2 Icon.java
>--- jee-models/org/eclipse/jst/javaee/core/Icon.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/Icon.java	14 Oct 2009 21:44:47 -0000
>@@ -19,15 +19,16 @@
> * 
> * 
> * 
>- * 	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.
>- * 
>+ * 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. 
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -52,22 +53,22 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 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;
>-	 * 
>-	 * 	 
>-	 * 	 
>+	 * <![CDATA[[
>+	 * 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:
>+	 * 
>+	 * <small-icon>employee-service-icon16x16.jpg</small-icon>
>+	 * 
>+	 * ]]>
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Small Icon' attribute.
> 	 * @see #setSmallIcon(String)
>@@ -92,23 +93,23 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 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;
>-	 * 
>-	 * 	 
>-	 * 	 
>+	 * <![CDATA[[
>+	 * 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:
>+	 * 
>+	 * <large-icon>employee-service-icon32x32.jpg</large-icon>
>+	 * 
>+	 * ]]>
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Large Icon' attribute.
> 	 * @see #setLargeIcon(String)
>@@ -157,15 +158,38 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 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.
>+	 * <div xmlns="http://www.w3.org/1999/xhtml">
>+	 * 
>+	 * <h3>lang (as an attribute name)</h3>
>+	 * 
>+	 * denotes an attribute whose value
>+	 * is a language code for the natural language of the content of
>+	 * any element; its value is inherited. This name is reserved
>+	 * by virtue of its definition in the XML specification.
>+	 * 
>+	 * </div>
>+	 * <div xmlns="http://www.w3.org/1999/xhtml">
>+	 * <h4>Notes</h4>
>+	 * 
>+	 * 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 BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
>+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
>+	 * and the IANA language subtag registry at
>+	 * <a href="http://www.iana.org/assignments/language-subtag-registry">
>+	 * http://www.iana.org/assignments/language-subtag-registry</a>
>+	 * for further information.
>+	 * 
>+	 * 
>+	 * The union allows for the 'un-declaration' of xml:lang with
>+	 * the empty string.
>+	 * 
>+	 * </div>
>+	 * 
> 	 * 
> 	 * @return the value of the 'Lang' attribute.
> 	 * @see #setLang(String)
>Index: jee-models/org/eclipse/jst/javaee/core/JavaeeFactory.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/JavaeeFactory.java,v
>retrieving revision 1.2
>diff -u -r1.2 JavaeeFactory.java
>--- jee-models/org/eclipse/jst/javaee/core/JavaeeFactory.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/JavaeeFactory.java	14 Oct 2009 21:44:47 -0000
>@@ -32,6 +32,24 @@
> 	JavaeeFactory eINSTANCE = org.eclipse.jst.javaee.core.internal.impl.JavaeeFactoryImpl.init();
> 
> 	/**
>+	 * Returns a new object of class 'Addressing Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Addressing Type'.
>+	 * @generated
>+	 */
>+	AddressingType createAddressingType();
>+
>+	/**
>+	 * Returns a new object of class 'Data Source Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Data Source Type'.
>+	 * @generated
>+	 */
>+	DataSourceType createDataSourceType();
>+
>+	/**
> 	 * Returns a new object of class 'Description'.
> 	 * 
> 	 * 
>@@ -203,6 +221,15 @@
> 	ResourceRef createResourceRef();
> 
> 	/**
>+	 * Returns a new object of class 'Respect Binding Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Respect Binding Type'.
>+	 * @generated
>+	 */
>+	RespectBindingType createRespectBindingType();
>+
>+	/**
> 	 * Returns a new object of class 'Run As'.
> 	 * 
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/core/InjectionTarget.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/InjectionTarget.java,v
>retrieving revision 1.2
>diff -u -r1.2 InjectionTarget.java
>--- jee-models/org/eclipse/jst/javaee/core/InjectionTarget.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/InjectionTarget.java	14 Oct 2009 21:44:47 -0000
>@@ -19,24 +19,25 @@
> * 
> * 
> * 
>- * 	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.
>- * 
>+ * 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.
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>Index: jee-models/org/eclipse/jst/javaee/core/PortComponentRef.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PortComponentRef.java,v
>retrieving revision 1.2
>diff -u -r1.2 PortComponentRef.java
>--- jee-models/org/eclipse/jst/javaee/core/PortComponentRef.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/PortComponentRef.java	14 Oct 2009 21:44:47 -0000
>@@ -10,6 +10,8 @@
> *******************************************************************************/
> package org.eclipse.jst.javaee.core;
> 
>+import java.math.BigInteger;
>+
> 
> /**
> * 
>@@ -19,12 +21,13 @@
> * 
> * 
> * 
>- * 	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.
>- * 
>+ * 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.
>+ * 
>+ * @since Java EE 5, Web Services Client 1.2
> * 
> * 
> *
>@@ -33,6 +36,9 @@
> * <ul>
> * <li>{@link org.eclipse.jst.javaee.core.PortComponentRef#getServiceEndpointInterface Service Endpoint Interface}</li>
> * <li>{@link org.eclipse.jst.javaee.core.PortComponentRef#isEnableMtom Enable Mtom}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.PortComponentRef#getMtomThreshold Mtom Threshold}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.PortComponentRef#getAddressing Addressing}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.PortComponentRef#getRespectBinding Respect Binding}</li>
> * <li>{@link org.eclipse.jst.javaee.core.PortComponentRef#getPortComponentLink Port Component Link}</li>
> * <li>{@link org.eclipse.jst.javaee.core.PortComponentRef#getId Id}</li>
> * </ul>
>@@ -50,11 +56,12 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The service-endpoint-interface element defines a fully qualified
>-	 * 	 Java class that represents the Service Endpoint Interface of a
>-	 * 	 WSDL port.
>-	 * 
>-	 * 	 
>+	 * The service-endpoint-interface element defines a fully qualified
>+	 * Java class that represents the Service Endpoint Interface of a
>+	 * WSDL port.
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Service Endpoint Interface' attribute.
> 	 * @see #setServiceEndpointInterface(String)
>@@ -81,9 +88,11 @@
> 	 * 
> 	 * 
> 	 * 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
>+	 * side for a port-component. 
>+	 * 
>+	 * Not to be specified for JAX-RPC runtime
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
> 	 * 
> 	 * 
> 	 * @return the value of the 'Enable Mtom' attribute.
>@@ -131,23 +140,126 @@
> 	boolean isSetEnableMtom();
> 
> 	/**
>-	 * Returns the value of the 'Port Component Link' attribute.
>+	 * Returns the value of the 'Mtom Threshold' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * When MTOM is enabled, binary data above this size in bytes
>+	 * should be XOP encoded or sent as attachment. Default value is 0.
>+	 * 
>+	 * Not to be specified for JAX-RPC runtime
>+	 * 
>+	 * @since Java EE 6, Web Services Client 1.3
>+	 * 
>+	 * 
>+	 * @return the value of the 'Mtom Threshold' attribute.
>+	 * @see #setMtomThreshold(BigInteger)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPortComponentRef_MtomThreshold()
>+	 * @generated
>+	 */
>+	BigInteger getMtomThreshold();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PortComponentRef#getMtomThreshold Mtom Threshold}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Mtom Threshold' attribute.
>+	 * @see #getMtomThreshold()
>+	 * @generated
>+	 */
>+	void setMtomThreshold(BigInteger value);
>+
>+	/**
>+	 * Returns the value of the 'Addressing' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * This specifies the WS-Addressing requirements for a JAX-WS
>+	 * web service. It corresponds to javax.xml.ws.soap.Addressing
>+	 * annotation or its feature javax.xml.ws.soap.AddressingFeature.
>+	 * 
>+	 * See the addressingType for more information.
>+	 * 
>+	 * Not to be specified for JAX-RPC runtime
>+	 * 
>+	 * @since Java EE 6, Web Services Client 1.3
>+	 * 
>+	 * 
>+	 * @return the value of the 'Addressing' containment reference.
>+	 * @see #setAddressing(AddressingType)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPortComponentRef_Addressing()
>+	 * @generated
>+	 */
>+	AddressingType getAddressing();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PortComponentRef#getAddressing Addressing}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Addressing' containment reference.
>+	 * @see #getAddressing()
>+	 * @generated
>+	 */
>+	void setAddressing(AddressingType value);
>+
>+	/**
>+	 * Returns the value of the 'Respect Binding' containment reference.
> 	 * 
> 	 * 
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>+	 * Corresponds to the javax.xml.ws.RespectBinding annotation
>+	 * or its corresponding javax.xml.ws.RespectBindingFeature web
>+	 * service feature. This is used to control whether a JAX-WS
>+	 * implementation must respect/honor the contents of the
>+	 * wsdl:binding in the WSDL that is associated with the service.
>+	 * 
>+	 * Not to be specified for JAX-RPC runtime
>+	 * 
>+	 * @since Java EE 6, Web Services Client 1.3
>+	 * 
>+	 * 
>+	 * @return the value of the 'Respect Binding' containment reference.
>+	 * @see #setRespectBinding(RespectBindingType)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPortComponentRef_RespectBinding()
>+	 * @generated
>+	 */
>+	RespectBindingType getRespectBinding();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PortComponentRef#getRespectBinding Respect Binding}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Respect Binding' containment reference.
>+	 * @see #getRespectBinding()
>+	 * @generated
>+	 */
>+	void setRespectBinding(RespectBindingType value);
>+
>+	/**
>+	 * Returns the value of the 'Port Component Link' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
> 	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Port Component Link' attribute.
> 	 * @see #setPortComponentLink(String)
>Index: jee-models/org/eclipse/jst/javaee/core/MessageDestination.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestination.java,v
>retrieving revision 1.2
>diff -u -r1.2 MessageDestination.java
>--- jee-models/org/eclipse/jst/javaee/core/MessageDestination.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/MessageDestination.java	14 Oct 2009 21:44:47 -0000
>@@ -19,30 +19,30 @@
> *
> * 
> * 
>- * 	
>- * 
>- * 	 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;
>- * 
>- * 	 
>+ * <![CDATA[[
>+ * 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: 
>+ * 
>+ * <message-destination>
>+ * <message-destination-name>CorporateStocks
>+ * </message-destination-name>
>+ * </message-destination>
>+ * 
>+ * ]]>
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -76,7 +76,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestination_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -91,7 +91,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestination_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -106,7 +106,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestination_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
> 
> 	/**
> 	 * Returns the value of the 'Message Destination Name' attribute.
>@@ -115,12 +115,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Message Destination Name' attribute.
> 	 * @see #setMessageDestinationName(String)
>@@ -145,27 +146,26 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 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.
> 	 * 
>-	 * 	 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Mapped Name' attribute.
> 	 * @see #setMappedName(String)
>Index: jee-models/org/eclipse/jst/javaee/core/EmptyType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EmptyType.java,v
>retrieving revision 1.2
>diff -u -r1.2 EmptyType.java
>--- jee-models/org/eclipse/jst/javaee/core/EmptyType.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/EmptyType.java	14 Oct 2009 21:44:47 -0000
>@@ -19,9 +19,10 @@
> * 
> * 
> * 
>- * 	This type is used to designate an empty
>- * 	element when used.
>- * 
>+ * This type is used to designate an empty
>+ * element when used. 
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>Index: jee-models/org/eclipse/jst/javaee/core/SecurityRole.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/SecurityRole.java,v
>retrieving revision 1.2
>diff -u -r1.2 SecurityRole.java
>--- jee-models/org/eclipse/jst/javaee/core/SecurityRole.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/SecurityRole.java	14 Oct 2009 21:44:47 -0000
>@@ -19,23 +19,23 @@
> *
> * 
> * 
>- * 	
>- * 
>- * 	 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;
>- * 
>- * 	 
>+ * <![CDATA[[
>+ * 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:
>+ * 
>+ * <security-role>
>+ * <description>
>+ * This role includes all employees who are authorized
>+ * to access the employee service application.
>+ * </description>
>+ * <role-name>employee</role-name>
>+ * </security-role>
>+ * 
>+ * ]]>
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -66,7 +66,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getSecurityRole_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Role Name' attribute.
>Index: jee-models/org/eclipse/jst/javaee/core/EjbRef.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EjbRef.java,v
>retrieving revision 1.2
>diff -u -r1.2 EjbRef.java
>--- jee-models/org/eclipse/jst/javaee/core/EjbRef.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/EjbRef.java	14 Oct 2009 21:44:47 -0000
>@@ -20,27 +20,28 @@
> * 
> * 
> * 
>- * 	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
>- * 
>+ * 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
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -55,6 +56,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.EjbRef#getEjbLink Ejb Link}</li>
> * <li>{@link org.eclipse.jst.javaee.core.EjbRef#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.EjbRef#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.EjbRef#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.EjbRef#getId Id}</li>
> * </ul>
> * 
>@@ -77,7 +79,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Ref Name' attribute.
>@@ -106,7 +108,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Ejb Ref Type' attribute.
>-	 * The default value is <code>"Entity"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.EjbRefType}.
> 	 * 
> 	 * 
>@@ -241,26 +242,25 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Mapped Name' attribute.
> 	 * @see #setMappedName(String)
>@@ -292,7 +292,36 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef_InjectionTargets()
> 	 * @generated
> 	 */
>-	List getInjectionTargets();
>+	List<InjectionTarget> getInjectionTargets();
>+
>+	/**
>+	 * Returns the value of the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The JNDI name to be looked up to resolve a resource reference.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Lookup Name' attribute.
>+	 * @see #setLookupName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRef_LookupName()
>+	 * @generated
>+	 */
>+	String getLookupName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbRef#getLookupName Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Lookup Name' attribute.
>+	 * @see #getLookupName()
>+	 * @generated
>+	 */
>+	void setLookupName(String value);
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChain.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChain.java,v
>retrieving revision 1.2
>diff -u -r1.2 ServiceRefHandlerChain.java
>--- jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChain.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChain.java	14 Oct 2009 21:44:48 -0000
>@@ -20,17 +20,18 @@
> * 
> * 
> * 
>- * 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.
>- * 
>+ * 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.
>+ * 
>+ * @since Java EE 5, Web Services Client 1.2
> * 
> * 
> *
>@@ -113,7 +114,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandlerChain_ProtocolBindings()
> 	 * @generated
> 	 */
>-	List getProtocolBindings();
>+	List<String> getProtocolBindings();
> 
> 	/**
> 	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRefHandlerChain#getProtocolBindings Protocol Bindings}' attribute.
>@@ -123,7 +124,7 @@
> 	 * @see #getProtocolBindings()
> 	 * @generated
> 	 */
>-	void setProtocolBindings(List value);
>+	void setProtocolBindings(List<String> value);
> 
> 	/**
> 	 * Returns the value of the 'Handlers' containment reference list.
>@@ -138,7 +139,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandlerChain_Handlers()
> 	 * @generated
> 	 */
>-	List getHandlers();
>+	List<ServiceRefHandler> getHandlers();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/core/EjbLocalRef.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EjbLocalRef.java,v
>retrieving revision 1.2
>diff -u -r1.2 EjbLocalRef.java
>--- jee-models/org/eclipse/jst/javaee/core/EjbLocalRef.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/EjbLocalRef.java	14 Oct 2009 21:44:47 -0000
>@@ -20,26 +20,27 @@
> * 
> * 
> * 
>- * 	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 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.
>- * 
>+ * 
>+ * - 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.
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -54,6 +55,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getEjbLink Ejb Link}</li>
> * <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.EjbLocalRef#getId Id}</li>
> * </ul>
> * 
>@@ -76,7 +78,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Ref Name' attribute.
>@@ -105,7 +107,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Ejb Ref Type' attribute.
>-	 * The default value is <code>"Entity"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.EjbRefType}.
> 	 * 
> 	 * 
>@@ -240,26 +241,25 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Mapped Name' attribute.
> 	 * @see #setMappedName(String)
>@@ -291,7 +291,36 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef_InjectionTargets()
> 	 * @generated
> 	 */
>-	List getInjectionTargets();
>+	List<InjectionTarget> getInjectionTargets();
>+
>+	/**
>+	 * Returns the value of the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The JNDI name to be looked up to resolve a resource reference.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Lookup Name' attribute.
>+	 * @see #setLookupName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbLocalRef_LookupName()
>+	 * @generated
>+	 */
>+	String getLookupName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getLookupName Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Lookup Name' attribute.
>+	 * @see #getLookupName()
>+	 * @generated
>+	 */
>+	void setLookupName(String value);
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/core/EnvEntry.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EnvEntry.java,v
>retrieving revision 1.2
>diff -u -r1.2 EnvEntry.java
>--- jee-models/org/eclipse/jst/javaee/core/EnvEntry.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/EnvEntry.java	14 Oct 2009 21:44:47 -0000
>@@ -20,26 +20,27 @@
> * 
> * 
> * 
>- * 	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.
>- * 
>+ * 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.
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -52,6 +53,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryValue Env Entry Value}</li>
> * <li>{@link org.eclipse.jst.javaee.core.EnvEntry#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.EnvEntry#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.EnvEntry#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.EnvEntry#getId Id}</li>
> * </ul>
> * 
>@@ -74,7 +76,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntry_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Env Entry Name' attribute.
>@@ -82,22 +84,22 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 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;
>-	 * 
>-	 * 	 
>-	 * 	 
>+	 * <![CDATA[[
>+	 * 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:
>+	 * 
>+	 * <env-entry-name>minAmount</env-entry-name>
>+	 * 
>+	 * ]]>
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Env Entry Name' attribute.
> 	 * @see #setEnvEntryName(String)
>@@ -118,73 +120,42 @@
> 
> 	/**
> 	 * Returns the value of the 'Env Entry Type' attribute.
>-	 * The default value is <code>"java.lang.Boolean"</code>.
>-	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.EnvEntryType}.
> 	 * 
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 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;
>-	 * 
>-	 * 	 
>-	 * 	 
>+	 * <![CDATA[[
>+	 * 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:
>+	 * 
>+	 * <env-entry-type>java.lang.Integer</env-entry-type>
>+	 * 
>+	 * ]]>
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Env Entry Type' attribute.
>-	 * @see org.eclipse.jst.javaee.core.EnvEntryType
>-	 * @see #isSetEnvEntryType()
>-	 * @see #unsetEnvEntryType()
>-	 * @see #setEnvEntryType(EnvEntryType)
>+	 * @see #setEnvEntryType(String)
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntry_EnvEntryType()
> 	 * @generated
> 	 */
>-	EnvEntryType getEnvEntryType();
>+	String getEnvEntryType();
> 
> 	/**
> 	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryType Env Entry Type}' attribute.
> 	 * 
> 	 * 
> 	 * @param value the new value of the 'Env Entry Type' 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 Env Entry Type}' attribute.
>-	 * 
>-	 * 
>-	 * @see #isSetEnvEntryType()
>-	 * @see #getEnvEntryType()
>-	 * @see #setEnvEntryType(EnvEntryType)
>-	 * @generated
>-	 */
>-	void unsetEnvEntryType();
>-
>-	/**
>-	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryType Env Entry Type}' attribute is set.
>-	 * 
>-	 * 
>-	 * @return whether the value of the 'Env Entry Type' attribute is set.
>-	 * @see #unsetEnvEntryType()
> 	 * @see #getEnvEntryType()
>-	 * @see #setEnvEntryType(EnvEntryType)
> 	 * @generated
> 	 */
>-	boolean isSetEnvEntryType();
>+	void setEnvEntryType(String value);
> 
> 	/**
> 	 * Returns the value of the 'Env Entry Value' attribute.
>@@ -192,21 +163,21 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 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;
>-	 * 
>-	 * 	 
>-	 * 	 
>+	 * <![CDATA[[
>+	 * 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:
>+	 * 
>+	 * <env-entry-value>100.00</env-entry-value>
>+	 * 
>+	 * ]]>
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Env Entry Value' attribute.
> 	 * @see #setEnvEntryValue(String)
>@@ -231,26 +202,25 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Mapped Name' attribute.
> 	 * @see #setMappedName(String)
>@@ -282,7 +252,36 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntry_InjectionTargets()
> 	 * @generated
> 	 */
>-	List getInjectionTargets();
>+	List<InjectionTarget> getInjectionTargets();
>+
>+	/**
>+	 * Returns the value of the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The JNDI name to be looked up to resolve a resource reference.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Lookup Name' attribute.
>+	 * @see #setLookupName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEnvEntry_LookupName()
>+	 * @generated
>+	 */
>+	String getLookupName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getLookupName Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Lookup Name' attribute.
>+	 * @see #getLookupName()
>+	 * @generated
>+	 */
>+	void setLookupName(String value);
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>@@ -308,5 +307,35 @@
> 	 * @generated
> 	 */
> 	void setId(String value);
>+	
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryType Env Entry Type}' attribute.
>+	 * @param value the new value of the 'Env Entry Type' attribute.
>+	 * @see org.eclipse.jst.javaee.core.EnvEntryType
>+	 * @see #isSetEnvEntryType()
>+	 * @see #unsetEnvEntryType()
>+	 * @see #getEnvEntryType()
>+	 * This is provided for Java EE 5 model equivalence
>+	 */
>+	void setEnvEntryType(EnvEntryType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryType Env Entry Type}' attribute.
>+	 * @see #isSetEnvEntryType()
>+	 * @see #getEnvEntryType()
>+	 * @see #setEnvEntryType(EnvEntryType)
>+	 * This is provided for Java EE 5 model equivalence
>+	 */
>+	void unsetEnvEntryType();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.EnvEntry#getEnvEntryType Env Entry Type}' attribute is set.
>+	 * @return whether the value of the 'Env Entry Type' attribute is set.
>+	 * @see #unsetEnvEntryType()
>+	 * @see #getEnvEntryType()
>+	 * @see #setEnvEntryType(EnvEntryType)
>+	 * This is provided for Java EE 5 model equivalence
>+	 */
>+	boolean isSetEnvEntryType();
> 
> } // EnvEntry
>\ No newline at end of file
>Index: jee-models/org/eclipse/jst/javaee/core/ResourceRef.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResourceRef.java,v
>retrieving revision 1.2
>diff -u -r1.2 ResourceRef.java
>--- jee-models/org/eclipse/jst/javaee/core/ResourceRef.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/ResourceRef.java	14 Oct 2009 21:44:47 -0000
>@@ -19,37 +19,37 @@
> *
> * 
> * 
>- * 	
>- * 
>- * 	 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;
>- * 
>- * 	 
>+ * <![CDATA[[
>+ * 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:
>+ * 
>+ * <resource-ref>
>+ * <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
>+ * <res-type>javax.sql.DataSource</res-type>
>+ * <res-auth>Container</res-auth>
>+ * <res-sharing-scope>Shareable</res-sharing-scope>
>+ * </resource-ref>
>+ * 
>+ * ]]>
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -63,6 +63,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getResSharingScope Res Sharing Scope}</li>
> * <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.ResourceRef#getId Id}</li>
> * </ul>
> * 
>@@ -85,7 +86,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceRef_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Res Ref Name' attribute.
>@@ -94,13 +95,14 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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. 
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Res Ref Name' attribute.
> 	 * @see #setResRefName(String)
>@@ -126,12 +128,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Res Type' attribute.
> 	 * @see #setResType(String)
>@@ -152,7 +155,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Res Auth' attribute.
>-	 * The default value is <code>"Application"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.ResAuthType}.
> 	 * 
> 	 * 
>@@ -208,7 +210,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Res Sharing Scope' attribute.
>-	 * The default value is <code>"Shareable"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.ResSharingScopeType}.
> 	 * 
> 	 * 
>@@ -268,26 +269,25 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Mapped Name' attribute.
> 	 * @see #setMappedName(String)
>@@ -319,7 +319,36 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceRef_InjectionTargets()
> 	 * @generated
> 	 */
>-	List getInjectionTargets();
>+	List<InjectionTarget> getInjectionTargets();
>+
>+	/**
>+	 * Returns the value of the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The JNDI name to be looked up to resolve a resource reference.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Lookup Name' attribute.
>+	 * @see #setLookupName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceRef_LookupName()
>+	 * @generated
>+	 */
>+	String getLookupName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ResourceRef#getLookupName Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Lookup Name' attribute.
>+	 * @see #getLookupName()
>+	 * @generated
>+	 */
>+	void setLookupName(String value);
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/core/ResourceEnvRef.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResourceEnvRef.java,v
>retrieving revision 1.2
>diff -u -r1.2 ResourceEnvRef.java
>--- jee-models/org/eclipse/jst/javaee/core/ResourceEnvRef.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/ResourceEnvRef.java	14 Oct 2009 21:44:47 -0000
>@@ -19,36 +19,36 @@
> *
> * 
> * 
>- * 	
>- * 
>- * 	 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;
>- * 
>- * 	 
>+ * <![CDATA[[
>+ * The resource-env-refType is used to define
>+ * resource-env-ref 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:
>+ * 
>+ * <resource-env-ref>
>+ * <resource-env-ref-name>jms/StockQueue
>+ * </resource-env-ref-name>
>+ * <resource-env-ref-type>javax.jms.Queue
>+ * </resource-env-ref-type>
>+ * </resource-env-ref>
>+ * 
>+ * ]]>
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -60,6 +60,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getResourceEnvRefType Resource Env Ref Type}</li>
> * <li>{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getId Id}</li>
> * </ul>
> * 
>@@ -82,7 +83,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceEnvRef_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Resource Env Ref Name' attribute.
>@@ -91,14 +92,15 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Resource Env Ref Name' attribute.
> 	 * @see #setResourceEnvRefName(String)
>@@ -124,12 +126,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Resource Env Ref Type' attribute.
> 	 * @see #setResourceEnvRefType(String)
>@@ -154,26 +157,25 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 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.
> 	 * 
>-	 * 	 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Mapped Name' attribute.
> 	 * @see #setMappedName(String)
>@@ -205,7 +207,36 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceEnvRef_InjectionTargets()
> 	 * @generated
> 	 */
>-	List getInjectionTargets();
>+	List<InjectionTarget> getInjectionTargets();
>+
>+	/**
>+	 * Returns the value of the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The JNDI name to be looked up to resolve a resource reference.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Lookup Name' attribute.
>+	 * @see #setLookupName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResourceEnvRef_LookupName()
>+	 * @generated
>+	 */
>+	String getLookupName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getLookupName Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Lookup Name' attribute.
>+	 * @see #getLookupName()
>+	 * @generated
>+	 */
>+	void setLookupName(String value);
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/core/MessageDestinationUsageType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestinationUsageType.java,v
>retrieving revision 1.2
>diff -u -r1.2 MessageDestinationUsageType.java
>--- jee-models/org/eclipse/jst/javaee/core/MessageDestinationUsageType.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/MessageDestinationUsageType.java	14 Oct 2009 21:44:47 -0000
>@@ -14,7 +14,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -24,25 +24,54 @@
> * 
> * 
> * 
>- * 	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
>- * 
>+ * 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
>+ * 
>+ * @since Java EE 5
> * 
> * 
> * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationUsageType()
> * @generated
> */
>-public final class MessageDestinationUsageType extends AbstractEnumerator {
>+public enum MessageDestinationUsageType implements Enumerator
>+{
>+	/**
>+	 * The 'Consumes' literal object.
>+	 * 
>+	 * 
>+	 * @see #CONSUMES
>+	 * @generated
>+	 * @ordered
>+	 */
>+	CONSUMES_LITERAL(0, "Consumes", "Consumes"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Produces' literal object.
>+	 * 
>+	 * 
>+	 * @see #PRODUCES
>+	 * @generated
>+	 * @ordered
>+	 */
>+	PRODUCES_LITERAL(1, "Produces", "Produces"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Consumes Produces' literal object.
>+	 * 
>+	 * 
>+	 * @see #CONSUMES_PRODUCES
>+	 * @generated
>+	 * @ordered
>+	 */
>+	CONSUMES_PRODUCES_LITERAL(2, "ConsumesProduces", "ConsumesProduces"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The 'Consumes' literal value.
> 	 * 
>@@ -86,36 +115,6 @@
> 	public static final int CONSUMES_PRODUCES = 2;
> 
> 	/**
>-	 * The 'Consumes' literal object.
>-	 * 
>-	 * 
>-	 * @see #CONSUMES
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final MessageDestinationUsageType CONSUMES_LITERAL = new MessageDestinationUsageType(CONSUMES, "Consumes", "Consumes"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Produces' literal object.
>-	 * 
>-	 * 
>-	 * @see #PRODUCES
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final MessageDestinationUsageType PRODUCES_LITERAL = new MessageDestinationUsageType(PRODUCES, "Produces", "Produces"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Consumes Produces' literal object.
>-	 * 
>-	 * 
>-	 * @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 'Message Destination Usage Type' enumerators.
> 	 * 
> 	 * 
>@@ -134,7 +133,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<MessageDestinationUsageType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Message Destination Usage Type' literal with the specified literal value.
>@@ -180,17 +179,77 @@
> 			case PRODUCES: return PRODUCES_LITERAL;
> 			case CONSUMES_PRODUCES: return CONSUMES_PRODUCES_LITERAL;
> 		}
>-		return null;	
>+		return null;
> 	}
> 
> 	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
> 	 * Only this class can construct instances.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
> 	private MessageDestinationUsageType(int value, String name, String literal) {
>-		super(value, name, literal);
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
> 	}
> 
>-} //MessageDestinationUsageType
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+}
>Index: jee-models/org/eclipse/jst/javaee/core/Listener.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/Listener.java,v
>retrieving revision 1.2
>diff -u -r1.2 Listener.java
>--- jee-models/org/eclipse/jst/javaee/core/Listener.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/Listener.java	14 Oct 2009 21:44:47 -0000
>@@ -20,9 +20,10 @@
> * 
> * 
> * 
>- * 	The listenerType indicates the deployment properties for a web
>- * 	application listener bean.
>- * 
>+ * The listenerType indicates the deployment properties for a web
>+ * application listener bean.
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -55,7 +56,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getListener_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -70,7 +71,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getListener_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -85,7 +86,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getListener_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
> 
> 	/**
> 	 * Returns the value of the 'Listener Class' attribute.
>@@ -94,12 +95,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Listener Class' attribute.
> 	 * @see #setListenerClass(String)
>Index: jee-models/org/eclipse/jst/javaee/core/ParamValue.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ParamValue.java,v
>retrieving revision 1.2
>diff -u -r1.2 ParamValue.java
>--- jee-models/org/eclipse/jst/javaee/core/ParamValue.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/ParamValue.java	14 Oct 2009 21:44:47 -0000
>@@ -20,9 +20,10 @@
> * 
> * 
> * 
>- * 	This type is a general type that can be used to declare
>- * 	parameter/value lists.
>- * 
>+ * This type is a general type that can be used to declare
>+ * parameter/value lists.
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -54,7 +55,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getParamValue_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Param Name' attribute.
>@@ -63,10 +64,11 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The param-name element contains the name of a
>-	 * 	 parameter.
>-	 * 
>-	 * 	 
>+	 * The param-name element contains the name of a
>+	 * parameter.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Param Name' attribute.
> 	 * @see #setParamName(String)
>@@ -92,10 +94,11 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The param-value element contains the value of a
>-	 * 	 parameter.
>-	 * 
>-	 * 	 
>+	 * The param-value element contains the value of a
>+	 * parameter.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Param Value' attribute.
> 	 * @see #setParamValue(String)
>Index: jee-models/org/eclipse/jst/javaee/core/PersistenceContextRef.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextRef.java,v
>retrieving revision 1.2
>diff -u -r1.2 PersistenceContextRef.java
>--- jee-models/org/eclipse/jst/javaee/core/PersistenceContextRef.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/PersistenceContextRef.java	14 Oct 2009 21:44:47 -0000
>@@ -19,39 +19,39 @@
> *
> * 
> * 
>- * 	
>- * 
>- * 	 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;
>- * 
>- * 	 
>+ * <![CDATA[[
>+ * 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:
>+ * 
>+ * <persistence-context-ref>
>+ * <persistence-context-ref-name>myPersistenceContext
>+ * </persistence-context-ref-name>
>+ * </persistence-context-ref>
>+ * 
>+ * <persistence-context-ref>
>+ * <persistence-context-ref-name>myPersistenceContext
>+ * </persistence-context-ref-name>
>+ * <persistence-unit-name>PersistenceUnit1
>+ * </persistence-unit-name>
>+ * <persistence-context-type>Extended</persistence-context-type>
>+ * </persistence-context-ref>
>+ * 
>+ * ]]>
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -65,6 +65,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceProperties Persistence Properties}</li>
> * <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getId Id}</li>
> * </ul>
> * 
>@@ -87,7 +88,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Context Ref Name' attribute.
>@@ -96,13 +97,14 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Persistence Context Ref Name' attribute.
> 	 * @see #setPersistenceContextRefName(String)
>@@ -131,17 +133,18 @@
> 	 * 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.
>+	 * 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
>+	 * persistence unit name may be uniquely identified when the 
> 	 * Application Assembler cannot change persistence unit names.
>-	 * 
>-	 * 	 
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Persistence Unit Name' attribute.
> 	 * @see #setPersistenceUnitName(String)
>@@ -162,7 +165,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Persistence Context Type' attribute.
>-	 * The default value is <code>"Transaction"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.PersistenceContextType}.
> 	 * 
> 	 * 
>@@ -227,18 +229,19 @@
> 	 * 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
>+	 * 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.
>-	 * 
>-	 * 	 
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Persistence Properties' containment reference list.
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_PersistenceProperties()
> 	 * @generated
> 	 */
>-	List getPersistenceProperties();
>+	List<PropertyType> getPersistenceProperties();
> 
> 	/**
> 	 * Returns the value of the 'Mapped Name' attribute.
>@@ -246,26 +249,25 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 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.
> 	 * 
>-	 * 	 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Mapped Name' attribute.
> 	 * @see #setMappedName(String)
>@@ -297,7 +299,36 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_InjectionTargets()
> 	 * @generated
> 	 */
>-	List getInjectionTargets();
>+	List<InjectionTarget> getInjectionTargets();
>+
>+	/**
>+	 * Returns the value of the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The JNDI name to be looked up to resolve a resource reference.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Lookup Name' attribute.
>+	 * @see #setLookupName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_LookupName()
>+	 * @generated
>+	 */
>+	String getLookupName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getLookupName Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Lookup Name' attribute.
>+	 * @see #getLookupName()
>+	 * @generated
>+	 */
>+	void setLookupName(String value);
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/core/ResSharingScopeType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResSharingScopeType.java,v
>retrieving revision 1.2
>diff -u -r1.2 ResSharingScopeType.java
>--- jee-models/org/eclipse/jst/javaee/core/ResSharingScopeType.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/ResSharingScopeType.java	14 Oct 2009 21:44:47 -0000
>@@ -14,7 +14,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -24,22 +24,42 @@
> * 
> * 
> * 
>- * 	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.
>- * 
>+ * 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.
>+ * 
>+ * @since Java EE 5
> * 
> * 
> * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResSharingScopeType()
> * @generated
> */
>-public final class ResSharingScopeType extends AbstractEnumerator {
>+public enum ResSharingScopeType implements Enumerator
>+{
>+	/**
>+	 * The 'Shareable' literal object.
>+	 * 
>+	 * 
>+	 * @see #SHAREABLE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	SHAREABLE_LITERAL(0, "Shareable", "Shareable"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Unshareable' literal object.
>+	 * 
>+	 * 
>+	 * @see #UNSHAREABLE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	UNSHAREABLE_LITERAL(1, "Unshareable", "Unshareable"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The 'Shareable' literal value.
> 	 * 
>@@ -69,26 +89,6 @@
> 	public static final int UNSHAREABLE = 1;
> 
> 	/**
>-	 * The 'Shareable' literal object.
>-	 * 
>-	 * 
>-	 * @see #SHAREABLE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final ResSharingScopeType SHAREABLE_LITERAL = new ResSharingScopeType(SHAREABLE, "Shareable", "Shareable"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Unshareable' literal object.
>-	 * 
>-	 * 
>-	 * @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 'Res Sharing Scope Type' enumerators.
> 	 * 
> 	 * 
>@@ -106,7 +106,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<ResSharingScopeType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Res Sharing Scope Type' literal with the specified literal value.
>@@ -151,17 +151,77 @@
> 			case SHAREABLE: return SHAREABLE_LITERAL;
> 			case UNSHAREABLE: return UNSHAREABLE_LITERAL;
> 		}
>-		return null;	
>+		return null;
> 	}
> 
> 	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
> 	 * Only this class can construct instances.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
> 	private ResSharingScopeType(int value, String name, String literal) {
>-		super(value, name, literal);
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
> 	}
> 
>-} //ResSharingScopeType
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+}
>Index: jee-models/org/eclipse/jst/javaee/core/ResAuthType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ResAuthType.java,v
>retrieving revision 1.2
>diff -u -r1.2 ResAuthType.java
>--- jee-models/org/eclipse/jst/javaee/core/ResAuthType.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/ResAuthType.java	14 Oct 2009 21:44:47 -0000
>@@ -14,7 +14,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -24,24 +24,44 @@
> * 
> * 
> * 
>- * 	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
>- * 
>+ * 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
>+ * 
>+ * @since Java EE 5
> * 
> * 
> * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getResAuthType()
> * @generated
> */
>-public final class ResAuthType extends AbstractEnumerator {
>+public enum ResAuthType implements Enumerator
>+{
>+	/**
>+	 * The 'Application' literal object.
>+	 * 
>+	 * 
>+	 * @see #APPLICATION
>+	 * @generated
>+	 * @ordered
>+	 */
>+	APPLICATION_LITERAL(0, "Application", "Application"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Container' literal object.
>+	 * 
>+	 * 
>+	 * @see #CONTAINER
>+	 * @generated
>+	 * @ordered
>+	 */
>+	CONTAINER_LITERAL(1, "Container", "Container"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The 'Application' literal value.
> 	 * 
>@@ -71,26 +91,6 @@
> 	public static final int CONTAINER = 1;
> 
> 	/**
>-	 * The 'Application' literal object.
>-	 * 
>-	 * 
>-	 * @see #APPLICATION
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final ResAuthType APPLICATION_LITERAL = new ResAuthType(APPLICATION, "Application", "Application"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Container' literal object.
>-	 * 
>-	 * 
>-	 * @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 'Res Auth Type' enumerators.
> 	 * 
> 	 * 
>@@ -108,7 +108,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<ResAuthType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Res Auth Type' literal with the specified literal value.
>@@ -153,17 +153,77 @@
> 			case APPLICATION: return APPLICATION_LITERAL;
> 			case CONTAINER: return CONTAINER_LITERAL;
> 		}
>-		return null;	
>+		return null;
> 	}
> 
> 	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
> 	 * Only this class can construct instances.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
> 	private ResAuthType(int value, String name, String literal) {
>-		super(value, name, literal);
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
> 	}
> 
>-} //ResAuthType
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+}
>Index: jee-models/org/eclipse/jst/javaee/core/PersistenceUnitRef.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceUnitRef.java,v
>retrieving revision 1.2
>diff -u -r1.2 PersistenceUnitRef.java
>--- jee-models/org/eclipse/jst/javaee/core/PersistenceUnitRef.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/PersistenceUnitRef.java	14 Oct 2009 21:44:47 -0000
>@@ -19,34 +19,34 @@
> *
> * 
> * 
>- * 	
>- * 
>- * 	 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;
>- * 
>- * 	 
>+ * <![CDATA[[
>+ * 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:
>+ * 
>+ * <persistence-unit-ref>
>+ * <persistence-unit-ref-name>myPersistenceUnit
>+ * </persistence-unit-ref-name>
>+ * </persistence-unit-ref>
>+ * 
>+ * <persistence-unit-ref>
>+ * <persistence-unit-ref-name>myPersistenceUnit
>+ * </persistence-unit-ref-name>
>+ * <persistence-unit-name>PersistenceUnit1
>+ * </persistence-unit-name>
>+ * </persistence-unit-ref>
>+ * 
>+ * ]]>
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -58,6 +58,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getPersistenceUnitName Persistence Unit Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getId Id}</li>
> * </ul>
> * 
>@@ -80,7 +81,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceUnitRef_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Unit Ref Name' attribute.
>@@ -89,13 +90,14 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Persistence Unit Ref Name' attribute.
> 	 * @see #setPersistenceUnitRefName(String)
>@@ -124,17 +126,18 @@
> 	 * 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.
>+	 * 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
>+	 * persistence unit name may be uniquely identified when the 
> 	 * Application Assembler cannot change persistence unit names.
>-	 * 
>-	 * 	 
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Persistence Unit Name' attribute.
> 	 * @see #setPersistenceUnitName(String)
>@@ -159,26 +162,25 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Mapped Name' attribute.
> 	 * @see #setMappedName(String)
>@@ -210,7 +212,36 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceUnitRef_InjectionTargets()
> 	 * @generated
> 	 */
>-	List getInjectionTargets();
>+	List<InjectionTarget> getInjectionTargets();
>+
>+	/**
>+	 * Returns the value of the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The JNDI name to be looked up to resolve a resource reference.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Lookup Name' attribute.
>+	 * @see #setLookupName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceUnitRef_LookupName()
>+	 * @generated
>+	 */
>+	String getLookupName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getLookupName Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Lookup Name' attribute.
>+	 * @see #getLookupName()
>+	 * @generated
>+	 */
>+	void setLookupName(String value);
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/core/EjbRefType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/EjbRefType.java,v
>retrieving revision 1.2
>diff -u -r1.2 EjbRefType.java
>--- jee-models/org/eclipse/jst/javaee/core/EjbRefType.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/EjbRefType.java	14 Oct 2009 21:44:47 -0000
>@@ -14,7 +14,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -24,21 +24,41 @@
> * 
> * 
> * 
>- * 	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
>- * 
>+ * 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
>+ * 
>+ * @since Java EE 5
> * 
> * 
> * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getEjbRefType()
> * @generated
> */
>-public final class EjbRefType extends AbstractEnumerator {
>+public enum EjbRefType implements Enumerator
>+{
>+	/**
>+	 * The 'Entity' literal object.
>+	 * 
>+	 * 
>+	 * @see #ENTITY
>+	 * @generated
>+	 * @ordered
>+	 */
>+	ENTITY_LITERAL(0, "Entity", "Entity"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Session' literal object.
>+	 * 
>+	 * 
>+	 * @see #SESSION
>+	 * @generated
>+	 * @ordered
>+	 */
>+	SESSION_LITERAL(1, "Session", "Session"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The 'Entity' literal value.
> 	 * 
>@@ -68,26 +88,6 @@
> 	public static final int SESSION = 1;
> 
> 	/**
>-	 * The 'Entity' literal object.
>-	 * 
>-	 * 
>-	 * @see #ENTITY
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final EjbRefType ENTITY_LITERAL = new EjbRefType(ENTITY, "Entity", "Entity"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Session' literal object.
>-	 * 
>-	 * 
>-	 * @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 'Ejb Ref Type' enumerators.
> 	 * 
> 	 * 
>@@ -105,7 +105,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<EjbRefType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Ejb Ref Type' literal with the specified literal value.
>@@ -150,17 +150,77 @@
> 			case ENTITY: return ENTITY_LITERAL;
> 			case SESSION: return SESSION_LITERAL;
> 		}
>-		return null;	
>+		return null;
> 	}
> 
> 	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
> 	 * Only this class can construct instances.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
> 	private EjbRefType(int value, String name, String literal) {
>-		super(value, name, literal);
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
> 	}
> 
>-} //EjbRefType
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+}
>Index: jee-models/org/eclipse/jst/javaee/core/PropertyType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PropertyType.java,v
>retrieving revision 1.2
>diff -u -r1.2 PropertyType.java
>--- jee-models/org/eclipse/jst/javaee/core/PropertyType.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/PropertyType.java	14 Oct 2009 21:44:47 -0000
>@@ -19,8 +19,9 @@
> * 
> * 
> * 
>- * 	Specifies a name/value pair.
>- * 
>+ * Specifies a name/value pair.
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>Index: jee-models/org/eclipse/jst/javaee/core/LifecycleCallback.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/LifecycleCallback.java,v
>retrieving revision 1.2
>diff -u -r1.2 LifecycleCallback.java
>--- jee-models/org/eclipse/jst/javaee/core/LifecycleCallback.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/LifecycleCallback.java	14 Oct 2009 21:44:47 -0000
>@@ -19,17 +19,18 @@
> * 
> * 
> * 
>- * 	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
>+ * 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.
>- * 
>+ * 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.
>- * 
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>Index: jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChains.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChains.java,v
>retrieving revision 1.2
>diff -u -r1.2 ServiceRefHandlerChains.java
>--- jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChains.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/ServiceRefHandlerChains.java	14 Oct 2009 21:44:48 -0000
>@@ -20,9 +20,10 @@
> * 
> * 
> * 
>- * The handler-chains element defines the handlerchains associated with this
>- * service or service endpoint.
>- * 
>+ * The handler-chains element defines the handlerchains associated with this
>+ * service or service endpoint.
>+ * 
>+ * @since Java EE 5, Web Services Client 1.2
> * 
> * 
> *
>@@ -52,7 +53,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandlerChains_HandlerChains()
> 	 * @generated
> 	 */
>-	List getHandlerChains();
>+	List<ServiceRefHandlerChain> getHandlerChains();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/core/ServiceRef.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRef.java,v
>retrieving revision 1.2
>diff -u -r1.2 ServiceRef.java
>--- jee-models/org/eclipse/jst/javaee/core/ServiceRef.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/ServiceRef.java	14 Oct 2009 21:44:47 -0000
>@@ -11,6 +11,7 @@
> package org.eclipse.jst.javaee.core;
> 
> import java.util.List;
>+import javax.xml.namespace.QName;
> 
> /**
> * 
>@@ -20,14 +21,15 @@
> * 
> * 
> * 
>- * 	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.
>- * 
>+ * 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.
>+ * 
>+ * @since Java EE 5, Web Services Client 1.2
> * 
> * 
> *
>@@ -48,6 +50,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getHandlerChains Handler Chains}</li>
> * <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.ServiceRef#getId Id}</li>
> * </ul>
> * 
>@@ -70,7 +73,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -85,7 +88,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -100,7 +103,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
> 
> 	/**
> 	 * Returns the value of the 'Service Ref Name' attribute.
>@@ -109,12 +112,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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/".
>-	 * 
>-	 * 	 
>+	 * 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/".
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Service Ref Name' attribute.
> 	 * @see #setServiceRefName(String)
>@@ -140,12 +144,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Service Interface' attribute.
> 	 * @see #setServiceInterface(String)
>@@ -171,18 +176,20 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Service Ref Type' attribute.
> 	 * @see #setServiceRefType(String)
>@@ -208,10 +215,11 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The wsdl-file element contains the URI location of a WSDL
>-	 * 	 file. The location is relative to the root of the module.
>-	 * 
>-	 * 	 
>+	 * The wsdl-file element contains the URI location of a WSDL
>+	 * file. The location is relative to the root of the module.
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Wsdl File' attribute.
> 	 * @see #setWsdlFile(String)
>@@ -237,14 +245,15 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Jaxrpc Mapping File' attribute.
> 	 * @see #setJaxrpcMappingFile(String)
>@@ -270,18 +279,19 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Service Qname' attribute.
>-	 * @see #setServiceQname(Object)
>+	 * @see #setServiceQname(QName)
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_ServiceQname()
> 	 * @generated
> 	 */
>-	Object getServiceQname();
>+	QName getServiceQname();
> 
> 	/**
> 	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRef#getServiceQname Service Qname}' attribute.
>@@ -291,7 +301,7 @@
> 	 * @see #getServiceQname()
> 	 * @generated
> 	 */
>-	void setServiceQname(Object value);
>+	void setServiceQname(QName value);
> 
> 	/**
> 	 * Returns the value of the 'Port Component Refs' containment reference list.
>@@ -301,19 +311,20 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Port Component Refs' containment reference list.
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_PortComponentRefs()
> 	 * @generated
> 	 */
>-	List getPortComponentRefs();
>+	List<PortComponentRef> getPortComponentRefs();
> 
> 	/**
> 	 * Returns the value of the 'Handlers' containment reference list.
>@@ -323,21 +334,22 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 		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.
>-	 * 
>-	 * 	 
>+	 * 	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.
>+	 * 
>+	 * 	@since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Handlers' containment reference list.
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_Handlers()
> 	 * @generated
> 	 */
>-	List getHandlers();
>+	List<ServiceRefHandler> getHandlers();
> 
> 	/**
> 	 * Returns the value of the 'Handler Chains' containment reference.
>@@ -345,8 +357,11 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 		 To be used with JAX-WS based runtime only.
>-	 * 	 
>+	 * 
>+	 * 	 To be used with JAX-WS based runtime only.
>+	 * 
>+	 * 	 @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Handler Chains' containment reference.
> 	 * @see #setHandlerChains(ServiceRefHandlerChains)
>@@ -371,26 +386,25 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 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.
> 	 * 
>-	 * 	 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Mapped Name' attribute.
> 	 * @see #setMappedName(String)
>@@ -422,7 +436,36 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_InjectionTargets()
> 	 * @generated
> 	 */
>-	List getInjectionTargets();
>+	List<InjectionTarget> getInjectionTargets();
>+
>+	/**
>+	 * Returns the value of the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The JNDI name to be looked up to resolve a resource reference.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Lookup Name' attribute.
>+	 * @see #setLookupName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRef_LookupName()
>+	 * @generated
>+	 */
>+	String getLookupName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ServiceRef#getLookupName Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Lookup Name' attribute.
>+	 * @see #getLookupName()
>+	 * @generated
>+	 */
>+	void setLookupName(String value);
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>@@ -449,4 +492,9 @@
> 	 */
> 	void setId(String value);
> 
>+	/**
>+	 * This method is provided for API compliance with the older Java EE 5 models
>+	 * @param newServiceQname
>+	 */
>+	void setServiceQname(Object newServiceQname);
> } // ServiceRef
>\ No newline at end of file
>Index: jee-models/org/eclipse/jst/javaee/core/DisplayName.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/DisplayName.java,v
>retrieving revision 1.2
>diff -u -r1.2 DisplayName.java
>--- jee-models/org/eclipse/jst/javaee/core/DisplayName.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/DisplayName.java	14 Oct 2009 21:44:47 -0000
>@@ -18,22 +18,22 @@
> *
> * 
> * 
>- * 	
>- * 
>- * 	 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.
>- * 
>- * 	 
>+ * <![CDATA[[
>+ * 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: 
>+ * 
>+ * ...
>+ * <display-name xml:lang="en">
>+ * Employee Self Service
>+ * </display-name>
>+ * 
>+ * The value of the xml:lang attribute is "en" (English) by default. 
>+ * 
>+ * ]]>
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -80,15 +80,38 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 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.
>+	 * <div xmlns="http://www.w3.org/1999/xhtml">
>+	 * 
>+	 * <h3>lang (as an attribute name)</h3>
>+	 * 
>+	 * denotes an attribute whose value
>+	 * is a language code for the natural language of the content of
>+	 * any element; its value is inherited. This name is reserved
>+	 * by virtue of its definition in the XML specification.
>+	 * 
>+	 * </div>
>+	 * <div xmlns="http://www.w3.org/1999/xhtml">
>+	 * <h4>Notes</h4>
>+	 * 
>+	 * 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 BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
>+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
>+	 * and the IANA language subtag registry at
>+	 * <a href="http://www.iana.org/assignments/language-subtag-registry">
>+	 * http://www.iana.org/assignments/language-subtag-registry</a>
>+	 * for further information.
>+	 * 
>+	 * 
>+	 * The union allows for the 'un-declaration' of xml:lang with
>+	 * the empty string.
>+	 * 
>+	 * </div>
>+	 * 
> 	 * 
> 	 * @return the value of the 'Lang' attribute.
> 	 * @see #setLang(String)
>Index: jee-models/org/eclipse/jst/javaee/core/SecurityRoleRef.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/SecurityRoleRef.java,v
>retrieving revision 1.2
>diff -u -r1.2 SecurityRoleRef.java
>--- jee-models/org/eclipse/jst/javaee/core/SecurityRoleRef.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/SecurityRoleRef.java	14 Oct 2009 21:44:47 -0000
>@@ -20,14 +20,15 @@
> * 
> * 
> * 
>- * 	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.
>- * 
>+ * 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.
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -59,7 +60,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getSecurityRoleRef_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Role Name' attribute.
>@@ -68,12 +69,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Role Name' attribute.
> 	 * @see #setRoleName(String)
>@@ -99,12 +101,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Role Link' attribute.
> 	 * @see #setRoleLink(String)
>Index: jee-models/org/eclipse/jst/javaee/core/RunAs.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/RunAs.java,v
>retrieving revision 1.2
>diff -u -r1.2 RunAs.java
>--- jee-models/org/eclipse/jst/javaee/core/RunAs.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/RunAs.java	14 Oct 2009 21:44:47 -0000
>@@ -20,10 +20,11 @@
> * 
> * 
> * 
>- * 	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.
>- * 
>+ * 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.
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -54,7 +55,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getRunAs_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Role Name' attribute.
>Index: jee-models/org/eclipse/jst/javaee/core/MessageDestinationRef.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestinationRef.java,v
>retrieving revision 1.2
>diff -u -r1.2 MessageDestinationRef.java
>--- jee-models/org/eclipse/jst/javaee/core/MessageDestinationRef.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/MessageDestinationRef.java	14 Oct 2009 21:44:47 -0000
>@@ -19,43 +19,43 @@
> *
> * 
> * 
>- * 	
>- * 
>- * 	 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;
>- * 
>- * 	 
>+ * <![CDATA[[
>+ * 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:
>+ * 
>+ * <message-destination-ref>
>+ * <message-destination-ref-name>jms/StockQueue
>+ * </message-destination-ref-name>
>+ * <message-destination-type>javax.jms.Queue
>+ * </message-destination-type>
>+ * <message-destination-usage>Consumes
>+ * </message-destination-usage>
>+ * <message-destination-link>CorporateStocks
>+ * </message-destination-link>
>+ * </message-destination-ref>
>+ * 
>+ * ]]>
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -69,6 +69,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMessageDestinationLink Message Destination Link}</li>
> * <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getId Id}</li>
> * </ul>
> * 
>@@ -91,7 +92,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationRef_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Message Destination Ref Name' attribute.
>@@ -100,15 +101,16 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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).
>-	 * 
>-	 * 	 
>+	 * 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).
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Message Destination Ref Name' attribute.
> 	 * @see #setMessageDestinationRefName(String)
>@@ -154,7 +156,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Message Destination Usage' attribute.
>-	 * The default value is <code>"Consumes"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.MessageDestinationUsageType}.
> 	 * 
> 	 * 
>@@ -239,26 +240,25 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 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.
> 	 * 
>-	 * 	 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Mapped Name' attribute.
> 	 * @see #setMappedName(String)
>@@ -290,7 +290,36 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationRef_InjectionTargets()
> 	 * @generated
> 	 */
>-	List getInjectionTargets();
>+	List<InjectionTarget> getInjectionTargets();
>+
>+	/**
>+	 * Returns the value of the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The JNDI name to be looked up to resolve a resource reference.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Lookup Name' attribute.
>+	 * @see #setLookupName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestinationRef_LookupName()
>+	 * @generated
>+	 */
>+	String getLookupName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getLookupName Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Lookup Name' attribute.
>+	 * @see #getLookupName()
>+	 * @generated
>+	 */
>+	void setLookupName(String value);
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/core/ServiceRefHandler.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/ServiceRefHandler.java,v
>retrieving revision 1.2
>diff -u -r1.2 ServiceRefHandler.java
>--- jee-models/org/eclipse/jst/javaee/core/ServiceRefHandler.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/ServiceRefHandler.java	14 Oct 2009 21:44:47 -0000
>@@ -11,6 +11,7 @@
> package org.eclipse.jst.javaee.core;
> 
> import java.util.List;
>+import javax.xml.namespace.QName;
> 
> /**
> * 
>@@ -20,13 +21,12 @@
> * 
> * 
> * 
>- * 	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
>- * 
>+ * Declares the handler for a port-component, service-ref. Handlers can
>+ * access the init-param name/value pairs using the HandlerInfo interface.
>+ * 
>+ * Used in: port-component, service-ref
>+ * 
>+ * @since Java EE 5, Web Services Client 1.2
> * 
> * 
> *
>@@ -64,7 +64,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -79,7 +79,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -94,7 +94,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
> 
> 	/**
> 	 * Returns the value of the 'Handler Name' attribute.
>@@ -103,10 +103,11 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 Defines the name of the handler. The name must be unique
>-	 * 	 within the module.
>-	 * 
>-	 * 	 
>+	 * Defines the name of the handler. The name must be unique within the
>+	 * module.
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Handler Name' attribute.
> 	 * @see #setHandlerName(String)
>@@ -132,10 +133,10 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 Defines a fully qualified class name for the handler
>-	 * 	 implementation.
>-	 * 
>-	 * 	 
>+	 * Defines a fully qualified class name for the handler implementation.
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Handler Class' attribute.
> 	 * @see #setHandlerClass(String)
>@@ -163,30 +164,41 @@
> 	 * there really should be more of a description here...
> 	 * 
> 	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Not to be specified for JAX-WS runtime
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
>+	 * 
> 	 * @return the value of the 'Init Params' containment reference list.
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_InitParams()
> 	 * @generated
> 	 */
>-	List getInitParams();
>+	List<ParamValue> getInitParams();
> 
> 	/**
> 	 * Returns the value of the 'Soap Headers' attribute list.
>-	 * The list contents are of type {@link java.lang.Object}.
>+	 * The list contents are of type {@link javax.xml.namespace.QName}.
> 	 * 
> 	 * 
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 Defines the QName of a SOAP header that will be processed
>-	 * 	 by the handler.
>-	 * 
>-	 * 	 
>+	 * Defines the QName of a SOAP header that will be processed by the
>+	 * handler.
>+	 * 
>+	 * Not to be specified for JAX-WS runtime
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Soap Headers' attribute list.
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_SoapHeaders()
> 	 * @generated
> 	 */
>-	List getSoapHeaders();
>+	List<QName> getSoapHeaders();
> 
> 	/**
> 	 * Returns the value of the 'Soap Roles' attribute list.
>@@ -196,16 +208,17 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The soap-role element contains a SOAP actor definition that
>-	 * 	 the Handler will play as a role.
>-	 * 
>-	 * 	 
>+	 * The soap-role element contains a SOAP actor definition that the
>+	 * Handler will play as a role.
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Soap Roles' attribute list.
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_SoapRoles()
> 	 * @generated
> 	 */
>-	List getSoapRoles();
>+	List<String> getSoapRoles();
> 
> 	/**
> 	 * Returns the value of the 'Port Names' attribute list.
>@@ -215,16 +228,21 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The port-name element defines the WSDL port-name that a
>-	 * 	 handler should be associated with.
>-	 * 
>-	 * 	 
>+	 * The port-name element defines the WSDL port-name that a
>+	 * handler should be associated with. If port-name is not
>+	 * specified, the handler is assumed to be associated with
>+	 * all ports of the service.
>+	 * 
>+	 * Not to be specified for JAX-WS runtime
>+	 * 
>+	 * @since Java EE 5, Web Services Client 1.2
>+	 * 
> 	 * 
> 	 * @return the value of the 'Port Names' attribute list.
> 	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getServiceRefHandler_PortNames()
> 	 * @generated
> 	 */
>-	List getPortNames();
>+	List<String> getPortNames();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/core/Description.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/Description.java,v
>retrieving revision 1.2
>diff -u -r1.2 Description.java
>--- jee-models/org/eclipse/jst/javaee/core/Description.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/Description.java	14 Oct 2009 21:44:47 -0000
>@@ -19,19 +19,20 @@
> * 
> * 
> * 
>- * 	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).
>- * 
>+ * 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). 
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>@@ -78,15 +79,38 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 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.
>+	 * <div xmlns="http://www.w3.org/1999/xhtml">
>+	 * 
>+	 * <h3>lang (as an attribute name)</h3>
>+	 * 
>+	 * denotes an attribute whose value
>+	 * is a language code for the natural language of the content of
>+	 * any element; its value is inherited. This name is reserved
>+	 * by virtue of its definition in the XML specification.
>+	 * 
>+	 * </div>
>+	 * <div xmlns="http://www.w3.org/1999/xhtml">
>+	 * <h4>Notes</h4>
>+	 * 
>+	 * 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 BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
>+	 * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
>+	 * and the IANA language subtag registry at
>+	 * <a href="http://www.iana.org/assignments/language-subtag-registry">
>+	 * http://www.iana.org/assignments/language-subtag-registry</a>
>+	 * for further information.
>+	 * 
>+	 * 
>+	 * The union allows for the 'un-declaration' of xml:lang with
>+	 * the empty string.
>+	 * 
>+	 * </div>
>+	 * 
> 	 * 
> 	 * @return the value of the 'Lang' attribute.
> 	 * @see #setLang(String)
>Index: jee-models/org/eclipse/jst/javaee/core/UrlPatternType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/UrlPatternType.java,v
>retrieving revision 1.2
>diff -u -r1.2 UrlPatternType.java
>--- jee-models/org/eclipse/jst/javaee/core/UrlPatternType.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/UrlPatternType.java	14 Oct 2009 21:44:48 -0000
>@@ -19,14 +19,15 @@
> * 
> * 
> * 
>- * 	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.
>- * 
>+ * 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.
>+ * 
>+ * @since Java EE 5
> * 
> * 
> *
>Index: jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java,v
>retrieving revision 1.2
>diff -u -r1.2 ApplicationPackage.java
>--- jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java	26 Jul 2007 16:56:13 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java	14 Oct 2009 21:44:47 -0000
>@@ -29,266 +29,244 @@
> * 
> * 
> * 
>- * @(#)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.
> * 
>+ * $Id: application_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
>+ * 
> * 
> * 
>+ * <![CDATA[[
>+ * This is the XML Schema for the application 6 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:
> * 
>- * 
>- * 	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
>- * 
>- * 	
>+ * http://java.sun.com/xml/ns/javaee
>+ * 
>+ * and indicate the version of the schema by
>+ * using the version element as shown below:
>+ * 
>+ * <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_6.xsd"
>+ * version="6">
>+ * ...
>+ * </application>
>+ * 
>+ * 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_6.xsd
>+ * 
>+ * ]]>
> * 
> * 
> * 
> * The following conventions apply to all Java EE
> * deployment descriptor elements unless indicated otherwise.
>- * 
>+ * 
> * - In elements that specify a pathname to a file within the
>- * 	same JAR file, relative filenames (i.e., those not
>- * 	starting with "/") are considered relative to the root of
>- * 	the JAR file's namespace. Absolute filenames (i.e., those
>- * 	starting with "/") also specify names in the root of the
>- * 	JAR file's namespace. In general, relative names are
>- * 	preferred. The exception is .war files where absolute
>- * 	names are preferred for consistency with the Servlet API.
>- * 
>- * 
>- * 
>- * @(#)javaee_5.xsds	1.65 06/02/17
>+ * same JAR file, relative filenames (i.e., those not
>+ * starting with "/") are considered relative to the root of
>+ * the JAR file's namespace. Absolute filenames (i.e., those
>+ * starting with "/") also specify names in the root of the
>+ * JAR file's namespace. In general, relative names are
>+ * preferred. The exception is .war files where absolute
>+ * names are preferred for consistency with the Servlet API.
>+ * 
> * 
> * 
> * 
>- * Copyright 2003-2006 Sun Microsystems, Inc.
>- * 4150 Network Circle
>- * Santa Clara, California 95054
>- * U.S.A
>- * All rights reserved.
>- * 
>- * Sun Microsystems, Inc. has intellectual property rights
>- * relating to technology described in this document. In
>- * particular, and without limitation, these intellectual
>- * property rights may include one or more of the U.S. patents
>- * listed at http://www.sun.com/patents and one or more
>- * additional patents or pending patent applications in the
>- * U.S. and other countries.
>- * 
>- * This document and the technology which it describes are
>- * distributed under licenses restricting their use, copying,
>- * distribution, and decompilation. No part of this document
>- * may be reproduced in any form by any means without prior
>- * written authorization of Sun and its licensors, if any.
>- * 
>- * Third-party software, including font technology, is
>- * copyrighted and licensed from Sun suppliers.
>- * 
>- * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
>- * JavaServer Pages, Enterprise JavaBeans and the Java Coffee
>- * Cup logo are trademarks or registered trademarks of Sun
>- * Microsystems, Inc. in the U.S. and other countries.
>- * 
>- * Federal Acquisitions: Commercial Software - Government Users
>- * Subject to Standard License Terms and Conditions.
>- * 
>+ * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
>+ * 
> * 
> * 
> * 
>- * The following definitions that appear in the common
>- * shareable schema(s) of J2EE deployment descriptors should be
>- * interpreted with respect to the context they are included:
>- * 
>- * Deployment Component may indicate one of the following:
>- * j2ee application;
>- * application client;
>- * web application;
>- * enterprise bean;
>- * resource adapter;
>- * 
>- * Deployment File may indicate one of the following:
>- * ear file;
>- * war file;
>- * jar file;
>- * rar file;
>- * 
>- * 
>- * 
>- * @(#)javaee_web_services_client_1_2.xsds	1.19 02/13/06
>+ * The following definitions that appear in the common
>+ * shareable schema(s) of Java EE deployment descriptors should be
>+ * interpreted with respect to the context they are included:
>+ * 
>+ * Deployment Component may indicate one of the following:
>+ * java ee application;
>+ * application client;
>+ * web application;
>+ * enterprise bean;
>+ * resource adapter; 
>+ * 
>+ * Deployment File may indicate one of the following:
>+ * ear file;
>+ * war file;
>+ * jar file;
>+ * rar file;
>+ * 
> * 
> * 
> * 
>- * Copyright 2003-2006 Sun Microsystems, Inc.
>- * 4150 Network Circle
>- * Santa Clara, California 95054
>- * U.S.A
>- * All rights reserved.
>- * 
>- * Sun Microsystems, Inc. has intellectual property rights
>- * relating to technology described in this document. In
>- * particular, and without limitation, these intellectual
>- * property rights may include one or more of the U.S. patents
>- * listed at http://www.sun.com/patents and one or more
>- * additional patents or pending patent applications in the
>- * U.S. and other countries.
>- * 
>- * This document and the technology which it describes are
>- * distributed under licenses restricting their use, copying,
>- * distribution, and decompilation. No part of this document
>- * may be reproduced in any form by any means without prior
>- * written authorization of Sun and its licensors, if any.
>- * 
>- * Third-party software, including font technology, is
>- * copyrighted and licensed from Sun suppliers.
>- * 
>- * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
>- * JavaServer Pages, Enterprise JavaBeans and the Java Coffee
>- * Cup logo are trademarks or registered trademarks of Sun
>- * Microsystems, Inc. in the U.S. and other countries.
>- * 
>- * Federal Acquisitions: Commercial Software - Government Users
>- * Subject to Standard License Terms and Conditions.
>- * 
>+ * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
>+ * 
> * 
> * 
> * 
> * (C) Copyright International Business Machines Corporation 2002
>- * 
>+ * 
> * 
> * 
>- * See http://www.w3.org/XML/1998/namespace.html and
>- * http://www.w3.org/TR/REC-xml for information about this namespace.
>- * 
>- * This schema document describes the XML namespace, in a form
>- * suitable for import by other schema documents. 
>- * 
>- * Note that local names in this namespace are intended to be defined
>- * only by the World Wide Web Consortium or its subgroups. The
>- * following names are currently defined in this namespace and should
>- * not be used with conflicting semantics by any Working Group,
>- * specification, or document instance:
>- * 
>- * 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.
>+ * <div xmlns="http://www.w3.org/1999/xhtml">
>+ * <h1>About the XML namespace</h1>
> * 
>- * lang (as an attribute name): denotes an attribute whose value
>- * is a language code for the natural language of the content of
>- * any element; its value is inherited. This name is reserved
>- * by virtue of its definition in the XML specification.
>+ * <div class="bodytext">
>+ * 
>+ * This schema document describes the XML namespace, in a form
>+ * suitable for import by other schema documents.
>+ * 
>+ * 
>+ * See <a href="http://www.w3.org/XML/1998/namespace.html">
>+ * http://www.w3.org/XML/1998/namespace.html</a> and
>+ * <a href="http://www.w3.org/TR/REC-xml">
>+ * http://www.w3.org/TR/REC-xml</a> for information 
>+ * about this namespace.
>+ * 
>+ * 
>+ * Note that local names in this namespace are intended to be
>+ * defined only by the World Wide Web Consortium or its subgroups.
>+ * The names currently defined in this namespace are listed below.
>+ * They should not be used with conflicting semantics by any Working
>+ * Group, specification, or document instance.
>+ * 
>+ * 
>+ * See further below in this document for more information about <a href="#usage">how to refer to this schema document from your own
>+ * XSD schema documents</a> and about <a href="#nsversioning">the
>+ * namespace-versioning policy governing this schema document</a>.
>+ * 
>+ * </div>
>+ * </div>
> * 
>- * space (as an attribute name): denotes an attribute whose
>- * value is a keyword indicating what whitespace processing
>- * discipline is intended for the content of the element; its
>- * value is inherited. This name is reserved by virtue of its
>- * definition in the XML specification.
> * 
>- * Father (in any context at all): denotes Jon Bosak, the chair of 
>- * the original XML Working Group. This name is reserved by 
>- * the following decision of the W3C XML Plenary and 
>- * XML Coordination groups:
>- * 
>- * In appreciation for his vision, leadership and dedication
>- * the W3C XML Plenary on this 10th day of February, 2000
>- * reserves for Jon Bosak in perpetuity the XML name
>- * xml:Father
>+ * <div xmlns="http://www.w3.org/1999/xhtml">
>+ * 
>+ * <h3>Father (in any context at all)</h3> 
>+ * 
>+ * <div class="bodytext">
>+ * 
>+ * denotes Jon Bosak, the chair of 
>+ * the original XML Working Group. This name is reserved by 
>+ * the following decision of the W3C XML Plenary and 
>+ * XML Coordination groups:
>+ * 
>+ * <blockquote>
>+ * 
>+ * 	In appreciation for his vision, leadership and
>+ * 	dedication the W3C XML Plenary on this 10th day of
>+ * 	February, 2000, reserves for Jon Bosak in perpetuity
>+ * 	the XML name "xml:Father".
>+ * 
>+ * </blockquote>
>+ * </div>
>+ * </div>
> * 
>- * This schema defines attributes and an attribute group
>- * suitable for use by
>- * schemas wishing to allow xml:base, xml:lang, xml:space or xml:id
>- * attributes on elements they define.
>- * 
>- * To enable this, such a schema must import this schema
>- * for the XML namespace, e.g. as follows:
>- * &lt;schema . . .&gt;
>- * . . .
>- * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>- * schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
> * 
>- * Subsequently, qualified reference to any of the attributes
>- * or the group defined below will have the desired effect, e.g.
>+ * <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml">
>+ * <h2>
>+ * <a name="usage">About this schema document</a>
>+ * </h2>
>+ * 
>+ * <div class="bodytext">
>+ * 
>+ * This schema defines attributes and an attribute group suitable
>+ * for use by schemas wishing to allow <code>xml:base</code>,
>+ * <code>xml:lang</code>, <code>xml:space</code> or
>+ * <code>xml:id</code> attributes on elements they define.
>+ * 
>+ * 
>+ * To enable this, such a schema must import this schema for
>+ * the XML namespace, e.g. as follows:
>+ * 
>+ * <pre>
>+ * &lt;schema . . .&gt;
>+ * . . .
>+ * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>+ * schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
>+ * </pre>
>+ * 
>+ * or
>+ * 
>+ * <pre>
>+ * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>+ * schemaLocation="http://www.w3.org/2009/01/xml.xsd"/&gt;
>+ * </pre>
>+ * 
>+ * Subsequently, qualified reference to any of the attributes or the
>+ * group defined below will have the desired effect, e.g.
>+ * 
>+ * <pre>
>+ * &lt;type . . .&gt;
>+ * . . .
>+ * &lt;attributeGroup ref="xml:specialAttrs"/&gt;
>+ * </pre>
>+ * 
>+ * will define a type which will schema-validate an instance element
>+ * with any of those attributes.
>+ * 
>+ * </div>
>+ * </div>
>+ * 
> * 
>- * &lt;type . . .&gt;
>- * . . .
>- * &lt;attributeGroup ref="xml:specialAttrs"/&gt;
>- * 
>- * will define a type which will schema-validate an instance
>- * element with any of those attributes
>- * In keeping with the XML Schema WG's standard versioning
>- * policy, this schema document will persist at
>- * http://www.w3.org/2005/08/xml.xsd.
>- * At the date of issue it can also be found at
>- * http://www.w3.org/2001/xml.xsd.
>- * The schema document at that URI may however change in the future,
>- * in order to remain compatible with the latest version of XML Schema
>- * itself, or with the XML namespace itself. In other words, if the XML
>- * Schema or XML namespaces change, the version of this document at
>- * http://www.w3.org/2001/xml.xsd will change
>- * accordingly; the version at
>- * http://www.w3.org/2005/08/xml.xsd will not change.
>+ * <div id="nsversioning" xml:id="nsversioning" xmlns="http://www.w3.org/1999/xhtml">
>+ * <h2>
>+ * <a name="nsversioning">Versioning policy for this schema document</a>
>+ * </h2>
>+ * <div class="bodytext">
>+ * 
>+ * In keeping with the XML Schema WG's standard versioning
>+ * policy, this schema document will persist at
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * http://www.w3.org/2009/01/xml.xsd</a>.
>+ * 
>+ * 
>+ * At the date of issue it can also be found at
>+ * <a href="http://www.w3.org/2001/xml.xsd">
>+ * http://www.w3.org/2001/xml.xsd</a>.
>+ * 
>+ * 
>+ * The schema document at that URI may however change in the future,
>+ * in order to remain compatible with the latest version of XML
>+ * Schema itself, or with the XML namespace itself. In other words,
>+ * if the XML Schema or XML namespaces change, the version of this
>+ * document at <a href="http://www.w3.org/2001/xml.xsd">
>+ * http://www.w3.org/2001/xml.xsd 
>+ * </a> 
>+ * will change accordingly; the version at 
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * http://www.w3.org/2009/01/xml.xsd 
>+ * </a> 
>+ * will not change.
>+ * 
>+ * 
>+ * Previous dated (and unchanging) versions of this schema 
>+ * document are at:
>+ * 
>+ * <ul>
>+ * <li>
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * 	http://www.w3.org/2009/01/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2007/08/xml.xsd">
>+ * 	http://www.w3.org/2007/08/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2004/10/xml.xsd">
>+ * 	http://www.w3.org/2004/10/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2001/03/xml.xsd">
>+ * 	http://www.w3.org/2001/03/xml.xsd</a>
>+ * </li>
>+ * </ul>
>+ * </div>
>+ * </div>
> * 
> * 
> * @see org.eclipse.jst.javaee.application.ApplicationFactory
>@@ -337,13 +315,22 @@
> 	int APPLICATION = 0;
> 
> 	/**
>+	 * The feature id for the 'Application Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__APPLICATION_NAME = 0;
>+
>+	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION__DESCRIPTIONS = 0;
>+	int APPLICATION__DESCRIPTIONS = 1;
> 
> 	/**
> 	 * The feature id for the 'Display Names' containment reference list.
>@@ -352,7 +339,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION__DISPLAY_NAMES = 1;
>+	int APPLICATION__DISPLAY_NAMES = 2;
> 
> 	/**
> 	 * The feature id for the 'Icons' containment reference list.
>@@ -361,7 +348,16 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION__ICONS = 2;
>+	int APPLICATION__ICONS = 3;
>+
>+	/**
>+	 * The feature id for the 'Initialize In Order' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__INITIALIZE_IN_ORDER = 4;
> 
> 	/**
> 	 * The feature id for the 'Modules' containment reference list.
>@@ -370,7 +366,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION__MODULES = 3;
>+	int APPLICATION__MODULES = 5;
> 
> 	/**
> 	 * The feature id for the 'Security Roles' containment reference list.
>@@ -379,7 +375,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION__SECURITY_ROLES = 4;
>+	int APPLICATION__SECURITY_ROLES = 6;
> 
> 	/**
> 	 * The feature id for the 'Library Directory' attribute.
>@@ -388,7 +384,106 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION__LIBRARY_DIRECTORY = 5;
>+	int APPLICATION__LIBRARY_DIRECTORY = 7;
>+
>+	/**
>+	 * The feature id for the 'Env Entry' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__ENV_ENTRY = 8;
>+
>+	/**
>+	 * The feature id for the 'Ejb Ref' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__EJB_REF = 9;
>+
>+	/**
>+	 * The feature id for the 'Ejb Local Ref' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__EJB_LOCAL_REF = 10;
>+
>+	/**
>+	 * The feature id for the 'Service Refs' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__SERVICE_REFS = 11;
>+
>+	/**
>+	 * The feature id for the 'Resource Ref' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__RESOURCE_REF = 12;
>+
>+	/**
>+	 * The feature id for the 'Resource Env Ref' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__RESOURCE_ENV_REF = 13;
>+
>+	/**
>+	 * The feature id for the 'Message Destination Ref' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__MESSAGE_DESTINATION_REF = 14;
>+
>+	/**
>+	 * The feature id for the 'Persistence Context Ref' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__PERSISTENCE_CONTEXT_REF = 15;
>+
>+	/**
>+	 * The feature id for the 'Persistence Unit Ref' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__PERSISTENCE_UNIT_REF = 16;
>+
>+	/**
>+	 * The feature id for the 'Message Destination' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__MESSAGE_DESTINATION = 17;
>+
>+	/**
>+	 * The feature id for the 'Data Source' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION__DATA_SOURCE = 18;
> 
> 	/**
> 	 * The feature id for the 'Id' attribute.
>@@ -397,7 +492,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION__ID = 6;
>+	int APPLICATION__ID = 19;
> 
> 	/**
> 	 * The feature id for the 'Version' attribute.
>@@ -406,7 +501,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION__VERSION = 7;
>+	int APPLICATION__VERSION = 20;
> 
> 	/**
> 	 * The number of structural features of the 'Application' class.
>@@ -415,7 +510,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_FEATURE_COUNT = 8;
>+	int APPLICATION_FEATURE_COUNT = 21;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.application.internal.impl.ApplicationDeploymentDescriptorImpl Deployment Descriptor}' class.
>@@ -603,6 +698,17 @@
> 	EClass getApplication();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Application#getApplicationName Application Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Application Name'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getApplicationName()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EAttribute getApplication_ApplicationName();
>+
>+	/**
> 	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>@@ -636,6 +742,17 @@
> 	EReference getApplication_Icons();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Application#getInitializeInOrder Initialize In Order}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Initialize In Order'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getInitializeInOrder()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EAttribute getApplication_InitializeInOrder();
>+
>+	/**
> 	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getModules Modules}'.
> 	 * 
> 	 * 
>@@ -669,6 +786,127 @@
> 	EAttribute getApplication_LibraryDirectory();
> 
> 	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getEnvEntry Env Entry}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Env Entry'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getEnvEntry()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EReference getApplication_EnvEntry();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getEjbRef Ejb Ref}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Ejb Ref'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getEjbRef()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EReference getApplication_EjbRef();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getEjbLocalRef Ejb Local Ref}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Ejb Local Ref'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getEjbLocalRef()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EReference getApplication_EjbLocalRef();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getServiceRefs Service Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Service Refs'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getServiceRefs()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EReference getApplication_ServiceRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getResourceRef Resource Ref}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Resource Ref'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getResourceRef()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EReference getApplication_ResourceRef();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getResourceEnvRef Resource Env Ref}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Resource Env Ref'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getResourceEnvRef()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EReference getApplication_ResourceEnvRef();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getMessageDestinationRef Message Destination Ref}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Message Destination Ref'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getMessageDestinationRef()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EReference getApplication_MessageDestinationRef();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getPersistenceContextRef Persistence Context Ref}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Persistence Context Ref'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getPersistenceContextRef()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EReference getApplication_PersistenceContextRef();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getPersistenceUnitRef Persistence Unit Ref}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Persistence Unit Ref'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getPersistenceUnitRef()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EReference getApplication_PersistenceUnitRef();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getMessageDestination Message Destination}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Message Destination'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getMessageDestination()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EReference getApplication_MessageDestination();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.application.Application#getDataSource Data Source}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Data Source'.
>+	 * @see org.eclipse.jst.javaee.application.Application#getDataSource()
>+	 * @see #getApplication()
>+	 * @generated
>+	 */
>+	EReference getApplication_DataSource();
>+
>+	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.application.Application#getId Id}'.
> 	 * 
> 	 * 
>@@ -896,6 +1134,14 @@
> 		EClass APPLICATION = eINSTANCE.getApplication();
> 
> 		/**
>+		 * The meta object literal for the 'Application Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute APPLICATION__APPLICATION_NAME = eINSTANCE.getApplication_ApplicationName();
>+
>+		/**
> 		 * The meta object literal for the 'Descriptions' containment reference list feature.
> 		 * 
> 		 * 
>@@ -920,6 +1166,14 @@
> 		EReference APPLICATION__ICONS = eINSTANCE.getApplication_Icons();
> 
> 		/**
>+		 * The meta object literal for the 'Initialize In Order' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute APPLICATION__INITIALIZE_IN_ORDER = eINSTANCE.getApplication_InitializeInOrder();
>+
>+		/**
> 		 * The meta object literal for the 'Modules' containment reference list feature.
> 		 * 
> 		 * 
>@@ -944,6 +1198,94 @@
> 		EAttribute APPLICATION__LIBRARY_DIRECTORY = eINSTANCE.getApplication_LibraryDirectory();
> 
> 		/**
>+		 * The meta object literal for the 'Env Entry' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference APPLICATION__ENV_ENTRY = eINSTANCE.getApplication_EnvEntry();
>+
>+		/**
>+		 * The meta object literal for the 'Ejb Ref' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference APPLICATION__EJB_REF = eINSTANCE.getApplication_EjbRef();
>+
>+		/**
>+		 * The meta object literal for the 'Ejb Local Ref' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference APPLICATION__EJB_LOCAL_REF = eINSTANCE.getApplication_EjbLocalRef();
>+
>+		/**
>+		 * The meta object literal for the 'Service Refs' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference APPLICATION__SERVICE_REFS = eINSTANCE.getApplication_ServiceRefs();
>+
>+		/**
>+		 * The meta object literal for the 'Resource Ref' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference APPLICATION__RESOURCE_REF = eINSTANCE.getApplication_ResourceRef();
>+
>+		/**
>+		 * The meta object literal for the 'Resource Env Ref' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference APPLICATION__RESOURCE_ENV_REF = eINSTANCE.getApplication_ResourceEnvRef();
>+
>+		/**
>+		 * The meta object literal for the 'Message Destination Ref' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference APPLICATION__MESSAGE_DESTINATION_REF = eINSTANCE.getApplication_MessageDestinationRef();
>+
>+		/**
>+		 * The meta object literal for the 'Persistence Context Ref' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference APPLICATION__PERSISTENCE_CONTEXT_REF = eINSTANCE.getApplication_PersistenceContextRef();
>+
>+		/**
>+		 * The meta object literal for the 'Persistence Unit Ref' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference APPLICATION__PERSISTENCE_UNIT_REF = eINSTANCE.getApplication_PersistenceUnitRef();
>+
>+		/**
>+		 * The meta object literal for the 'Message Destination' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference APPLICATION__MESSAGE_DESTINATION = eINSTANCE.getApplication_MessageDestination();
>+
>+		/**
>+		 * The meta object literal for the 'Data Source' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference APPLICATION__DATA_SOURCE = eINSTANCE.getApplication_DataSource();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 ServiceRefImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefImpl.java	9 Jun 2009 22:38:41 -0000	1.4
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -13,6 +13,7 @@
> import java.util.Collection;
> import java.util.List;
> 
>+import javax.xml.namespace.QName;
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
> 
>@@ -59,6 +60,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getHandlerChains Handler Chains}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefImpl#getId Id}</li>
> * </ul>
> * 
>@@ -74,7 +76,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>@@ -84,7 +86,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -94,7 +96,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
> 
> 	/**
> 	 * The default value of the '{@link #getServiceRefName() Service Ref Name}' attribute.
>@@ -204,7 +206,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected static final Object SERVICE_QNAME_EDEFAULT = null;
>+	protected static final QName SERVICE_QNAME_EDEFAULT = null;
> 
> 	/**
> 	 * The cached value of the '{@link #getServiceQname() Service Qname}' attribute.
>@@ -214,7 +216,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Object serviceQname = SERVICE_QNAME_EDEFAULT;
>+	protected QName serviceQname = SERVICE_QNAME_EDEFAULT;
> 
> 	/**
> 	 * The cached value of the '{@link #getPortComponentRefs() Port Component Refs}' containment reference list.
>@@ -224,7 +226,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList portComponentRefs = null;
>+	protected EList<PortComponentRef> portComponentRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getHandlers() Handlers}' containment reference list.
>@@ -234,7 +236,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList handlers = null;
>+	protected EList<ServiceRefHandler> handlers;
> 
> 	/**
> 	 * The cached value of the '{@link #getHandlerChains() Handler Chains}' containment reference.
>@@ -244,7 +246,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected ServiceRefHandlerChains handlerChains = null;
>+	protected ServiceRefHandlerChains handlerChains;
> 
> 	/**
> 	 * The default value of the '{@link #getMappedName() Mapped Name}' attribute.
>@@ -274,7 +276,27 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList injectionTargets = null;
>+	protected EList<InjectionTarget> injectionTargets;
>+
>+	/**
>+	 * The default value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String LOOKUP_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String lookupName = LOOKUP_NAME_EDEFAULT;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -320,9 +342,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.SERVICE_REF__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.SERVICE_REF__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -332,9 +354,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, JavaeePackage.SERVICE_REF__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, JavaeePackage.SERVICE_REF__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -344,9 +366,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, JavaeePackage.SERVICE_REF__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, JavaeePackage.SERVICE_REF__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -461,7 +483,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Object getServiceQname() {
>+	public QName getServiceQname() {
> 		return serviceQname;
> 	}
> 
>@@ -470,8 +492,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public void setServiceQname(Object newServiceQname) {
>-		Object oldServiceQname = serviceQname;
>+	public void setServiceQname(QName newServiceQname) {
>+		QName oldServiceQname = serviceQname;
> 		serviceQname = newServiceQname;
> 		if (eNotificationRequired())
> 			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF__SERVICE_QNAME, oldServiceQname, serviceQname));
>@@ -482,9 +504,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPortComponentRefs() {
>+	public List<PortComponentRef> getPortComponentRefs() {
> 		if (portComponentRefs == null) {
>-			portComponentRefs = new EObjectContainmentEList(PortComponentRef.class, this, JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS);
>+			portComponentRefs = new EObjectContainmentEList<PortComponentRef>(PortComponentRef.class, this, JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS);
> 		}
> 		return portComponentRefs;
> 	}
>@@ -494,9 +516,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getHandlers() {
>+	public List<ServiceRefHandler> getHandlers() {
> 		if (handlers == null) {
>-			handlers = new EObjectContainmentEList(ServiceRefHandler.class, this, JavaeePackage.SERVICE_REF__HANDLERS);
>+			handlers = new EObjectContainmentEList<ServiceRefHandler>(ServiceRefHandler.class, this, JavaeePackage.SERVICE_REF__HANDLERS);
> 		}
> 		return handlers;
> 	}
>@@ -570,9 +592,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInjectionTargets() {
>+	public List<InjectionTarget> getInjectionTargets() {
> 		if (injectionTargets == null) {
>-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.SERVICE_REF__INJECTION_TARGETS);
>+			injectionTargets = new EObjectContainmentEList<InjectionTarget>(InjectionTarget.class, this, JavaeePackage.SERVICE_REF__INJECTION_TARGETS);
> 		}
> 		return injectionTargets;
> 	}
>@@ -582,6 +604,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String getLookupName() {
>+		return lookupName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLookupName(String newLookupName) {
>+		String oldLookupName = lookupName;
>+		lookupName = newLookupName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF__LOOKUP_NAME, oldLookupName, lookupName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -607,19 +650,19 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.SERVICE_REF__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.SERVICE_REF__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.SERVICE_REF__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS:
>-				return ((InternalEList)getPortComponentRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPortComponentRefs()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.SERVICE_REF__HANDLERS:
>-				return ((InternalEList)getHandlers()).basicRemove(otherEnd, msgs);
>+				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 ((InternalEList<?>)getInjectionTargets()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -660,6 +703,8 @@
> 				return getMappedName();
> 			case JavaeePackage.SERVICE_REF__INJECTION_TARGETS:
> 				return getInjectionTargets();
>+			case JavaeePackage.SERVICE_REF__LOOKUP_NAME:
>+				return getLookupName();
> 			case JavaeePackage.SERVICE_REF__ID:
> 				return getId();
> 		}
>@@ -671,20 +716,21 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.SERVICE_REF__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF__SERVICE_REF_NAME:
> 				setServiceRefName((String)newValue);
>@@ -702,15 +748,15 @@
> 				setJaxrpcMappingFile((String)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF__SERVICE_QNAME:
>-				setServiceQname(newValue);
>+				setServiceQname((QName)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS:
> 				getPortComponentRefs().clear();
>-				getPortComponentRefs().addAll((Collection)newValue);
>+				getPortComponentRefs().addAll((Collection<? extends PortComponentRef>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF__HANDLERS:
> 				getHandlers().clear();
>-				getHandlers().addAll((Collection)newValue);
>+				getHandlers().addAll((Collection<? extends ServiceRefHandler>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF__HANDLER_CHAINS:
> 				setHandlerChains((ServiceRefHandlerChains)newValue);
>@@ -720,7 +766,10 @@
> 				return;
> 			case JavaeePackage.SERVICE_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
>-				getInjectionTargets().addAll((Collection)newValue);
>+				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
>+				return;
>+			case JavaeePackage.SERVICE_REF__LOOKUP_NAME:
>+				setLookupName((String)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF__ID:
> 				setId((String)newValue);
>@@ -779,6 +828,9 @@
> 			case JavaeePackage.SERVICE_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
> 				return;
>+			case JavaeePackage.SERVICE_REF__LOOKUP_NAME:
>+				setLookupName(LOOKUP_NAME_EDEFAULT);
>+				return;
> 			case JavaeePackage.SERVICE_REF__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -822,6 +874,8 @@
> 				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__LOOKUP_NAME:
>+				return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName);
> 			case JavaeePackage.SERVICE_REF__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -852,10 +906,24 @@
> 		result.append(serviceQname);
> 		result.append(", mappedName: "); //$NON-NLS-1$
> 		result.append(mappedName);
>+		result.append(", lookupName: "); //$NON-NLS-1$
>+		result.append(lookupName);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
> 		return result.toString();
> 	}
> 
>+	public void setServiceQname(Object newServiceQname) {
>+		if (newServiceQname instanceof QName)
>+		{
>+			setServiceQname((QName)newServiceQname);
>+		}
>+		else
>+		{
>+			QName newQName = QName.valueOf(newServiceQname.toString());
>+			setServiceQname(newQName);
>+		}
>+	}
>+
> } //ServiceRefImpl
>\ No newline at end of file
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainsImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainsImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ServiceRefHandlerChainsImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainsImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainsImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -55,7 +55,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList handlerChains = null;
>+	protected EList<ServiceRefHandlerChain> handlerChains;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -101,9 +101,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getHandlerChains() {
>+	public List<ServiceRefHandlerChain> getHandlerChains() {
> 		if (handlerChains == null) {
>-			handlerChains = new EObjectContainmentEList(ServiceRefHandlerChain.class, this, JavaeePackage.SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS);
>+			handlerChains = new EObjectContainmentEList<ServiceRefHandlerChain>(ServiceRefHandlerChain.class, this, JavaeePackage.SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS);
> 		}
> 		return handlerChains;
> 	}
>@@ -138,7 +138,7 @@
> 	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 ((InternalEList<?>)getHandlerChains()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -164,12 +164,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS:
> 				getHandlerChains().clear();
>-				getHandlerChains().addAll((Collection)newValue);
>+				getHandlerChains().addAll((Collection<? extends ServiceRefHandlerChain>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF_HANDLER_CHAINS__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleRefImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleRefImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 SecurityRoleRefImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleRefImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleRefImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -57,7 +57,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getRoleName() Role Name}' attribute.
>@@ -143,9 +143,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.SECURITY_ROLE_REF__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.SECURITY_ROLE_REF__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -222,7 +222,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.SECURITY_ROLE_REF__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -252,12 +252,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.SECURITY_ROLE_REF__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.SECURITY_ROLE_REF__ROLE_NAME:
> 				setRoleName((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/RunAsImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/RunAsImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 RunAsImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/RunAsImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/RunAsImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -56,7 +56,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getRoleName() Role Name}' attribute.
>@@ -122,9 +122,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.RUN_AS__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.RUN_AS__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -180,7 +180,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.RUN_AS__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -208,12 +208,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.RUN_AS__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.RUN_AS__ROLE_NAME:
> 				setRoleName((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationRefImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationRefImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 MessageDestinationRefImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationRefImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationRefImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -48,6 +48,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getMessageDestinationLink Message Destination Link}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl#getId Id}</li>
> * </ul>
> * 
>@@ -63,7 +64,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getMessageDestinationRefName() Message Destination Ref Name}' attribute.
>@@ -132,7 +133,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean messageDestinationUsageESet = false;
>+	protected boolean messageDestinationUsageESet;
> 
> 	/**
> 	 * The default value of the '{@link #getMessageDestinationLink() Message Destination Link}' attribute.
>@@ -182,7 +183,27 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList injectionTargets = null;
>+	protected EList<InjectionTarget> injectionTargets;
>+
>+	/**
>+	 * The default value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String LOOKUP_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String lookupName = LOOKUP_NAME_EDEFAULT;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -228,9 +249,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -370,9 +391,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInjectionTargets() {
>+	public List<InjectionTarget> getInjectionTargets() {
> 		if (injectionTargets == null) {
>-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.MESSAGE_DESTINATION_REF__INJECTION_TARGETS);
>+			injectionTargets = new EObjectContainmentEList<InjectionTarget>(InjectionTarget.class, this, JavaeePackage.MESSAGE_DESTINATION_REF__INJECTION_TARGETS);
> 		}
> 		return injectionTargets;
> 	}
>@@ -382,6 +403,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String getLookupName() {
>+		return lookupName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLookupName(String newLookupName) {
>+		String oldLookupName = lookupName;
>+		lookupName = newLookupName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.MESSAGE_DESTINATION_REF__LOOKUP_NAME, oldLookupName, lookupName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -407,9 +449,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.MESSAGE_DESTINATION_REF__INJECTION_TARGETS:
>-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInjectionTargets()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -436,6 +478,8 @@
> 				return getMappedName();
> 			case JavaeePackage.MESSAGE_DESTINATION_REF__INJECTION_TARGETS:
> 				return getInjectionTargets();
>+			case JavaeePackage.MESSAGE_DESTINATION_REF__LOOKUP_NAME:
>+				return getLookupName();
> 			case JavaeePackage.MESSAGE_DESTINATION_REF__ID:
> 				return getId();
> 		}
>@@ -447,12 +491,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.MESSAGE_DESTINATION_REF__MESSAGE_DESTINATION_REF_NAME:
> 				setMessageDestinationRefName((String)newValue);
>@@ -471,7 +516,10 @@
> 				return;
> 			case JavaeePackage.MESSAGE_DESTINATION_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
>-				getInjectionTargets().addAll((Collection)newValue);
>+				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
>+				return;
>+			case JavaeePackage.MESSAGE_DESTINATION_REF__LOOKUP_NAME:
>+				setLookupName((String)newValue);
> 				return;
> 			case JavaeePackage.MESSAGE_DESTINATION_REF__ID:
> 				setId((String)newValue);
>@@ -509,6 +557,9 @@
> 			case JavaeePackage.MESSAGE_DESTINATION_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
> 				return;
>+			case JavaeePackage.MESSAGE_DESTINATION_REF__LOOKUP_NAME:
>+				setLookupName(LOOKUP_NAME_EDEFAULT);
>+				return;
> 			case JavaeePackage.MESSAGE_DESTINATION_REF__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -538,6 +589,8 @@
> 				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__LOOKUP_NAME:
>+				return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName);
> 			case JavaeePackage.MESSAGE_DESTINATION_REF__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -564,6 +617,8 @@
> 		result.append(messageDestinationLink);
> 		result.append(", mappedName: "); //$NON-NLS-1$
> 		result.append(mappedName);
>+		result.append(", lookupName: "); //$NON-NLS-1$
>+		result.append(lookupName);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ServiceRefHandlerImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -13,6 +13,7 @@
> import java.util.Collection;
> import java.util.List;
> 
>+import javax.xml.namespace.QName;
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
> 
>@@ -67,7 +68,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>@@ -77,7 +78,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -87,7 +88,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
> 
> 	/**
> 	 * The default value of the '{@link #getHandlerName() Handler Name}' attribute.
>@@ -137,7 +138,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList initParams = null;
>+	protected EList<ParamValue> initParams;
> 
> 	/**
> 	 * The cached value of the '{@link #getSoapHeaders() Soap Headers}' attribute list.
>@@ -147,7 +148,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList soapHeaders = null;
>+	protected EList<QName> soapHeaders;
> 
> 	/**
> 	 * The cached value of the '{@link #getSoapRoles() Soap Roles}' attribute list.
>@@ -157,7 +158,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList soapRoles = null;
>+	protected EList<String> soapRoles;
> 
> 	/**
> 	 * The cached value of the '{@link #getPortNames() Port Names}' attribute list.
>@@ -167,7 +168,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList portNames = null;
>+	protected EList<String> portNames;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -213,9 +214,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.SERVICE_REF_HANDLER__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.SERVICE_REF_HANDLER__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -225,9 +226,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, JavaeePackage.SERVICE_REF_HANDLER__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, JavaeePackage.SERVICE_REF_HANDLER__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -237,9 +238,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, JavaeePackage.SERVICE_REF_HANDLER__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, JavaeePackage.SERVICE_REF_HANDLER__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -291,9 +292,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInitParams() {
>+	public List<ParamValue> getInitParams() {
> 		if (initParams == null) {
>-			initParams = new EObjectContainmentEList(ParamValue.class, this, JavaeePackage.SERVICE_REF_HANDLER__INIT_PARAMS);
>+			initParams = new EObjectContainmentEList<ParamValue>(ParamValue.class, this, JavaeePackage.SERVICE_REF_HANDLER__INIT_PARAMS);
> 		}
> 		return initParams;
> 	}
>@@ -303,9 +304,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getSoapHeaders() {
>+	public List<QName> getSoapHeaders() {
> 		if (soapHeaders == null) {
>-			soapHeaders = new EDataTypeEList(Object.class, this, JavaeePackage.SERVICE_REF_HANDLER__SOAP_HEADERS);
>+			soapHeaders = new EDataTypeEList<QName>(QName.class, this, JavaeePackage.SERVICE_REF_HANDLER__SOAP_HEADERS);
> 		}
> 		return soapHeaders;
> 	}
>@@ -315,9 +316,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getSoapRoles() {
>+	public List<String> getSoapRoles() {
> 		if (soapRoles == null) {
>-			soapRoles = new EDataTypeEList(String.class, this, JavaeePackage.SERVICE_REF_HANDLER__SOAP_ROLES);
>+			soapRoles = new EDataTypeEList<String>(String.class, this, JavaeePackage.SERVICE_REF_HANDLER__SOAP_ROLES);
> 		}
> 		return soapRoles;
> 	}
>@@ -327,9 +328,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPortNames() {
>+	public List<String> getPortNames() {
> 		if (portNames == null) {
>-			portNames = new EDataTypeEList(String.class, this, JavaeePackage.SERVICE_REF_HANDLER__PORT_NAMES);
>+			portNames = new EDataTypeEList<String>(String.class, this, JavaeePackage.SERVICE_REF_HANDLER__PORT_NAMES);
> 		}
> 		return portNames;
> 	}
>@@ -364,13 +365,13 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.SERVICE_REF_HANDLER__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.SERVICE_REF_HANDLER__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.SERVICE_REF_HANDLER__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.SERVICE_REF_HANDLER__INIT_PARAMS:
>-				return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInitParams()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -412,20 +413,21 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.SERVICE_REF_HANDLER__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF_HANDLER__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF_HANDLER__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF_HANDLER__HANDLER_NAME:
> 				setHandlerName((String)newValue);
>@@ -435,19 +437,19 @@
> 				return;
> 			case JavaeePackage.SERVICE_REF_HANDLER__INIT_PARAMS:
> 				getInitParams().clear();
>-				getInitParams().addAll((Collection)newValue);
>+				getInitParams().addAll((Collection<? extends ParamValue>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF_HANDLER__SOAP_HEADERS:
> 				getSoapHeaders().clear();
>-				getSoapHeaders().addAll((Collection)newValue);
>+				getSoapHeaders().addAll((Collection<? extends QName>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF_HANDLER__SOAP_ROLES:
> 				getSoapRoles().clear();
>-				getSoapRoles().addAll((Collection)newValue);
>+				getSoapRoles().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF_HANDLER__PORT_NAMES:
> 				getPortNames().clear();
>-				getPortNames().addAll((Collection)newValue);
>+				getPortNames().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF_HANDLER__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeeFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeeFactoryImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 JavaeeFactoryImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeeFactoryImpl.java	9 Jun 2009 22:38:41 -0000	1.4
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeeFactoryImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -11,7 +11,6 @@
> package org.eclipse.jst.javaee.core.internal.impl;
> 
> import java.util.ArrayList;
>-import java.util.Iterator;
> import java.util.List;
> import java.util.StringTokenizer;
> 
>@@ -77,6 +76,8 @@
> 	@Override
> 	public EObject create(EClass eClass) {
> 		switch (eClass.getClassifierID()) {
>+			case JavaeePackage.ADDRESSING_TYPE: return (EObject)createAddressingType();
>+			case JavaeePackage.DATA_SOURCE_TYPE: return (EObject)createDataSourceType();
> 			case JavaeePackage.DESCRIPTION: return (EObject)createDescription();
> 			case JavaeePackage.DISPLAY_NAME: return (EObject)createDisplayName();
> 			case JavaeePackage.EJB_LOCAL_REF: return (EObject)createEjbLocalRef();
>@@ -96,6 +97,7 @@
> 			case JavaeePackage.PROPERTY_TYPE: return (EObject)createPropertyType();
> 			case JavaeePackage.RESOURCE_ENV_REF: return (EObject)createResourceEnvRef();
> 			case JavaeePackage.RESOURCE_REF: return (EObject)createResourceRef();
>+			case JavaeePackage.RESPECT_BINDING_TYPE: return (EObject)createRespectBindingType();
> 			case JavaeePackage.RUN_AS: return (EObject)createRunAs();
> 			case JavaeePackage.SECURITY_ROLE: return (EObject)createSecurityRole();
> 			case JavaeePackage.SECURITY_ROLE_REF: return (EObject)createSecurityRoleRef();
>@@ -117,10 +119,14 @@
> 	@Override
> 	public Object createFromString(EDataType eDataType, String initialValue) {
> 		switch (eDataType.getClassifierID()) {
>+			case JavaeePackage.ADDRESSING_RESPONSES_TYPE:
>+				return createAddressingResponsesTypeFromString(eDataType, initialValue);
> 			case JavaeePackage.EJB_REF_TYPE:
> 				return createEjbRefTypeFromString(eDataType, initialValue);
>-			case JavaeePackage.ENV_ENTRY_TYPE:
>-				return createEnvEntryTypeFromString(eDataType, initialValue);
>+			case JavaeePackage.GENERIC_BOOLEAN_TYPE:
>+				return createGenericBooleanTypeFromString(eDataType, initialValue);
>+			case JavaeePackage.ISOLATION_LEVEL_TYPE:
>+				return createIsolationLevelTypeFromString(eDataType, initialValue);
> 			case JavaeePackage.MESSAGE_DESTINATION_USAGE_TYPE:
> 				return createMessageDestinationUsageTypeFromString(eDataType, initialValue);
> 			case JavaeePackage.PERSISTENCE_CONTEXT_TYPE:
>@@ -129,6 +135,8 @@
> 				return createResAuthTypeFromString(eDataType, initialValue);
> 			case JavaeePackage.RES_SHARING_SCOPE_TYPE:
> 				return createResSharingScopeTypeFromString(eDataType, initialValue);
>+			case JavaeePackage.ADDRESSING_RESPONSES_TYPE_OBJECT:
>+				return createAddressingResponsesTypeObjectFromString(eDataType, initialValue);
> 			case JavaeePackage.DEWEY_VERSION_TYPE:
> 				return createDeweyVersionTypeFromString(eDataType, initialValue);
> 			case JavaeePackage.EJB_LINK:
>@@ -137,16 +145,22 @@
> 				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.ENV_ENTRY_TYPE:
>+				return createEnvEntryTypeFromString(eDataType, initialValue);
> 			case JavaeePackage.FULLY_QUALIFIED_CLASS_TYPE:
> 				return createFullyQualifiedClassTypeFromString(eDataType, initialValue);
>+			case JavaeePackage.GENERIC_BOOLEAN_TYPE_OBJECT:
>+				return createGenericBooleanTypeObjectFromString(eDataType, initialValue);
> 			case JavaeePackage.HOME:
> 				return createHomeFromString(eDataType, initialValue);
>+			case JavaeePackage.ISOLATION_LEVEL_TYPE_OBJECT:
>+				return createIsolationLevelTypeObjectFromString(eDataType, initialValue);
> 			case JavaeePackage.JAVA_IDENTIFIER:
> 				return createJavaIdentifierFromString(eDataType, initialValue);
> 			case JavaeePackage.JAVA_TYPE:
> 				return createJavaTypeFromString(eDataType, initialValue);
>+			case JavaeePackage.JDBC_URL_TYPE:
>+				return createJdbcUrlTypeFromString(eDataType, initialValue);
> 			case JavaeePackage.JNDI_NAME:
> 				return createJNDINameFromString(eDataType, initialValue);
> 			case JavaeePackage.LOCAL:
>@@ -163,6 +177,14 @@
> 				return createPathTypeFromString(eDataType, initialValue);
> 			case JavaeePackage.PERSISTENCE_CONTEXT_TYPE_OBJECT:
> 				return createPersistenceContextTypeObjectFromString(eDataType, initialValue);
>+			case JavaeePackage.PROTOCOL_BINDING_LIST_TYPE:
>+				return createProtocolBindingListTypeFromString(eDataType, initialValue);
>+			case JavaeePackage.PROTOCOL_BINDING_TYPE:
>+				return createProtocolBindingTypeFromString(eDataType, initialValue);
>+			case JavaeePackage.PROTOCOL_URI_ALIAS_TYPE:
>+				return createProtocolURIAliasTypeFromString(eDataType, initialValue);
>+			case JavaeePackage.QNAME_PATTERN:
>+				return createQnamePatternFromString(eDataType, initialValue);
> 			case JavaeePackage.REMOTE:
> 				return createRemoteFromString(eDataType, initialValue);
> 			case JavaeePackage.RES_AUTH_TYPE_OBJECT:
>@@ -171,14 +193,6 @@
> 				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:
>@@ -196,10 +210,14 @@
> 	@Override
> 	public String convertToString(EDataType eDataType, Object instanceValue) {
> 		switch (eDataType.getClassifierID()) {
>+			case JavaeePackage.ADDRESSING_RESPONSES_TYPE:
>+				return convertAddressingResponsesTypeToString(eDataType, instanceValue);
> 			case JavaeePackage.EJB_REF_TYPE:
> 				return convertEjbRefTypeToString(eDataType, instanceValue);
>-			case JavaeePackage.ENV_ENTRY_TYPE:
>-				return convertEnvEntryTypeToString(eDataType, instanceValue);
>+			case JavaeePackage.GENERIC_BOOLEAN_TYPE:
>+				return convertGenericBooleanTypeToString(eDataType, instanceValue);
>+			case JavaeePackage.ISOLATION_LEVEL_TYPE:
>+				return convertIsolationLevelTypeToString(eDataType, instanceValue);
> 			case JavaeePackage.MESSAGE_DESTINATION_USAGE_TYPE:
> 				return convertMessageDestinationUsageTypeToString(eDataType, instanceValue);
> 			case JavaeePackage.PERSISTENCE_CONTEXT_TYPE:
>@@ -208,6 +226,8 @@
> 				return convertResAuthTypeToString(eDataType, instanceValue);
> 			case JavaeePackage.RES_SHARING_SCOPE_TYPE:
> 				return convertResSharingScopeTypeToString(eDataType, instanceValue);
>+			case JavaeePackage.ADDRESSING_RESPONSES_TYPE_OBJECT:
>+				return convertAddressingResponsesTypeObjectToString(eDataType, instanceValue);
> 			case JavaeePackage.DEWEY_VERSION_TYPE:
> 				return convertDeweyVersionTypeToString(eDataType, instanceValue);
> 			case JavaeePackage.EJB_LINK:
>@@ -216,16 +236,22 @@
> 				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.ENV_ENTRY_TYPE:
>+				return convertEnvEntryTypeToString(eDataType, instanceValue);
> 			case JavaeePackage.FULLY_QUALIFIED_CLASS_TYPE:
> 				return convertFullyQualifiedClassTypeToString(eDataType, instanceValue);
>+			case JavaeePackage.GENERIC_BOOLEAN_TYPE_OBJECT:
>+				return convertGenericBooleanTypeObjectToString(eDataType, instanceValue);
> 			case JavaeePackage.HOME:
> 				return convertHomeToString(eDataType, instanceValue);
>+			case JavaeePackage.ISOLATION_LEVEL_TYPE_OBJECT:
>+				return convertIsolationLevelTypeObjectToString(eDataType, instanceValue);
> 			case JavaeePackage.JAVA_IDENTIFIER:
> 				return convertJavaIdentifierToString(eDataType, instanceValue);
> 			case JavaeePackage.JAVA_TYPE:
> 				return convertJavaTypeToString(eDataType, instanceValue);
>+			case JavaeePackage.JDBC_URL_TYPE:
>+				return convertJdbcUrlTypeToString(eDataType, instanceValue);
> 			case JavaeePackage.JNDI_NAME:
> 				return convertJNDINameToString(eDataType, instanceValue);
> 			case JavaeePackage.LOCAL:
>@@ -242,6 +268,14 @@
> 				return convertPathTypeToString(eDataType, instanceValue);
> 			case JavaeePackage.PERSISTENCE_CONTEXT_TYPE_OBJECT:
> 				return convertPersistenceContextTypeObjectToString(eDataType, instanceValue);
>+			case JavaeePackage.PROTOCOL_BINDING_LIST_TYPE:
>+				return convertProtocolBindingListTypeToString(eDataType, instanceValue);
>+			case JavaeePackage.PROTOCOL_BINDING_TYPE:
>+				return convertProtocolBindingTypeToString(eDataType, instanceValue);
>+			case JavaeePackage.PROTOCOL_URI_ALIAS_TYPE:
>+				return convertProtocolURIAliasTypeToString(eDataType, instanceValue);
>+			case JavaeePackage.QNAME_PATTERN:
>+				return convertQnamePatternToString(eDataType, instanceValue);
> 			case JavaeePackage.REMOTE:
> 				return convertRemoteToString(eDataType, instanceValue);
> 			case JavaeePackage.RES_AUTH_TYPE_OBJECT:
>@@ -250,14 +284,6 @@
> 				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:
>@@ -272,6 +298,26 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public AddressingType createAddressingType() {
>+		AddressingTypeImpl addressingType = new AddressingTypeImpl();
>+		return addressingType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public DataSourceType createDataSourceType() {
>+		DataSourceTypeImpl dataSourceType = new DataSourceTypeImpl();
>+		return dataSourceType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public Description createDescription() {
> 		DescriptionImpl description = new DescriptionImpl();
> 		return description;
>@@ -462,6 +508,16 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public RespectBindingType createRespectBindingType() {
>+		RespectBindingTypeImpl respectBindingType = new RespectBindingTypeImpl();
>+		return respectBindingType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public RunAs createRunAs() {
> 		RunAsImpl runAs = new RunAsImpl();
> 		return runAs;
>@@ -542,6 +598,26 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public AddressingResponsesType createAddressingResponsesTypeFromString(EDataType eDataType, String initialValue) {
>+		AddressingResponsesType result = AddressingResponsesType.get(initialValue);
>+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>+		return result;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertAddressingResponsesTypeToString(EDataType eDataType, Object instanceValue) {
>+		return instanceValue == null ? null : instanceValue.toString();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @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$
>@@ -562,8 +638,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EnvEntryType createEnvEntryTypeFromString(EDataType eDataType, String initialValue) {
>-		EnvEntryType result = EnvEntryType.get(initialValue);
>+	public GenericBooleanType createGenericBooleanTypeFromString(EDataType eDataType, String initialValue) {
>+		GenericBooleanType result = GenericBooleanType.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;
> 	}
>@@ -573,7 +649,27 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String convertEnvEntryTypeToString(EDataType eDataType, Object instanceValue) {
>+	public String convertGenericBooleanTypeToString(EDataType eDataType, Object instanceValue) {
>+		return instanceValue == null ? null : instanceValue.toString();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public IsolationLevelType createIsolationLevelTypeFromString(EDataType eDataType, String initialValue) {
>+		IsolationLevelType result = IsolationLevelType.get(initialValue);
>+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>+		return result;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertIsolationLevelTypeToString(EDataType eDataType, Object instanceValue) {
> 		return instanceValue == null ? null : instanceValue.toString();
> 	}
> 
>@@ -582,6 +678,24 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String createEnvEntryTypeFromString(EDataType eDataType, String initialValue) {
>+		return createFullyQualifiedClassTypeFromString(JavaeePackage.Literals.FULLY_QUALIFIED_CLASS_TYPE, initialValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertEnvEntryTypeToString(EDataType eDataType, Object instanceValue) {
>+		return convertFullyQualifiedClassTypeToString(JavaeePackage.Literals.FULLY_QUALIFIED_CLASS_TYPE, instanceValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @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$
>@@ -662,6 +776,24 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public AddressingResponsesType createAddressingResponsesTypeObjectFromString(EDataType eDataType, String initialValue) {
>+		return createAddressingResponsesTypeFromString(JavaeePackage.Literals.ADDRESSING_RESPONSES_TYPE, initialValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertAddressingResponsesTypeObjectToString(EDataType eDataType, Object instanceValue) {
>+		return convertAddressingResponsesTypeToString(JavaeePackage.Literals.ADDRESSING_RESPONSES_TYPE, instanceValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String createDeweyVersionTypeFromString(EDataType eDataType, String initialValue) {
> 		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
> 	}
>@@ -734,8 +866,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EnvEntryType createEnvEntryTypeObjectFromString(EDataType eDataType, String initialValue) {
>-		return createEnvEntryTypeFromString(JavaeePackage.Literals.ENV_ENTRY_TYPE, initialValue);
>+	public String createFullyQualifiedClassTypeFromString(EDataType eDataType, String initialValue) {
>+		return (String)super.createFromString(eDataType, initialValue);
> 	}
> 
> 	/**
>@@ -743,8 +875,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String convertEnvEntryTypeObjectToString(EDataType eDataType, Object instanceValue) {
>-		return convertEnvEntryTypeToString(JavaeePackage.Literals.ENV_ENTRY_TYPE, instanceValue);
>+	public String convertFullyQualifiedClassTypeToString(EDataType eDataType, Object instanceValue) {
>+		return super.convertToString(eDataType, instanceValue);
> 	}
> 
> 	/**
>@@ -752,8 +884,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String createFullyQualifiedClassTypeFromString(EDataType eDataType, String initialValue) {
>-		return (String)super.createFromString(eDataType, initialValue);
>+	public GenericBooleanType createGenericBooleanTypeObjectFromString(EDataType eDataType, String initialValue) {
>+		return createGenericBooleanTypeFromString(JavaeePackage.Literals.GENERIC_BOOLEAN_TYPE, initialValue);
> 	}
> 
> 	/**
>@@ -761,8 +893,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String convertFullyQualifiedClassTypeToString(EDataType eDataType, Object instanceValue) {
>-		return super.convertToString(eDataType, instanceValue);
>+	public String convertGenericBooleanTypeObjectToString(EDataType eDataType, Object instanceValue) {
>+		return convertGenericBooleanTypeToString(JavaeePackage.Literals.GENERIC_BOOLEAN_TYPE, instanceValue);
> 	}
> 
> 	/**
>@@ -788,6 +920,24 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public IsolationLevelType createIsolationLevelTypeObjectFromString(EDataType eDataType, String initialValue) {
>+		return createIsolationLevelTypeFromString(JavaeePackage.Literals.ISOLATION_LEVEL_TYPE, initialValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertIsolationLevelTypeObjectToString(EDataType eDataType, Object instanceValue) {
>+		return convertIsolationLevelTypeToString(JavaeePackage.Literals.ISOLATION_LEVEL_TYPE, instanceValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String createJavaIdentifierFromString(EDataType eDataType, String initialValue) {
> 		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
> 	}
>@@ -824,6 +974,24 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String createJdbcUrlTypeFromString(EDataType eDataType, String initialValue) {
>+		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertJdbcUrlTypeToString(EDataType eDataType, Object instanceValue) {
>+		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String createJNDINameFromString(EDataType eDataType, String initialValue) {
> 		return (String)super.createFromString(eDataType, initialValue);
> 	}
>@@ -968,8 +1136,14 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String createRemoteFromString(EDataType eDataType, String initialValue) {
>-		return (String)super.createFromString(eDataType, initialValue);
>+	public List<String> createProtocolBindingListTypeFromString(EDataType eDataType, String initialValue) {
>+		if (initialValue == null) return null;
>+		List<String> result = new ArrayList<String>();
>+		for (StringTokenizer stringTokenizer = new StringTokenizer(initialValue); stringTokenizer.hasMoreTokens(); ) {
>+			String item = stringTokenizer.nextToken();
>+			result.add(createProtocolBindingTypeFromString(JavaeePackage.Literals.PROTOCOL_BINDING_TYPE, item));
>+		}
>+		return result;
> 	}
> 
> 	/**
>@@ -977,8 +1151,16 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String convertRemoteToString(EDataType eDataType, Object instanceValue) {
>-		return super.convertToString(eDataType, instanceValue);
>+	public String convertProtocolBindingListTypeToString(EDataType eDataType, Object instanceValue) {
>+		if (instanceValue == null) return null;
>+		List<?> list = (List<?>)instanceValue;
>+		if (list.isEmpty()) return ""; //$NON-NLS-1$
>+		StringBuffer result = new StringBuffer();
>+		for (Object item : list) {
>+			result.append(convertProtocolBindingTypeToString(JavaeePackage.Literals.PROTOCOL_BINDING_TYPE, item));
>+			result.append(' ');
>+		}
>+		return result.substring(0, result.length() - 1);
> 	}
> 
> 	/**
>@@ -986,8 +1168,31 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public ResAuthType createResAuthTypeObjectFromString(EDataType eDataType, String initialValue) {
>-		return createResAuthTypeFromString(JavaeePackage.Literals.RES_AUTH_TYPE, initialValue);
>+	public String createProtocolBindingTypeFromString(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 = createProtocolURIAliasTypeFromString(JavaeePackage.Literals.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;
> 	}
> 
> 	/**
>@@ -995,8 +1200,27 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String convertResAuthTypeObjectToString(EDataType eDataType, Object instanceValue) {
>-		return convertResAuthTypeToString(JavaeePackage.Literals.RES_AUTH_TYPE, instanceValue);
>+	public String convertProtocolBindingTypeToString(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) {
>+				// Keep trying other member types until all have failed.
>+			}
>+		}
>+		if (JavaeePackage.Literals.PROTOCOL_URI_ALIAS_TYPE.isInstance(instanceValue)) {
>+			try {
>+				String value = convertProtocolURIAliasTypeToString(JavaeePackage.Literals.PROTOCOL_URI_ALIAS_TYPE, instanceValue);
>+				if (value != null) return value;
>+			}
>+			catch (Exception e) {
>+				// Keep trying other member types until all have failed.
>+			}
>+		}
>+		throw new IllegalArgumentException("Invalid value: '"+instanceValue+"' for datatype :"+eDataType.getName()); //$NON-NLS-1$ //$NON-NLS-2$
> 	}
> 
> 	/**
>@@ -1004,8 +1228,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public ResSharingScopeType createResSharingScopeTypeObjectFromString(EDataType eDataType, String initialValue) {
>-		return createResSharingScopeTypeFromString(JavaeePackage.Literals.RES_SHARING_SCOPE_TYPE, initialValue);
>+	public String createProtocolURIAliasTypeFromString(EDataType eDataType, String initialValue) {
>+		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
> 	}
> 
> 	/**
>@@ -1013,8 +1237,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String convertResSharingScopeTypeObjectToString(EDataType eDataType, Object instanceValue) {
>-		return convertResSharingScopeTypeToString(JavaeePackage.Literals.RES_SHARING_SCOPE_TYPE, instanceValue);
>+	public String convertProtocolURIAliasTypeToString(EDataType eDataType, Object instanceValue) {
>+		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
> 	}
> 
> 	/**
>@@ -1022,8 +1246,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String createRoleNameFromString(EDataType eDataType, String initialValue) {
>-		return (String)super.createFromString(eDataType, initialValue);
>+	public String createQnamePatternFromString(EDataType eDataType, String initialValue) {
>+		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
> 	}
> 
> 	/**
>@@ -1031,8 +1255,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String convertRoleNameToString(EDataType eDataType, Object instanceValue) {
>-		return super.convertToString(eDataType, instanceValue);
>+	public String convertQnamePatternToString(EDataType eDataType, Object instanceValue) {
>+		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
> 	}
> 
> 	/**
>@@ -1040,14 +1264,8 @@
> 	 * 
> 	 * @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;
>+	public String createRemoteFromString(EDataType eDataType, String initialValue) {
>+		return (String)super.createFromString(eDataType, initialValue);
> 	}
> 
> 	/**
>@@ -1055,16 +1273,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String convertServiceRefProtocolBindingListTypeToString(EDataType eDataType, Object instanceValue) {
>-		if (instanceValue == null) return null;
>-		List list = (List)instanceValue;
>-		if (list.isEmpty()) return ""; //$NON-NLS-1$
>-		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);
>+	public String convertRemoteToString(EDataType eDataType, Object instanceValue) {
>+		return super.convertToString(eDataType, instanceValue);
> 	}
> 
> 	/**
>@@ -1072,31 +1282,8 @@
> 	 * 
> 	 * @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 = 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;
>+	public ResAuthType createResAuthTypeObjectFromString(EDataType eDataType, String initialValue) {
>+		return createResAuthTypeFromString(JavaeePackage.Literals.RES_AUTH_TYPE, initialValue);
> 	}
> 
> 	/**
>@@ -1104,25 +1291,8 @@
> 	 * 
> 	 * @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()); //$NON-NLS-1$ //$NON-NLS-2$
>+	public String convertResAuthTypeObjectToString(EDataType eDataType, Object instanceValue) {
>+		return convertResAuthTypeToString(JavaeePackage.Literals.RES_AUTH_TYPE, instanceValue);
> 	}
> 
> 	/**
>@@ -1130,8 +1300,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String createServiceRefProtocolURIAliasTypeFromString(EDataType eDataType, String initialValue) {
>-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
>+	public ResSharingScopeType createResSharingScopeTypeObjectFromString(EDataType eDataType, String initialValue) {
>+		return createResSharingScopeTypeFromString(JavaeePackage.Literals.RES_SHARING_SCOPE_TYPE, initialValue);
> 	}
> 
> 	/**
>@@ -1139,8 +1309,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String convertServiceRefProtocolURIAliasTypeToString(EDataType eDataType, Object instanceValue) {
>-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
>+	public String convertResSharingScopeTypeObjectToString(EDataType eDataType, Object instanceValue) {
>+		return convertResSharingScopeTypeToString(JavaeePackage.Literals.RES_SHARING_SCOPE_TYPE, instanceValue);
> 	}
> 
> 	/**
>@@ -1148,8 +1318,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String createServiceRefQnamePatternFromString(EDataType eDataType, String initialValue) {
>-		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
>+	public String createRoleNameFromString(EDataType eDataType, String initialValue) {
>+		return (String)super.createFromString(eDataType, initialValue);
> 	}
> 
> 	/**
>@@ -1157,8 +1327,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public String convertServiceRefQnamePatternToString(EDataType eDataType, Object instanceValue) {
>-		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
>+	public String convertRoleNameToString(EDataType eDataType, Object instanceValue) {
>+		return super.convertToString(eDataType, instanceValue);
> 	}
> 
> 	/**
>@@ -1212,6 +1382,7 @@
> 	 * @deprecated
> 	 * @generated
> 	 */
>+	@Deprecated
> 	public static JavaeePackage getPackage() {
> 		return JavaeePackage.eINSTANCE;
> 	}
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/PortComponentRefImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PortComponentRefImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 PortComponentRefImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/PortComponentRefImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/PortComponentRefImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -10,15 +10,20 @@
> *******************************************************************************/
> package org.eclipse.jst.javaee.core.internal.impl;
> 
>+import java.math.BigInteger;
> import org.eclipse.emf.common.notify.Notification;
> 
>+import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.ecore.EClass;
> 
>+import org.eclipse.emf.ecore.InternalEObject;
> import org.eclipse.emf.ecore.impl.ENotificationImpl;
> import org.eclipse.emf.ecore.impl.EObjectImpl;
> 
>+import org.eclipse.jst.javaee.core.AddressingType;
> import org.eclipse.jst.javaee.core.PortComponentRef;
> 
>+import org.eclipse.jst.javaee.core.RespectBindingType;
> import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
> 
> /**
>@@ -30,6 +35,9 @@
> * <ul>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl#getServiceEndpointInterface Service Endpoint Interface}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl#isEnableMtom Enable Mtom}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl#getMtomThreshold Mtom Threshold}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl#getAddressing Addressing}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl#getRespectBinding Respect Binding}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl#getPortComponentLink Port Component Link}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl#getId Id}</li>
> * </ul>
>@@ -85,7 +93,47 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean enableMtomESet = false;
>+	protected boolean enableMtomESet;
>+
>+	/**
>+	 * The default value of the '{@link #getMtomThreshold() Mtom Threshold}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMtomThreshold()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final BigInteger MTOM_THRESHOLD_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getMtomThreshold() Mtom Threshold}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMtomThreshold()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected BigInteger mtomThreshold = MTOM_THRESHOLD_EDEFAULT;
>+
>+	/**
>+	 * The cached value of the '{@link #getAddressing() Addressing}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getAddressing()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected AddressingType addressing;
>+
>+	/**
>+	 * The cached value of the '{@link #getRespectBinding() Respect Binding}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getRespectBinding()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected RespectBindingType respectBinding;
> 
> 	/**
> 	 * The default value of the '{@link #getPortComponentLink() Port Component Link}' attribute.
>@@ -218,6 +266,113 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public BigInteger getMtomThreshold() {
>+		return mtomThreshold;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMtomThreshold(BigInteger newMtomThreshold) {
>+		BigInteger oldMtomThreshold = mtomThreshold;
>+		mtomThreshold = newMtomThreshold;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PORT_COMPONENT_REF__MTOM_THRESHOLD, oldMtomThreshold, mtomThreshold));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public AddressingType getAddressing() {
>+		return addressing;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetAddressing(AddressingType newAddressing, NotificationChain msgs) {
>+		AddressingType oldAddressing = addressing;
>+		addressing = newAddressing;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JavaeePackage.PORT_COMPONENT_REF__ADDRESSING, oldAddressing, newAddressing);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setAddressing(AddressingType newAddressing) {
>+		if (newAddressing != addressing) {
>+			NotificationChain msgs = null;
>+			if (addressing != null)
>+				msgs = ((InternalEObject)addressing).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JavaeePackage.PORT_COMPONENT_REF__ADDRESSING, null, msgs);
>+			if (newAddressing != null)
>+				msgs = ((InternalEObject)newAddressing).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JavaeePackage.PORT_COMPONENT_REF__ADDRESSING, null, msgs);
>+			msgs = basicSetAddressing(newAddressing, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PORT_COMPONENT_REF__ADDRESSING, newAddressing, newAddressing));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public RespectBindingType getRespectBinding() {
>+		return respectBinding;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetRespectBinding(RespectBindingType newRespectBinding, NotificationChain msgs) {
>+		RespectBindingType oldRespectBinding = respectBinding;
>+		respectBinding = newRespectBinding;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JavaeePackage.PORT_COMPONENT_REF__RESPECT_BINDING, oldRespectBinding, newRespectBinding);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setRespectBinding(RespectBindingType newRespectBinding) {
>+		if (newRespectBinding != respectBinding) {
>+			NotificationChain msgs = null;
>+			if (respectBinding != null)
>+				msgs = ((InternalEObject)respectBinding).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JavaeePackage.PORT_COMPONENT_REF__RESPECT_BINDING, null, msgs);
>+			if (newRespectBinding != null)
>+				msgs = ((InternalEObject)newRespectBinding).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JavaeePackage.PORT_COMPONENT_REF__RESPECT_BINDING, null, msgs);
>+			msgs = basicSetRespectBinding(newRespectBinding, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PORT_COMPONENT_REF__RESPECT_BINDING, newRespectBinding, newRespectBinding));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getPortComponentLink() {
> 		return portComponentLink;
> 	}
>@@ -261,12 +416,34 @@
> 	 * @generated
> 	 */
> 	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JavaeePackage.PORT_COMPONENT_REF__ADDRESSING:
>+				return basicSetAddressing(null, msgs);
>+			case JavaeePackage.PORT_COMPONENT_REF__RESPECT_BINDING:
>+				return basicSetRespectBinding(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
> 	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;
>+				return isEnableMtom();
>+			case JavaeePackage.PORT_COMPONENT_REF__MTOM_THRESHOLD:
>+				return getMtomThreshold();
>+			case JavaeePackage.PORT_COMPONENT_REF__ADDRESSING:
>+				return getAddressing();
>+			case JavaeePackage.PORT_COMPONENT_REF__RESPECT_BINDING:
>+				return getRespectBinding();
> 			case JavaeePackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
> 				return getPortComponentLink();
> 			case JavaeePackage.PORT_COMPONENT_REF__ID:
>@@ -287,7 +464,16 @@
> 				setServiceEndpointInterface((String)newValue);
> 				return;
> 			case JavaeePackage.PORT_COMPONENT_REF__ENABLE_MTOM:
>-				setEnableMtom(((Boolean)newValue).booleanValue());
>+				setEnableMtom((Boolean)newValue);
>+				return;
>+			case JavaeePackage.PORT_COMPONENT_REF__MTOM_THRESHOLD:
>+				setMtomThreshold((BigInteger)newValue);
>+				return;
>+			case JavaeePackage.PORT_COMPONENT_REF__ADDRESSING:
>+				setAddressing((AddressingType)newValue);
>+				return;
>+			case JavaeePackage.PORT_COMPONENT_REF__RESPECT_BINDING:
>+				setRespectBinding((RespectBindingType)newValue);
> 				return;
> 			case JavaeePackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
> 				setPortComponentLink((String)newValue);
>@@ -313,6 +499,15 @@
> 			case JavaeePackage.PORT_COMPONENT_REF__ENABLE_MTOM:
> 				unsetEnableMtom();
> 				return;
>+			case JavaeePackage.PORT_COMPONENT_REF__MTOM_THRESHOLD:
>+				setMtomThreshold(MTOM_THRESHOLD_EDEFAULT);
>+				return;
>+			case JavaeePackage.PORT_COMPONENT_REF__ADDRESSING:
>+				setAddressing((AddressingType)null);
>+				return;
>+			case JavaeePackage.PORT_COMPONENT_REF__RESPECT_BINDING:
>+				setRespectBinding((RespectBindingType)null);
>+				return;
> 			case JavaeePackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
> 				setPortComponentLink(PORT_COMPONENT_LINK_EDEFAULT);
> 				return;
>@@ -335,6 +530,12 @@
> 				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__MTOM_THRESHOLD:
>+				return MTOM_THRESHOLD_EDEFAULT == null ? mtomThreshold != null : !MTOM_THRESHOLD_EDEFAULT.equals(mtomThreshold);
>+			case JavaeePackage.PORT_COMPONENT_REF__ADDRESSING:
>+				return addressing != null;
>+			case JavaeePackage.PORT_COMPONENT_REF__RESPECT_BINDING:
>+				return respectBinding != null;
> 			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:
>@@ -357,6 +558,8 @@
> 		result.append(serviceEndpointInterface);
> 		result.append(", enableMtom: "); //$NON-NLS-1$
> 		if (enableMtomESet) result.append(enableMtom); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", mtomThreshold: "); //$NON-NLS-1$
>+		result.append(mtomThreshold);
> 		result.append(", portComponentLink: "); //$NON-NLS-1$
> 		result.append(portComponentLink);
> 		result.append(", id: "); //$NON-NLS-1$
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 MessageDestinationImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -61,7 +61,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>@@ -71,7 +71,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -81,7 +81,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
> 
> 	/**
> 	 * The default value of the '{@link #getMessageDestinationName() Message Destination Name}' attribute.
>@@ -167,9 +167,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.MESSAGE_DESTINATION__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.MESSAGE_DESTINATION__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -179,9 +179,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, JavaeePackage.MESSAGE_DESTINATION__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, JavaeePackage.MESSAGE_DESTINATION__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -191,9 +191,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, JavaeePackage.MESSAGE_DESTINATION__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, JavaeePackage.MESSAGE_DESTINATION__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -270,11 +270,11 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.MESSAGE_DESTINATION__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.MESSAGE_DESTINATION__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.MESSAGE_DESTINATION__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -308,20 +308,21 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.MESSAGE_DESTINATION__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.MESSAGE_DESTINATION__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case JavaeePackage.MESSAGE_DESTINATION__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
> 				return;
> 			case JavaeePackage.MESSAGE_DESTINATION__MESSAGE_DESTINATION_NAME:
> 				setMessageDestinationName((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 SecurityRoleImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/SecurityRoleImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -56,7 +56,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getRoleName() Role Name}' attribute.
>@@ -122,9 +122,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.SECURITY_ROLE__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.SECURITY_ROLE__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -180,7 +180,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.SECURITY_ROLE__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -208,12 +208,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.SECURITY_ROLE__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.SECURITY_ROLE__ROLE_NAME:
> 				setRoleName((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbRefImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbRefImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 EjbRefImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbRefImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbRefImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -49,6 +49,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getEjbLink Ejb Link}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl#getId Id}</li>
> * </ul>
> * 
>@@ -64,7 +65,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getEjbRefName() Ejb Ref Name}' attribute.
>@@ -113,7 +114,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean ejbRefTypeESet = false;
>+	protected boolean ejbRefTypeESet;
> 
> 	/**
> 	 * The default value of the '{@link #getHome() Home}' attribute.
>@@ -203,7 +204,27 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList injectionTargets = null;
>+	protected EList<InjectionTarget> injectionTargets;
>+
>+	/**
>+	 * The default value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String LOOKUP_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String lookupName = LOOKUP_NAME_EDEFAULT;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -249,9 +270,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.EJB_REF__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.EJB_REF__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -412,9 +433,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInjectionTargets() {
>+	public List<InjectionTarget> getInjectionTargets() {
> 		if (injectionTargets == null) {
>-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.EJB_REF__INJECTION_TARGETS);
>+			injectionTargets = new EObjectContainmentEList<InjectionTarget>(InjectionTarget.class, this, JavaeePackage.EJB_REF__INJECTION_TARGETS);
> 		}
> 		return injectionTargets;
> 	}
>@@ -424,6 +445,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String getLookupName() {
>+		return lookupName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLookupName(String newLookupName) {
>+		String oldLookupName = lookupName;
>+		lookupName = newLookupName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_REF__LOOKUP_NAME, oldLookupName, lookupName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -449,9 +491,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.EJB_REF__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.EJB_REF__INJECTION_TARGETS:
>-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInjectionTargets()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -480,6 +522,8 @@
> 				return getMappedName();
> 			case JavaeePackage.EJB_REF__INJECTION_TARGETS:
> 				return getInjectionTargets();
>+			case JavaeePackage.EJB_REF__LOOKUP_NAME:
>+				return getLookupName();
> 			case JavaeePackage.EJB_REF__ID:
> 				return getId();
> 		}
>@@ -491,12 +535,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.EJB_REF__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.EJB_REF__EJB_REF_NAME:
> 				setEjbRefName((String)newValue);
>@@ -518,7 +563,10 @@
> 				return;
> 			case JavaeePackage.EJB_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
>-				getInjectionTargets().addAll((Collection)newValue);
>+				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
>+				return;
>+			case JavaeePackage.EJB_REF__LOOKUP_NAME:
>+				setLookupName((String)newValue);
> 				return;
> 			case JavaeePackage.EJB_REF__ID:
> 				setId((String)newValue);
>@@ -559,6 +607,9 @@
> 			case JavaeePackage.EJB_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
> 				return;
>+			case JavaeePackage.EJB_REF__LOOKUP_NAME:
>+				setLookupName(LOOKUP_NAME_EDEFAULT);
>+				return;
> 			case JavaeePackage.EJB_REF__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -590,6 +641,8 @@
> 				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__LOOKUP_NAME:
>+				return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName);
> 			case JavaeePackage.EJB_REF__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -618,6 +671,8 @@
> 		result.append(ejbLink);
> 		result.append(", mappedName: "); //$NON-NLS-1$
> 		result.append(mappedName);
>+		result.append(", lookupName: "); //$NON-NLS-1$
>+		result.append(lookupName);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ServiceRefHandlerChainImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefHandlerChainImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -98,7 +98,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected static final List PROTOCOL_BINDINGS_EDEFAULT = null;
>+	protected static final List<String> PROTOCOL_BINDINGS_EDEFAULT = null;
> 
> 	/**
> 	 * The cached value of the '{@link #getProtocolBindings() Protocol Bindings}' attribute.
>@@ -108,7 +108,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected List protocolBindings = PROTOCOL_BINDINGS_EDEFAULT;
>+	protected List<String> protocolBindings = PROTOCOL_BINDINGS_EDEFAULT;
> 
> 	/**
> 	 * The cached value of the '{@link #getHandlers() Handlers}' containment reference list.
>@@ -118,7 +118,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList handlers = null;
>+	protected EList<ServiceRefHandler> handlers;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -206,7 +206,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getProtocolBindings() {
>+	public List<String> getProtocolBindings() {
> 		return protocolBindings;
> 	}
> 
>@@ -215,8 +215,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public void setProtocolBindings(List newProtocolBindings) {
>-		List oldProtocolBindings = protocolBindings;
>+	public void setProtocolBindings(List<String> newProtocolBindings) {
>+		List<String> oldProtocolBindings = protocolBindings;
> 		protocolBindings = newProtocolBindings;
> 		if (eNotificationRequired())
> 			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.SERVICE_REF_HANDLER_CHAIN__PROTOCOL_BINDINGS, oldProtocolBindings, protocolBindings));
>@@ -227,9 +227,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getHandlers() {
>+	public List<ServiceRefHandler> getHandlers() {
> 		if (handlers == null) {
>-			handlers = new EObjectContainmentEList(ServiceRefHandler.class, this, JavaeePackage.SERVICE_REF_HANDLER_CHAIN__HANDLERS);
>+			handlers = new EObjectContainmentEList<ServiceRefHandler>(ServiceRefHandler.class, this, JavaeePackage.SERVICE_REF_HANDLER_CHAIN__HANDLERS);
> 		}
> 		return handlers;
> 	}
>@@ -264,7 +264,7 @@
> 	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 ((InternalEList<?>)getHandlers()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -296,6 +296,7 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
>@@ -306,11 +307,11 @@
> 				setPortNamePattern((String)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__PROTOCOL_BINDINGS:
>-				setProtocolBindings((List)newValue);
>+				setProtocolBindings((List<String>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__HANDLERS:
> 				getHandlers().clear();
>-				getHandlers().addAll((Collection)newValue);
>+				getHandlers().addAll((Collection<? extends ServiceRefHandler>)newValue);
> 				return;
> 			case JavaeePackage.SERVICE_REF_HANDLER_CHAIN__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceRefImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceRefImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ResourceRefImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceRefImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceRefImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -49,6 +49,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getResSharingScope Res Sharing Scope}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl#getId Id}</li>
> * </ul>
> * 
>@@ -64,7 +65,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getResRefName() Res Ref Name}' attribute.
>@@ -133,7 +134,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean resAuthESet = false;
>+	protected boolean resAuthESet;
> 
> 	/**
> 	 * The default value of the '{@link #getResSharingScope() Res Sharing Scope}' attribute.
>@@ -162,7 +163,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean resSharingScopeESet = false;
>+	protected boolean resSharingScopeESet;
> 
> 	/**
> 	 * The default value of the '{@link #getMappedName() Mapped Name}' attribute.
>@@ -192,7 +193,27 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList injectionTargets = null;
>+	protected EList<InjectionTarget> injectionTargets;
>+
>+	/**
>+	 * The default value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String LOOKUP_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String lookupName = LOOKUP_NAME_EDEFAULT;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -238,9 +259,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.RESOURCE_REF__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.RESOURCE_REF__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -405,9 +426,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInjectionTargets() {
>+	public List<InjectionTarget> getInjectionTargets() {
> 		if (injectionTargets == null) {
>-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.RESOURCE_REF__INJECTION_TARGETS);
>+			injectionTargets = new EObjectContainmentEList<InjectionTarget>(InjectionTarget.class, this, JavaeePackage.RESOURCE_REF__INJECTION_TARGETS);
> 		}
> 		return injectionTargets;
> 	}
>@@ -417,6 +438,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String getLookupName() {
>+		return lookupName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLookupName(String newLookupName) {
>+		String oldLookupName = lookupName;
>+		lookupName = newLookupName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESOURCE_REF__LOOKUP_NAME, oldLookupName, lookupName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -442,9 +484,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.RESOURCE_REF__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.RESOURCE_REF__INJECTION_TARGETS:
>-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInjectionTargets()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -471,6 +513,8 @@
> 				return getMappedName();
> 			case JavaeePackage.RESOURCE_REF__INJECTION_TARGETS:
> 				return getInjectionTargets();
>+			case JavaeePackage.RESOURCE_REF__LOOKUP_NAME:
>+				return getLookupName();
> 			case JavaeePackage.RESOURCE_REF__ID:
> 				return getId();
> 		}
>@@ -482,12 +526,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.RESOURCE_REF__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.RESOURCE_REF__RES_REF_NAME:
> 				setResRefName((String)newValue);
>@@ -506,7 +551,10 @@
> 				return;
> 			case JavaeePackage.RESOURCE_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
>-				getInjectionTargets().addAll((Collection)newValue);
>+				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
>+				return;
>+			case JavaeePackage.RESOURCE_REF__LOOKUP_NAME:
>+				setLookupName((String)newValue);
> 				return;
> 			case JavaeePackage.RESOURCE_REF__ID:
> 				setId((String)newValue);
>@@ -544,6 +592,9 @@
> 			case JavaeePackage.RESOURCE_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
> 				return;
>+			case JavaeePackage.RESOURCE_REF__LOOKUP_NAME:
>+				setLookupName(LOOKUP_NAME_EDEFAULT);
>+				return;
> 			case JavaeePackage.RESOURCE_REF__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -573,6 +624,8 @@
> 				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__LOOKUP_NAME:
>+				return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName);
> 			case JavaeePackage.RESOURCE_REF__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -599,6 +652,8 @@
> 		if (resSharingScopeESet) result.append(resSharingScope); else result.append("<unset>"); //$NON-NLS-1$
> 		result.append(", mappedName: "); //$NON-NLS-1$
> 		result.append(mappedName);
>+		result.append(", lookupName: "); //$NON-NLS-1$
>+		result.append(lookupName);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/EnvEntryImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EnvEntryImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 EnvEntryImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/EnvEntryImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/EnvEntryImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -47,6 +47,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl#getEnvEntryValue Env Entry Value}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EnvEntryImpl#getId Id}</li>
> * </ul>
> * 
>@@ -62,7 +63,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getEnvEntryName() Env Entry Name}' attribute.
>@@ -92,7 +93,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected static final EnvEntryType ENV_ENTRY_TYPE_EDEFAULT = EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL;
>+	protected static final String ENV_ENTRY_TYPE_EDEFAULT = null;
> 
> 	/**
> 	 * The cached value of the '{@link #getEnvEntryType() Env Entry Type}' attribute.
>@@ -102,16 +103,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EnvEntryType envEntryType = ENV_ENTRY_TYPE_EDEFAULT;
>-
>-	/**
>-	 * This is true if the Env Entry Type attribute has been set.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected boolean envEntryTypeESet = false;
>+	protected String envEntryType = ENV_ENTRY_TYPE_EDEFAULT;
> 
> 	/**
> 	 * The default value of the '{@link #getEnvEntryValue() Env Entry Value}' attribute.
>@@ -161,7 +153,27 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList injectionTargets = null;
>+	protected EList<InjectionTarget> injectionTargets;
>+
>+	/**
>+	 * The default value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String LOOKUP_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String lookupName = LOOKUP_NAME_EDEFAULT;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -207,9 +219,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.ENV_ENTRY__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.ENV_ENTRY__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -240,7 +252,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EnvEntryType getEnvEntryType() {
>+	public String getEnvEntryType() {
> 		return envEntryType;
> 	}
> 
>@@ -249,36 +261,11 @@
> 	 * 
> 	 * @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));
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void unsetEnvEntryType() {
>-		EnvEntryType oldEnvEntryType = envEntryType;
>-		boolean oldEnvEntryTypeESet = envEntryTypeESet;
>-		envEntryType = ENV_ENTRY_TYPE_EDEFAULT;
>-		envEntryTypeESet = false;
>+	public void setEnvEntryType(String newEnvEntryType) {
>+		String oldEnvEntryType = envEntryType;
>+		envEntryType = newEnvEntryType;
> 		if (eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.ENV_ENTRY__ENV_ENTRY_TYPE, oldEnvEntryType, ENV_ENTRY_TYPE_EDEFAULT, oldEnvEntryTypeESet));
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public boolean isSetEnvEntryType() {
>-		return envEntryTypeESet;
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ENV_ENTRY__ENV_ENTRY_TYPE, oldEnvEntryType, envEntryType));
> 	}
> 
> 	/**
>@@ -328,9 +315,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInjectionTargets() {
>+	public List<InjectionTarget> getInjectionTargets() {
> 		if (injectionTargets == null) {
>-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.ENV_ENTRY__INJECTION_TARGETS);
>+			injectionTargets = new EObjectContainmentEList<InjectionTarget>(InjectionTarget.class, this, JavaeePackage.ENV_ENTRY__INJECTION_TARGETS);
> 		}
> 		return injectionTargets;
> 	}
>@@ -340,6 +327,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String getLookupName() {
>+		return lookupName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLookupName(String newLookupName) {
>+		String oldLookupName = lookupName;
>+		lookupName = newLookupName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ENV_ENTRY__LOOKUP_NAME, oldLookupName, lookupName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -365,9 +373,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.ENV_ENTRY__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.ENV_ENTRY__INJECTION_TARGETS:
>-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInjectionTargets()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -392,6 +400,8 @@
> 				return getMappedName();
> 			case JavaeePackage.ENV_ENTRY__INJECTION_TARGETS:
> 				return getInjectionTargets();
>+			case JavaeePackage.ENV_ENTRY__LOOKUP_NAME:
>+				return getLookupName();
> 			case JavaeePackage.ENV_ENTRY__ID:
> 				return getId();
> 		}
>@@ -403,18 +413,19 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.ENV_ENTRY__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_NAME:
> 				setEnvEntryName((String)newValue);
> 				return;
> 			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_TYPE:
>-				setEnvEntryType((EnvEntryType)newValue);
>+				setEnvEntryType((String)newValue);
> 				return;
> 			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_VALUE:
> 				setEnvEntryValue((String)newValue);
>@@ -424,7 +435,10 @@
> 				return;
> 			case JavaeePackage.ENV_ENTRY__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
>-				getInjectionTargets().addAll((Collection)newValue);
>+				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
>+				return;
>+			case JavaeePackage.ENV_ENTRY__LOOKUP_NAME:
>+				setLookupName((String)newValue);
> 				return;
> 			case JavaeePackage.ENV_ENTRY__ID:
> 				setId((String)newValue);
>@@ -448,7 +462,7 @@
> 				setEnvEntryName(ENV_ENTRY_NAME_EDEFAULT);
> 				return;
> 			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_TYPE:
>-				unsetEnvEntryType();
>+				setEnvEntryType(ENV_ENTRY_TYPE_EDEFAULT);
> 				return;
> 			case JavaeePackage.ENV_ENTRY__ENV_ENTRY_VALUE:
> 				setEnvEntryValue(ENV_ENTRY_VALUE_EDEFAULT);
>@@ -459,6 +473,9 @@
> 			case JavaeePackage.ENV_ENTRY__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
> 				return;
>+			case JavaeePackage.ENV_ENTRY__LOOKUP_NAME:
>+				setLookupName(LOOKUP_NAME_EDEFAULT);
>+				return;
> 			case JavaeePackage.ENV_ENTRY__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -479,13 +496,15 @@
> 			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();
>+				return ENV_ENTRY_TYPE_EDEFAULT == null ? envEntryType != null : !ENV_ENTRY_TYPE_EDEFAULT.equals(envEntryType);
> 			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__LOOKUP_NAME:
>+				return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName);
> 			case JavaeePackage.ENV_ENTRY__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -505,15 +524,42 @@
> 		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(envEntryType);
> 		result.append(", envEntryValue: "); //$NON-NLS-1$
> 		result.append(envEntryValue);
> 		result.append(", mappedName: "); //$NON-NLS-1$
> 		result.append(mappedName);
>+		result.append(", lookupName: "); //$NON-NLS-1$
>+		result.append(lookupName);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
> 		return result.toString();
> 	}
> 
>+	/**
>+	 * This is provided for Java EE 5 model equivalence
>+	 * @param newEnvEntryType
>+	 */
>+	public void setEnvEntryType(EnvEntryType newEnvEntryType) {
>+		if (newEnvEntryType != null)
>+		{
>+			setEnvEntryType(newEnvEntryType.getLiteral());
>+		}
>+		else
>+		{
>+			setEnvEntryType((String)null);
>+		}
>+	}
>+
>+	public void unsetEnvEntryType()
>+	{
>+		setEnvEntryType((String)null);
>+	}
>+
>+	public boolean isSetEnvEntryType()
>+	{
>+		return (envEntryType != null);
>+	}
>+
> } //EnvEntryImpl
>\ No newline at end of file
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbLocalRefImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbLocalRefImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 EjbLocalRefImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbLocalRefImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/EjbLocalRefImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -49,6 +49,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getEjbLink Ejb Link}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl#getId Id}</li>
> * </ul>
> * 
>@@ -64,7 +65,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getEjbRefName() Ejb Ref Name}' attribute.
>@@ -113,7 +114,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean ejbRefTypeESet = false;
>+	protected boolean ejbRefTypeESet;
> 
> 	/**
> 	 * The default value of the '{@link #getLocalHome() Local Home}' attribute.
>@@ -203,7 +204,27 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList injectionTargets = null;
>+	protected EList<InjectionTarget> injectionTargets;
>+
>+	/**
>+	 * The default value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String LOOKUP_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String lookupName = LOOKUP_NAME_EDEFAULT;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -249,9 +270,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.EJB_LOCAL_REF__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.EJB_LOCAL_REF__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -412,9 +433,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInjectionTargets() {
>+	public List<InjectionTarget> getInjectionTargets() {
> 		if (injectionTargets == null) {
>-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.EJB_LOCAL_REF__INJECTION_TARGETS);
>+			injectionTargets = new EObjectContainmentEList<InjectionTarget>(InjectionTarget.class, this, JavaeePackage.EJB_LOCAL_REF__INJECTION_TARGETS);
> 		}
> 		return injectionTargets;
> 	}
>@@ -424,6 +445,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String getLookupName() {
>+		return lookupName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLookupName(String newLookupName) {
>+		String oldLookupName = lookupName;
>+		lookupName = newLookupName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.EJB_LOCAL_REF__LOOKUP_NAME, oldLookupName, lookupName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -449,9 +491,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.EJB_LOCAL_REF__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.EJB_LOCAL_REF__INJECTION_TARGETS:
>-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInjectionTargets()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -480,6 +522,8 @@
> 				return getMappedName();
> 			case JavaeePackage.EJB_LOCAL_REF__INJECTION_TARGETS:
> 				return getInjectionTargets();
>+			case JavaeePackage.EJB_LOCAL_REF__LOOKUP_NAME:
>+				return getLookupName();
> 			case JavaeePackage.EJB_LOCAL_REF__ID:
> 				return getId();
> 		}
>@@ -491,12 +535,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.EJB_LOCAL_REF__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.EJB_LOCAL_REF__EJB_REF_NAME:
> 				setEjbRefName((String)newValue);
>@@ -518,7 +563,10 @@
> 				return;
> 			case JavaeePackage.EJB_LOCAL_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
>-				getInjectionTargets().addAll((Collection)newValue);
>+				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
>+				return;
>+			case JavaeePackage.EJB_LOCAL_REF__LOOKUP_NAME:
>+				setLookupName((String)newValue);
> 				return;
> 			case JavaeePackage.EJB_LOCAL_REF__ID:
> 				setId((String)newValue);
>@@ -559,6 +607,9 @@
> 			case JavaeePackage.EJB_LOCAL_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
> 				return;
>+			case JavaeePackage.EJB_LOCAL_REF__LOOKUP_NAME:
>+				setLookupName(LOOKUP_NAME_EDEFAULT);
>+				return;
> 			case JavaeePackage.EJB_LOCAL_REF__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -590,6 +641,8 @@
> 				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__LOOKUP_NAME:
>+				return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName);
> 			case JavaeePackage.EJB_LOCAL_REF__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -618,6 +671,8 @@
> 		result.append(ejbLink);
> 		result.append(", mappedName: "); //$NON-NLS-1$
> 		result.append(mappedName);
>+		result.append(", lookupName: "); //$NON-NLS-1$
>+		result.append(lookupName);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceEnvRefImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceEnvRefImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ResourceEnvRefImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceEnvRefImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/ResourceEnvRefImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -45,6 +45,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl#getResourceEnvRefType Resource Env Ref Type}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.ResourceEnvRefImpl#getId Id}</li>
> * </ul>
> * 
>@@ -60,7 +61,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getResourceEnvRefName() Resource Env Ref Name}' attribute.
>@@ -130,7 +131,27 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList injectionTargets = null;
>+	protected EList<InjectionTarget> injectionTargets;
>+
>+	/**
>+	 * The default value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String LOOKUP_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String lookupName = LOOKUP_NAME_EDEFAULT;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -176,9 +197,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.RESOURCE_ENV_REF__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.RESOURCE_ENV_REF__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -251,9 +272,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInjectionTargets() {
>+	public List<InjectionTarget> getInjectionTargets() {
> 		if (injectionTargets == null) {
>-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.RESOURCE_ENV_REF__INJECTION_TARGETS);
>+			injectionTargets = new EObjectContainmentEList<InjectionTarget>(InjectionTarget.class, this, JavaeePackage.RESOURCE_ENV_REF__INJECTION_TARGETS);
> 		}
> 		return injectionTargets;
> 	}
>@@ -263,6 +284,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String getLookupName() {
>+		return lookupName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLookupName(String newLookupName) {
>+		String oldLookupName = lookupName;
>+		lookupName = newLookupName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESOURCE_ENV_REF__LOOKUP_NAME, oldLookupName, lookupName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -288,9 +330,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.RESOURCE_ENV_REF__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.RESOURCE_ENV_REF__INJECTION_TARGETS:
>-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInjectionTargets()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -313,6 +355,8 @@
> 				return getMappedName();
> 			case JavaeePackage.RESOURCE_ENV_REF__INJECTION_TARGETS:
> 				return getInjectionTargets();
>+			case JavaeePackage.RESOURCE_ENV_REF__LOOKUP_NAME:
>+				return getLookupName();
> 			case JavaeePackage.RESOURCE_ENV_REF__ID:
> 				return getId();
> 		}
>@@ -324,12 +368,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.RESOURCE_ENV_REF__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.RESOURCE_ENV_REF__RESOURCE_ENV_REF_NAME:
> 				setResourceEnvRefName((String)newValue);
>@@ -342,7 +387,10 @@
> 				return;
> 			case JavaeePackage.RESOURCE_ENV_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
>-				getInjectionTargets().addAll((Collection)newValue);
>+				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
>+				return;
>+			case JavaeePackage.RESOURCE_ENV_REF__LOOKUP_NAME:
>+				setLookupName((String)newValue);
> 				return;
> 			case JavaeePackage.RESOURCE_ENV_REF__ID:
> 				setId((String)newValue);
>@@ -374,6 +422,9 @@
> 			case JavaeePackage.RESOURCE_ENV_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
> 				return;
>+			case JavaeePackage.RESOURCE_ENV_REF__LOOKUP_NAME:
>+				setLookupName(LOOKUP_NAME_EDEFAULT);
>+				return;
> 			case JavaeePackage.RESOURCE_ENV_REF__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -399,6 +450,8 @@
> 				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__LOOKUP_NAME:
>+				return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName);
> 			case JavaeePackage.RESOURCE_ENV_REF__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -421,6 +474,8 @@
> 		result.append(resourceEnvRefType);
> 		result.append(", mappedName: "); //$NON-NLS-1$
> 		result.append(mappedName);
>+		result.append(", lookupName: "); //$NON-NLS-1$
>+		result.append(lookupName);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/ListenerImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ListenerImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ListenerImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/ListenerImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/ListenerImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -60,7 +60,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>@@ -70,7 +70,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -80,7 +80,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
> 
> 	/**
> 	 * The default value of the '{@link #getListenerClass() Listener Class}' attribute.
>@@ -146,9 +146,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.LISTENER__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.LISTENER__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -158,9 +158,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, JavaeePackage.LISTENER__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, JavaeePackage.LISTENER__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -170,9 +170,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, JavaeePackage.LISTENER__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, JavaeePackage.LISTENER__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -228,11 +228,11 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.LISTENER__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.LISTENER__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.LISTENER__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -264,20 +264,21 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.LISTENER__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.LISTENER__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case JavaeePackage.LISTENER__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
> 				return;
> 			case JavaeePackage.LISTENER__LISTENER_CLASS:
> 				setListenerClass((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/ParamValueImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ParamValueImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ParamValueImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/ParamValueImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/ParamValueImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -57,7 +57,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getParamName() Param Name}' attribute.
>@@ -143,9 +143,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.PARAM_VALUE__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.PARAM_VALUE__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -222,7 +222,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.PARAM_VALUE__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -252,12 +252,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.PARAM_VALUE__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.PARAM_VALUE__PARAM_NAME:
> 				setParamName((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 JavaeePackageImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -34,6 +34,9 @@
> 
> import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
> 
>+import org.eclipse.jst.javaee.core.AddressingResponsesType;
>+import org.eclipse.jst.javaee.core.AddressingType;
>+import org.eclipse.jst.javaee.core.DataSourceType;
> import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.DisplayName;
> import org.eclipse.jst.javaee.core.EjbLocalRef;
>@@ -41,9 +44,10 @@
> 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.GenericBooleanType;
> import org.eclipse.jst.javaee.core.Icon;
> import org.eclipse.jst.javaee.core.InjectionTarget;
>+import org.eclipse.jst.javaee.core.IsolationLevelType;
> import org.eclipse.jst.javaee.core.JavaeeFactory;
> import org.eclipse.jst.javaee.core.LifecycleCallback;
> import org.eclipse.jst.javaee.core.Listener;
>@@ -60,6 +64,7 @@
> 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.RespectBindingType;
> import org.eclipse.jst.javaee.core.RunAs;
> import org.eclipse.jst.javaee.core.SecurityRole;
> import org.eclipse.jst.javaee.core.SecurityRoleRef;
>@@ -77,6 +82,8 @@
> 
> import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
> 
>+import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
> import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
> 
> import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
>@@ -84,6 +91,10 @@
> import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
> 
> import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
>+import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
>+import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
> 
> /**
> * 
>@@ -97,6 +108,20 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass addressingTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass dataSourceTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass descriptionEClass = null;
> 
> 	/**
>@@ -230,6 +255,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass respectBindingTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass runAsEClass = null;
> 
> 	/**
>@@ -286,6 +318,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EEnum addressingResponsesTypeEEnum = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EEnum ejbRefTypeEEnum = null;
> 
> 	/**
>@@ -293,7 +332,14 @@
> 	 * 
> 	 * @generated
> 	 */
>-	private EEnum envEntryTypeEEnum = null;
>+	private EEnum genericBooleanTypeEEnum = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EEnum isolationLevelTypeEEnum = null;
> 
> 	/**
> 	 * 
>@@ -328,6 +374,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EDataType addressingResponsesTypeObjectEDataType = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EDataType deweyVersionTypeEDataType = null;
> 
> 	/**
>@@ -356,7 +409,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	private EDataType envEntryTypeObjectEDataType = null;
>+	private EDataType envEntryTypeEDataType = null;
> 
> 	/**
> 	 * 
>@@ -370,6 +423,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EDataType genericBooleanTypeObjectEDataType = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EDataType homeEDataType = null;
> 
> 	/**
>@@ -377,6 +437,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EDataType isolationLevelTypeObjectEDataType = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EDataType javaIdentifierEDataType = null;
> 
> 	/**
>@@ -391,6 +458,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EDataType jdbcUrlTypeEDataType = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EDataType jndiNameEDataType = null;
> 
> 	/**
>@@ -447,56 +521,56 @@
> 	 * 
> 	 * @generated
> 	 */
>-	private EDataType remoteEDataType = null;
>+	private EDataType protocolBindingListTypeEDataType = null;
> 
> 	/**
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	private EDataType resAuthTypeObjectEDataType = null;
>+	private EDataType protocolBindingTypeEDataType = null;
> 
> 	/**
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	private EDataType resSharingScopeTypeObjectEDataType = null;
>+	private EDataType protocolURIAliasTypeEDataType = null;
> 
> 	/**
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	private EDataType roleNameEDataType = null;
>+	private EDataType qnamePatternEDataType = null;
> 
> 	/**
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	private EDataType serviceRefProtocolBindingListTypeEDataType = null;
>+	private EDataType remoteEDataType = null;
> 
> 	/**
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	private EDataType serviceRefProtocolBindingTypeEDataType = null;
>+	private EDataType resAuthTypeObjectEDataType = null;
> 
> 	/**
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	private EDataType serviceRefProtocolURIAliasTypeEDataType = null;
>+	private EDataType resSharingScopeTypeObjectEDataType = null;
> 
> 	/**
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	private EDataType serviceRefQnamePatternEDataType = null;
>+	private EDataType roleNameEDataType = null;
> 
> 	/**
> 	 * 
>@@ -539,20 +613,10 @@
> 	private static boolean isInited = false;
> 
> 	/**
>-	 * Creates, registers, and initializes the Package for this
>-	 * model, and for any others upon which it depends. Simple
>-	 * dependencies are satisfied by calling this method on all
>-	 * dependent packages before doing anything else. This method drives
>-	 * initialization for interdependent packages directly, in parallel
>-	 * with this package, itself.
>-	 * Of this package and its interdependencies, all packages which
>-	 * have not yet been registered by their URI values are first created
>-	 * and registered. The packages are then initialized in two steps:
>-	 * meta-model objects for all of the packages are created before any
>-	 * are initialized, since one package's meta-model objects may refer to
>-	 * those of another.
>-	 * Invocation of this method will not affect any packages that have
>-	 * already been initialized.
>+	 * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>+	 * 
>+	 * This method is used to initialize {@link JavaeePackage#eINSTANCE} when that field is accessed.
>+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
> 	 * 
> 	 * 
> 	 * @see #eNS_URI
>@@ -564,7 +628,7 @@
> 		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());
>+		JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new JavaeePackageImpl());
> 
> 		isInited = true;
> 
>@@ -573,27 +637,36 @@
> 		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);
>+		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
>+		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
> 		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
>+		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
>+		WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
>+		WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
> 
> 		// Create package meta-data objects
> 		theJavaeePackage.createPackageContents();
>-		theWebPackage.createPackageContents();
> 		theApplicationPackage.createPackageContents();
>-		theEjbPackage.createPackageContents();
> 		theApplicationclientPackage.createPackageContents();
>+		theJcaPackage.createPackageContents();
>+		theEjbPackage.createPackageContents();
> 		theJspPackage.createPackageContents();
>+		theWebPackage.createPackageContents();
>+		theWebappPackage.createPackageContents();
>+		theWebfragmentPackage.createPackageContents();
> 
> 		// Initialize created meta-data
> 		theJavaeePackage.initializePackageContents();
>-		theWebPackage.initializePackageContents();
> 		theApplicationPackage.initializePackageContents();
>-		theEjbPackage.initializePackageContents();
> 		theApplicationclientPackage.initializePackageContents();
>+		theJcaPackage.initializePackageContents();
>+		theEjbPackage.initializePackageContents();
> 		theJspPackage.initializePackageContents();
>+		theWebPackage.initializePackageContents();
>+		theWebappPackage.initializePackageContents();
>+		theWebfragmentPackage.initializePackageContents();
> 
> 		// Register package validator
> 		EValidator.Registry.INSTANCE.put
>@@ -607,6 +680,9 @@
> 		// Mark meta-data to indicate it can't be changed
> 		theJavaeePackage.freeze();
> 
>+ 
>+		// Update the registry and return the package
>+		EPackage.Registry.INSTANCE.put(JavaeePackage.eNS_URI, theJavaeePackage);
> 		return theJavaeePackage;
> 	}
> 
>@@ -615,6 +691,222 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EClass getAddressingType() {
>+		return addressingTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAddressingType_Enabled() {
>+		return (EAttribute)addressingTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAddressingType_Required() {
>+		return (EAttribute)addressingTypeEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAddressingType_Responses() {
>+		return (EAttribute)addressingTypeEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getDataSourceType() {
>+		return dataSourceTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getDataSourceType_Description() {
>+		return (EReference)dataSourceTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_Name() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_ClassName() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_ServerName() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_PortNumber() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(4);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_DatabaseName() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(5);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_Url() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(6);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_User() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(7);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_Password() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(8);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getDataSourceType_Property() {
>+		return (EReference)dataSourceTypeEClass.getEStructuralFeatures().get(9);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_LoginTimeout() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(10);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_Transactional() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(11);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_IsolationLevel() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(12);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_InitialPoolSize() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(13);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_MaxPoolSize() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(14);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_MinPoolSize() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(15);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_MaxIdleTime() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(16);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_MaxStatements() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(17);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getDataSourceType_Id() {
>+		return (EAttribute)dataSourceTypeEClass.getEStructuralFeatures().get(18);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getDescription() {
> 		return descriptionEClass;
> 	}
>@@ -750,7 +1042,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getEjbLocalRef_Id() {
>+	public EAttribute getEjbLocalRef_LookupName() {
> 		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(8);
> 	}
> 
>@@ -759,6 +1051,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getEjbLocalRef_Id() {
>+		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(9);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getEjbRef() {
> 		return ejbRefEClass;
> 	}
>@@ -840,7 +1141,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getEjbRef_Id() {
>+	public EAttribute getEjbRef_LookupName() {
> 		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(8);
> 	}
> 
>@@ -849,6 +1150,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getEjbRef_Id() {
>+		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(9);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getEmptyType() {
> 		return emptyTypeEClass;
> 	}
>@@ -930,7 +1240,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getEnvEntry_Id() {
>+	public EAttribute getEnvEntry_LookupName() {
> 		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(6);
> 	}
> 
>@@ -939,6 +1249,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getEnvEntry_Id() {
>+		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(7);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getIcon() {
> 		return iconEClass;
> 	}
>@@ -1227,7 +1546,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getMessageDestinationRef_Id() {
>+	public EAttribute getMessageDestinationRef_LookupName() {
> 		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(7);
> 	}
> 
>@@ -1236,6 +1555,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getMessageDestinationRef_Id() {
>+		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(8);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getParamValue() {
> 		return paramValueEClass;
> 	}
>@@ -1353,7 +1681,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getPersistenceContextRef_Id() {
>+	public EAttribute getPersistenceContextRef_LookupName() {
> 		return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(7);
> 	}
> 
>@@ -1362,6 +1690,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getPersistenceContextRef_Id() {
>+		return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(8);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getPersistenceUnitRef() {
> 		return persistenceUnitRefEClass;
> 	}
>@@ -1416,7 +1753,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getPersistenceUnitRef_Id() {
>+	public EAttribute getPersistenceUnitRef_LookupName() {
> 		return (EAttribute)persistenceUnitRefEClass.getEStructuralFeatures().get(5);
> 	}
> 
>@@ -1425,6 +1762,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getPersistenceUnitRef_Id() {
>+		return (EAttribute)persistenceUnitRefEClass.getEStructuralFeatures().get(6);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getPortComponentRef() {
> 		return portComponentRefEClass;
> 	}
>@@ -1452,7 +1798,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getPortComponentRef_PortComponentLink() {
>+	public EAttribute getPortComponentRef_MtomThreshold() {
> 		return (EAttribute)portComponentRefEClass.getEStructuralFeatures().get(2);
> 	}
> 
>@@ -1461,8 +1807,35 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EReference getPortComponentRef_Addressing() {
>+		return (EReference)portComponentRefEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getPortComponentRef_RespectBinding() {
>+		return (EReference)portComponentRefEClass.getEStructuralFeatures().get(4);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getPortComponentRef_PortComponentLink() {
>+		return (EAttribute)portComponentRefEClass.getEStructuralFeatures().get(5);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EAttribute getPortComponentRef_Id() {
>-		return (EAttribute)portComponentRefEClass.getEStructuralFeatures().get(3);
>+		return (EAttribute)portComponentRefEClass.getEStructuralFeatures().get(6);
> 	}
> 
> 	/**
>@@ -1560,7 +1933,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getResourceEnvRef_Id() {
>+	public EAttribute getResourceEnvRef_LookupName() {
> 		return (EAttribute)resourceEnvRefEClass.getEStructuralFeatures().get(5);
> 	}
> 
>@@ -1569,6 +1942,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getResourceEnvRef_Id() {
>+		return (EAttribute)resourceEnvRefEClass.getEStructuralFeatures().get(6);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getResourceRef() {
> 		return resourceRefEClass;
> 	}
>@@ -1641,7 +2023,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getResourceRef_Id() {
>+	public EAttribute getResourceRef_LookupName() {
> 		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(7);
> 	}
> 
>@@ -1650,6 +2032,33 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getResourceRef_Id() {
>+		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(8);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getRespectBindingType() {
>+		return respectBindingTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getRespectBindingType_Enabled() {
>+		return (EAttribute)respectBindingTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getRunAs() {
> 		return runAsEClass;
> 	}
>@@ -1902,7 +2311,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getServiceRef_Id() {
>+	public EAttribute getServiceRef_LookupName() {
> 		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(14);
> 	}
> 
>@@ -1911,6 +2320,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getServiceRef_Id() {
>+		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(15);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getServiceRefHandler() {
> 		return serviceRefHandlerEClass;
> 	}
>@@ -2109,6 +2527,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EEnum getAddressingResponsesType() {
>+		return addressingResponsesTypeEEnum;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EEnum getEjbRefType() {
> 		return ejbRefTypeEEnum;
> 	}
>@@ -2118,8 +2545,26 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EEnum getEnvEntryType() {
>-		return envEntryTypeEEnum;
>+	public EEnum getGenericBooleanType() {
>+		return genericBooleanTypeEEnum;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EEnum getIsolationLevelType() {
>+		return isolationLevelTypeEEnum;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getEnvEntryType() {
>+		return envEntryTypeEDataType;
> 	}
> 
> 	/**
>@@ -2163,6 +2608,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EDataType getAddressingResponsesTypeObject() {
>+		return addressingResponsesTypeObjectEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EDataType getDeweyVersionType() {
> 		return deweyVersionTypeEDataType;
> 	}
>@@ -2199,8 +2653,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getEnvEntryTypeObject() {
>-		return envEntryTypeObjectEDataType;
>+	public EDataType getFullyQualifiedClassType() {
>+		return fullyQualifiedClassTypeEDataType;
> 	}
> 
> 	/**
>@@ -2208,8 +2662,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getFullyQualifiedClassType() {
>-		return fullyQualifiedClassTypeEDataType;
>+	public EDataType getGenericBooleanTypeObject() {
>+		return genericBooleanTypeObjectEDataType;
> 	}
> 
> 	/**
>@@ -2226,6 +2680,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EDataType getIsolationLevelTypeObject() {
>+		return isolationLevelTypeObjectEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EDataType getJavaIdentifier() {
> 		return javaIdentifierEDataType;
> 	}
>@@ -2244,6 +2707,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EDataType getJdbcUrlType() {
>+		return jdbcUrlTypeEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EDataType getJNDIName() {
> 		return jndiNameEDataType;
> 	}
>@@ -2316,8 +2788,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getRemote() {
>-		return remoteEDataType;
>+	public EDataType getProtocolBindingListType() {
>+		return protocolBindingListTypeEDataType;
> 	}
> 
> 	/**
>@@ -2325,8 +2797,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getResAuthTypeObject() {
>-		return resAuthTypeObjectEDataType;
>+	public EDataType getProtocolBindingType() {
>+		return protocolBindingTypeEDataType;
> 	}
> 
> 	/**
>@@ -2334,8 +2806,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getResSharingScopeTypeObject() {
>-		return resSharingScopeTypeObjectEDataType;
>+	public EDataType getProtocolURIAliasType() {
>+		return protocolURIAliasTypeEDataType;
> 	}
> 
> 	/**
>@@ -2343,8 +2815,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getRoleName() {
>-		return roleNameEDataType;
>+	public EDataType getQnamePattern() {
>+		return qnamePatternEDataType;
> 	}
> 
> 	/**
>@@ -2352,8 +2824,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getServiceRefProtocolBindingListType() {
>-		return serviceRefProtocolBindingListTypeEDataType;
>+	public EDataType getRemote() {
>+		return remoteEDataType;
> 	}
> 
> 	/**
>@@ -2361,8 +2833,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getServiceRefProtocolBindingType() {
>-		return serviceRefProtocolBindingTypeEDataType;
>+	public EDataType getResAuthTypeObject() {
>+		return resAuthTypeObjectEDataType;
> 	}
> 
> 	/**
>@@ -2370,8 +2842,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getServiceRefProtocolURIAliasType() {
>-		return serviceRefProtocolURIAliasTypeEDataType;
>+	public EDataType getResSharingScopeTypeObject() {
>+		return resSharingScopeTypeObjectEDataType;
> 	}
> 
> 	/**
>@@ -2379,8 +2851,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EDataType getServiceRefQnamePattern() {
>-		return serviceRefQnamePatternEDataType;
>+	public EDataType getRoleName() {
>+		return roleNameEDataType;
> 	}
> 
> 	/**
>@@ -2429,6 +2901,32 @@
> 		isCreated = true;
> 
> 		// Create classes and their features
>+		addressingTypeEClass = createEClass(ADDRESSING_TYPE);
>+		createEAttribute(addressingTypeEClass, ADDRESSING_TYPE__ENABLED);
>+		createEAttribute(addressingTypeEClass, ADDRESSING_TYPE__REQUIRED);
>+		createEAttribute(addressingTypeEClass, ADDRESSING_TYPE__RESPONSES);
>+
>+		dataSourceTypeEClass = createEClass(DATA_SOURCE_TYPE);
>+		createEReference(dataSourceTypeEClass, DATA_SOURCE_TYPE__DESCRIPTION);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__NAME);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__CLASS_NAME);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__SERVER_NAME);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__PORT_NUMBER);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__DATABASE_NAME);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__URL);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__USER);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__PASSWORD);
>+		createEReference(dataSourceTypeEClass, DATA_SOURCE_TYPE__PROPERTY);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__LOGIN_TIMEOUT);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__TRANSACTIONAL);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__ISOLATION_LEVEL);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__INITIAL_POOL_SIZE);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__MAX_POOL_SIZE);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__MIN_POOL_SIZE);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__MAX_IDLE_TIME);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__MAX_STATEMENTS);
>+		createEAttribute(dataSourceTypeEClass, DATA_SOURCE_TYPE__ID);
>+
> 		descriptionEClass = createEClass(DESCRIPTION);
> 		createEAttribute(descriptionEClass, DESCRIPTION__VALUE);
> 		createEAttribute(descriptionEClass, DESCRIPTION__LANG);
>@@ -2446,6 +2944,7 @@
> 		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__LOOKUP_NAME);
> 		createEAttribute(ejbLocalRefEClass, EJB_LOCAL_REF__ID);
> 
> 		ejbRefEClass = createEClass(EJB_REF);
>@@ -2457,6 +2956,7 @@
> 		createEAttribute(ejbRefEClass, EJB_REF__EJB_LINK);
> 		createEAttribute(ejbRefEClass, EJB_REF__MAPPED_NAME);
> 		createEReference(ejbRefEClass, EJB_REF__INJECTION_TARGETS);
>+		createEAttribute(ejbRefEClass, EJB_REF__LOOKUP_NAME);
> 		createEAttribute(ejbRefEClass, EJB_REF__ID);
> 
> 		emptyTypeEClass = createEClass(EMPTY_TYPE);
>@@ -2469,6 +2969,7 @@
> 		createEAttribute(envEntryEClass, ENV_ENTRY__ENV_ENTRY_VALUE);
> 		createEAttribute(envEntryEClass, ENV_ENTRY__MAPPED_NAME);
> 		createEReference(envEntryEClass, ENV_ENTRY__INJECTION_TARGETS);
>+		createEAttribute(envEntryEClass, ENV_ENTRY__LOOKUP_NAME);
> 		createEAttribute(envEntryEClass, ENV_ENTRY__ID);
> 
> 		iconEClass = createEClass(ICON);
>@@ -2508,6 +3009,7 @@
> 		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__LOOKUP_NAME);
> 		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__ID);
> 
> 		paramValueEClass = createEClass(PARAM_VALUE);
>@@ -2524,6 +3026,7 @@
> 		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__LOOKUP_NAME);
> 		createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__ID);
> 
> 		persistenceUnitRefEClass = createEClass(PERSISTENCE_UNIT_REF);
>@@ -2532,11 +3035,15 @@
> 		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__LOOKUP_NAME);
> 		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__MTOM_THRESHOLD);
>+		createEReference(portComponentRefEClass, PORT_COMPONENT_REF__ADDRESSING);
>+		createEReference(portComponentRefEClass, PORT_COMPONENT_REF__RESPECT_BINDING);
> 		createEAttribute(portComponentRefEClass, PORT_COMPONENT_REF__PORT_COMPONENT_LINK);
> 		createEAttribute(portComponentRefEClass, PORT_COMPONENT_REF__ID);
> 
>@@ -2551,6 +3058,7 @@
> 		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__LOOKUP_NAME);
> 		createEAttribute(resourceEnvRefEClass, RESOURCE_ENV_REF__ID);
> 
> 		resourceRefEClass = createEClass(RESOURCE_REF);
>@@ -2561,8 +3069,12 @@
> 		createEAttribute(resourceRefEClass, RESOURCE_REF__RES_SHARING_SCOPE);
> 		createEAttribute(resourceRefEClass, RESOURCE_REF__MAPPED_NAME);
> 		createEReference(resourceRefEClass, RESOURCE_REF__INJECTION_TARGETS);
>+		createEAttribute(resourceRefEClass, RESOURCE_REF__LOOKUP_NAME);
> 		createEAttribute(resourceRefEClass, RESOURCE_REF__ID);
> 
>+		respectBindingTypeEClass = createEClass(RESPECT_BINDING_TYPE);
>+		createEAttribute(respectBindingTypeEClass, RESPECT_BINDING_TYPE__ENABLED);
>+
> 		runAsEClass = createEClass(RUN_AS);
> 		createEReference(runAsEClass, RUN_AS__DESCRIPTIONS);
> 		createEAttribute(runAsEClass, RUN_AS__ROLE_NAME);
>@@ -2594,6 +3106,7 @@
> 		createEReference(serviceRefEClass, SERVICE_REF__HANDLER_CHAINS);
> 		createEAttribute(serviceRefEClass, SERVICE_REF__MAPPED_NAME);
> 		createEReference(serviceRefEClass, SERVICE_REF__INJECTION_TARGETS);
>+		createEAttribute(serviceRefEClass, SERVICE_REF__LOOKUP_NAME);
> 		createEAttribute(serviceRefEClass, SERVICE_REF__ID);
> 
> 		serviceRefHandlerEClass = createEClass(SERVICE_REF_HANDLER);
>@@ -2623,23 +3136,29 @@
> 		createEAttribute(urlPatternTypeEClass, URL_PATTERN_TYPE__VALUE);
> 
> 		// Create enums
>+		addressingResponsesTypeEEnum = createEEnum(ADDRESSING_RESPONSES_TYPE);
> 		ejbRefTypeEEnum = createEEnum(EJB_REF_TYPE);
>-		envEntryTypeEEnum = createEEnum(ENV_ENTRY_TYPE);
>+		genericBooleanTypeEEnum = createEEnum(GENERIC_BOOLEAN_TYPE);
>+		isolationLevelTypeEEnum = createEEnum(ISOLATION_LEVEL_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
>+		addressingResponsesTypeObjectEDataType = createEDataType(ADDRESSING_RESPONSES_TYPE_OBJECT);
> 		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);
>+		envEntryTypeEDataType = createEDataType(ENV_ENTRY_TYPE);
> 		fullyQualifiedClassTypeEDataType = createEDataType(FULLY_QUALIFIED_CLASS_TYPE);
>+		genericBooleanTypeObjectEDataType = createEDataType(GENERIC_BOOLEAN_TYPE_OBJECT);
> 		homeEDataType = createEDataType(HOME);
>+		isolationLevelTypeObjectEDataType = createEDataType(ISOLATION_LEVEL_TYPE_OBJECT);
> 		javaIdentifierEDataType = createEDataType(JAVA_IDENTIFIER);
> 		javaTypeEDataType = createEDataType(JAVA_TYPE);
>+		jdbcUrlTypeEDataType = createEDataType(JDBC_URL_TYPE);
> 		jndiNameEDataType = createEDataType(JNDI_NAME);
> 		localEDataType = createEDataType(LOCAL);
> 		localHomeEDataType = createEDataType(LOCAL_HOME);
>@@ -2648,14 +3167,14 @@
> 		messageDestinationUsageTypeObjectEDataType = createEDataType(MESSAGE_DESTINATION_USAGE_TYPE_OBJECT);
> 		pathTypeEDataType = createEDataType(PATH_TYPE);
> 		persistenceContextTypeObjectEDataType = createEDataType(PERSISTENCE_CONTEXT_TYPE_OBJECT);
>+		protocolBindingListTypeEDataType = createEDataType(PROTOCOL_BINDING_LIST_TYPE);
>+		protocolBindingTypeEDataType = createEDataType(PROTOCOL_BINDING_TYPE);
>+		protocolURIAliasTypeEDataType = createEDataType(PROTOCOL_URI_ALIAS_TYPE);
>+		qnamePatternEDataType = createEDataType(QNAME_PATTERN);
> 		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);
> 	}
>@@ -2687,217 +3206,269 @@
> 		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
> 		XMLNamespacePackage theXMLNamespacePackage = (XMLNamespacePackage)EPackage.Registry.INSTANCE.getEPackage(XMLNamespacePackage.eNS_URI);
> 
>+		// Create type parameters
>+
>+		// Set bounds for type parameters
>+
> 		// Add supertypes to classes
> 
> 		// Initialize classes and features; add operations and parameters
>+		initEClass(addressingTypeEClass, AddressingType.class, "AddressingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getAddressingType_Enabled(), this.getTrueFalseType(), "enabled", null, 0, 1, AddressingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAddressingType_Required(), this.getTrueFalseType(), "required", null, 0, 1, AddressingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAddressingType_Responses(), this.getAddressingResponsesType(), "responses", null, 0, 1, AddressingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(dataSourceTypeEClass, DataSourceType.class, "DataSourceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getDataSourceType_Description(), this.getDescription(), null, "description", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_Name(), this.getJNDIName(), "name", null, 1, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_ClassName(), this.getFullyQualifiedClassType(), "className", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_ServerName(), theXMLTypePackage.getString(), "serverName", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_PortNumber(), theXMLTypePackage.getInteger(), "portNumber", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_DatabaseName(), theXMLTypePackage.getString(), "databaseName", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_Url(), this.getJdbcUrlType(), "url", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_User(), theXMLTypePackage.getString(), "user", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_Password(), theXMLTypePackage.getString(), "password", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getDataSourceType_Property(), this.getPropertyType(), null, "property", null, 0, -1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_LoginTimeout(), theXMLTypePackage.getInteger(), "loginTimeout", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_Transactional(), theXMLTypePackage.getBoolean(), "transactional", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_IsolationLevel(), this.getIsolationLevelType(), "isolationLevel", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_InitialPoolSize(), theXMLTypePackage.getInteger(), "initialPoolSize", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_MaxPoolSize(), theXMLTypePackage.getInteger(), "maxPoolSize", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_MinPoolSize(), theXMLTypePackage.getInteger(), "minPoolSize", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_MaxIdleTime(), theXMLTypePackage.getInteger(), "maxIdleTime", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_MaxStatements(), theXMLTypePackage.getInteger(), "maxStatements", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDataSourceType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
> 		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$
>+		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$
>+		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$
>+		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", 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_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$
>+		initEAttribute(getEjbLocalRef_LookupName(), theXMLTypePackage.getString(), "lookupName", 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_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$
>+		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", 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_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$
>+		initEAttribute(getEjbRef_LookupName(), theXMLTypePackage.getString(), "lookupName", 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_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$
>+		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$
>+		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", 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_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$
>+		initEAttribute(getEnvEntry_LookupName(), theXMLTypePackage.getString(), "lookupName", 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_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$
>+		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$
>+		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$
>+		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$
>+		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$
>+		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$
>+		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", 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_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$
>+		initEAttribute(getMessageDestinationRef_LookupName(), theXMLTypePackage.getString(), "lookupName", 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_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$
>+		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$
>+		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", 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_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$
>+		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$
>+		initEAttribute(getPersistenceContextRef_LookupName(), theXMLTypePackage.getString(), "lookupName", 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_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$
>+		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$
>+		initEAttribute(getPersistenceUnitRef_LookupName(), theXMLTypePackage.getString(), "lookupName", 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_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$
>+		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_MtomThreshold(), theXMLTypePackage.getNonNegativeInteger(), "mtomThreshold", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getPortComponentRef_Addressing(), this.getAddressingType(), null, "addressing", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getPortComponentRef_RespectBinding(), this.getRespectBindingType(), null, "respectBinding", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, 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$
>+		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$
>+		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$
>+		initEAttribute(getResourceEnvRef_LookupName(), theXMLTypePackage.getString(), "lookupName", 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_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$
>+		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", 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_ResSharingScope(), this.getResSharingScopeType(), "resSharingScope", 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_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$
>+		initEAttribute(getResourceRef_LookupName(), theXMLTypePackage.getString(), "lookupName", 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_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(respectBindingTypeEClass, RespectBindingType.class, "RespectBindingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getRespectBindingType_Enabled(), this.getTrueFalseType(), "enabled", null, 0, 1, RespectBindingType.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$
>+		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$
>+		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$
>+		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$
>+		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$
>+		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$
>+		initEAttribute(getServiceRef_LookupName(), theXMLTypePackage.getString(), "lookupName", 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_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$
>+		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$
>+		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$
>+		initEAttribute(getServiceRefHandlerChain_ServiceNamePattern(), this.getQnamePattern(), "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.getQnamePattern(), "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.getProtocolBindingListType(), "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$
>+		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$
>+		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$
>+		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(addressingResponsesTypeEEnum, AddressingResponsesType.class, "AddressingResponsesType"); //$NON-NLS-1$
>+		addEEnumLiteral(addressingResponsesTypeEEnum, AddressingResponsesType.ANONYMOUS);
>+		addEEnumLiteral(addressingResponsesTypeEEnum, AddressingResponsesType.NONANONYMOUS);
>+		addEEnumLiteral(addressingResponsesTypeEEnum, AddressingResponsesType.ALL);
>+
> 		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(genericBooleanTypeEEnum, GenericBooleanType.class, "GenericBooleanType"); //$NON-NLS-1$
>+		addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.TRUE);
>+		addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.FALSE);
>+		addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.YES);
>+		addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.NO);
>+
>+		initEEnum(isolationLevelTypeEEnum, IsolationLevelType.class, "IsolationLevelType"); //$NON-NLS-1$
>+		addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONNONE);
>+		addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREADUNCOMMITTED);
>+		addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREADCOMMITTED);
>+		addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREPEATABLEREAD);
>+		addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONSERIALIZABLE);
> 
> 		initEEnum(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.class, "MessageDestinationUsageType"); //$NON-NLS-1$
> 		addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.CONSUMES_LITERAL);
>@@ -2917,15 +3488,19 @@
> 		addEEnumLiteral(resSharingScopeTypeEEnum, ResSharingScopeType.UNSHAREABLE_LITERAL);
> 
> 		// Initialize data types
>+		initEDataType(addressingResponsesTypeObjectEDataType, AddressingResponsesType.class, "AddressingResponsesTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		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(envEntryTypeEDataType, String.class, "EnvEntryType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEDataType(fullyQualifiedClassTypeEDataType, String.class, "FullyQualifiedClassType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(genericBooleanTypeObjectEDataType, GenericBooleanType.class, "GenericBooleanTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEDataType(homeEDataType, String.class, "Home", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(isolationLevelTypeObjectEDataType, IsolationLevelType.class, "IsolationLevelTypeObject", 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(jdbcUrlTypeEDataType, String.class, "JdbcUrlType", 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$
>@@ -2934,14 +3509,14 @@
> 		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(protocolBindingListTypeEDataType, List.class, "ProtocolBindingListType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(protocolBindingTypeEDataType, String.class, "ProtocolBindingType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(protocolURIAliasTypeEDataType, String.class, "ProtocolURIAliasType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(qnamePatternEDataType, String.class, "QnamePattern", 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$
> 
>@@ -2962,6 +3537,208 @@
> 	protected void createExtendedMetaDataAnnotations() {
> 		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$				
> 		addAnnotation
>+		 (addressingResponsesTypeEEnum, 
>+		 source, 
>+		 new String[] {
>+			 "name", "addressing-responsesType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (addressingResponsesTypeObjectEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "addressing-responsesType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "addressing-responsesType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (addressingTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "addressingType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAddressingType_Enabled(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "enabled", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAddressingType_Required(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "required", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAddressingType_Responses(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "responses", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (dataSourceTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "data-sourceType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_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
>+		 (getDataSourceType_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
>+		 (getDataSourceType_ClassName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "class-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_ServerName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "server-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_PortNumber(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "port-number", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_DatabaseName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "database-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_Url(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "url", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_User(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "user", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_Password(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "password", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_Property(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "property", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_LoginTimeout(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "login-timeout", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_Transactional(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "transactional", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_IsolationLevel(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "isolation-level", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_InitialPoolSize(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "initial-pool-size", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_MaxPoolSize(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "max-pool-size", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_MinPoolSize(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "min-pool-size", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_MaxIdleTime(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "max-idle-time", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getDataSourceType_MaxStatements(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "max-statements", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getDataSourceType_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (descriptionEClass, 
> 		 source, 
> 		 new String[] {
>@@ -3089,6 +3866,14 @@
> 			 "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_LookupName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getEjbLocalRef_Id(), 
>@@ -3167,6 +3952,14 @@
> 			 "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_LookupName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getEjbRef_Id(), 
>@@ -3262,6 +4055,14 @@
> 			 "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_LookupName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getEnvEntry_Id(), 
>@@ -3271,23 +4072,30 @@
> 			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (envEntryTypeEEnum, 
>+		 (envEntryTypeEDataType, 
> 		 source, 
> 		 new String[] {
>-			 "name", "env-entry-type-valuesType" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });		
>+			 "name", "env-entry-type-valuesType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "fully-qualified-classType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
> 		addAnnotation
>-		 (envEntryTypeObjectEDataType, 
>+		 (fullyQualifiedClassTypeEDataType, 
> 		 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$
>+			 "name", "fully-qualified-classType" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>-		 (fullyQualifiedClassTypeEDataType, 
>+		 (genericBooleanTypeEEnum, 
> 		 source, 
> 		 new String[] {
>-			 "name", "fully-qualified-classType" //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "generic-booleanType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (genericBooleanTypeObjectEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "generic-booleanType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "generic-booleanType" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
> 		 (homeEDataType, 
>@@ -3357,6 +4165,19 @@
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>+		 (isolationLevelTypeEEnum, 
>+		 source, 
>+		 new String[] {
>+			 "name", "isolation-levelType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (isolationLevelTypeObjectEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "isolation-levelType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "isolation-levelType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (javaIdentifierEDataType, 
> 		 source, 
> 		 new String[] {
>@@ -3373,6 +4194,14 @@
> 			 "pattern", "[^\\p{Z}]*" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>+		 (jdbcUrlTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "jdbc-urlType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "pattern", "jdbc:(.*):(.*)" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (jndiNameEDataType, 
> 		 source, 
> 		 new String[] {
>@@ -3581,6 +4410,14 @@
> 			 "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_LookupName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getMessageDestinationRef_Id(), 
>@@ -3714,6 +4551,14 @@
> 			 "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_LookupName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getPersistenceContextRef_Id(), 
>@@ -3781,6 +4626,14 @@
> 			 "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_LookupName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getPersistenceUnitRef_Id(), 
>@@ -3813,6 +4666,30 @@
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>+		 (getPortComponentRef_MtomThreshold(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "mtom-threshold", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getPortComponentRef_Addressing(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "addressing", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getPortComponentRef_RespectBinding(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "respect-binding", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (getPortComponentRef_PortComponentLink(), 
> 		 source, 
> 		 new String[] {
>@@ -3858,6 +4735,36 @@
> 			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>+		 (protocolBindingListTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "protocol-bindingListType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "itemType", "protocol-bindingType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (protocolBindingTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "protocol-bindingType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "memberTypes", "http://www.eclipse.org/emf/2003/XMLType#anyURI protocol-URIAliasType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (protocolURIAliasTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "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
>+		 (qnamePatternEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "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
> 		 (remoteEDataType, 
> 		 source, 
> 		 new String[] {
>@@ -3922,6 +4829,14 @@
> 			 "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_LookupName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getResourceEnvRef_Id(), 
>@@ -3992,6 +4907,14 @@
> 			 "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_LookupName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getResourceRef_Id(), 
>@@ -4001,6 +4924,21 @@
> 			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>+		 (respectBindingTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "respect-bindingType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getRespectBindingType_Enabled(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "enabled", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (resSharingScopeTypeEEnum, 
> 		 source, 
> 		 new String[] {
>@@ -4235,6 +5173,14 @@
> 			 "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_LookupName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getServiceRef_Id(), 
>@@ -4247,7 +5193,7 @@
> 		 (serviceRefHandlerEClass, 
> 		 source, 
> 		 new String[] {
>-			 "name", "service-ref_handlerType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "handlerType", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>@@ -4289,7 +5235,7 @@
> 			 "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, 
>@@ -4333,7 +5279,7 @@
> 		 (serviceRefHandlerChainEClass, 
> 		 source, 
> 		 new String[] {
>-			 "name", "service-ref_handler-chainType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "handler-chainType", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>@@ -4379,7 +5325,7 @@
> 		 (serviceRefHandlerChainsEClass, 
> 		 source, 
> 		 new String[] {
>-			 "name", "service-ref_handler-chainsType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "handler-chainsType", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>@@ -4398,36 +5344,6 @@
> 			 "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[] {
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceContextRefImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceContextRefImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 PersistenceContextRefImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceContextRefImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceContextRefImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -49,6 +49,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getPersistenceProperties Persistence Properties}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getId Id}</li>
> * </ul>
> * 
>@@ -64,7 +65,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getPersistenceContextRefName() Persistence Context Ref Name}' attribute.
>@@ -133,7 +134,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean persistenceContextTypeESet = false;
>+	protected boolean persistenceContextTypeESet;
> 
> 	/**
> 	 * The cached value of the '{@link #getPersistenceProperties() Persistence Properties}' containment reference list.
>@@ -143,7 +144,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList persistenceProperties = null;
>+	protected EList<PropertyType> persistenceProperties;
> 
> 	/**
> 	 * The default value of the '{@link #getMappedName() Mapped Name}' attribute.
>@@ -173,7 +174,27 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList injectionTargets = null;
>+	protected EList<InjectionTarget> injectionTargets;
>+
>+	/**
>+	 * The default value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String LOOKUP_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String lookupName = LOOKUP_NAME_EDEFAULT;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -219,9 +240,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.PERSISTENCE_CONTEXT_REF__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.PERSISTENCE_CONTEXT_REF__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -319,9 +340,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPersistenceProperties() {
>+	public List<PropertyType> getPersistenceProperties() {
> 		if (persistenceProperties == null) {
>-			persistenceProperties = new EObjectContainmentEList(PropertyType.class, this, JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES);
>+			persistenceProperties = new EObjectContainmentEList<PropertyType>(PropertyType.class, this, JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES);
> 		}
> 		return persistenceProperties;
> 	}
>@@ -352,9 +373,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInjectionTargets() {
>+	public List<InjectionTarget> getInjectionTargets() {
> 		if (injectionTargets == null) {
>-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS);
>+			injectionTargets = new EObjectContainmentEList<InjectionTarget>(InjectionTarget.class, this, JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS);
> 		}
> 		return injectionTargets;
> 	}
>@@ -364,6 +385,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String getLookupName() {
>+		return lookupName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLookupName(String newLookupName) {
>+		String oldLookupName = lookupName;
>+		lookupName = newLookupName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME, oldLookupName, lookupName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -389,11 +431,11 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES:
>-				return ((InternalEList)getPersistenceProperties()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPersistenceProperties()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
>-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInjectionTargets()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -420,6 +462,8 @@
> 				return getMappedName();
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
> 				return getInjectionTargets();
>+			case JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME:
>+				return getLookupName();
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
> 				return getId();
> 		}
>@@ -431,12 +475,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_CONTEXT_REF_NAME:
> 				setPersistenceContextRefName((String)newValue);
>@@ -449,14 +494,17 @@
> 				return;
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES:
> 				getPersistenceProperties().clear();
>-				getPersistenceProperties().addAll((Collection)newValue);
>+				getPersistenceProperties().addAll((Collection<? extends PropertyType>)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);
>+				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
>+				return;
>+			case JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME:
>+				setLookupName((String)newValue);
> 				return;
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
> 				setId((String)newValue);
>@@ -494,6 +542,9 @@
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
> 				return;
>+			case JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME:
>+				setLookupName(LOOKUP_NAME_EDEFAULT);
>+				return;
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -523,6 +574,8 @@
> 				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__LOOKUP_NAME:
>+				return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName);
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -547,6 +600,8 @@
> 		if (persistenceContextTypeESet) result.append(persistenceContextType); else result.append("<unset>"); //$NON-NLS-1$
> 		result.append(", mappedName: "); //$NON-NLS-1$
> 		result.append(mappedName);
>+		result.append(", lookupName: "); //$NON-NLS-1$
>+		result.append(lookupName);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceUnitRefImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceUnitRefImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 PersistenceUnitRefImpl.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceUnitRefImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceUnitRefImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -45,6 +45,7 @@
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getPersistenceUnitName Persistence Unit Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getMappedName Mapped Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getInjectionTargets Injection Targets}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getLookupName Lookup Name}</li>
> * <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getId Id}</li>
> * </ul>
> * 
>@@ -60,7 +61,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getPersistenceUnitRefName() Persistence Unit Ref Name}' attribute.
>@@ -130,7 +131,27 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList injectionTargets = null;
>+	protected EList<InjectionTarget> injectionTargets;
>+
>+	/**
>+	 * The default value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String LOOKUP_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getLookupName() Lookup Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLookupName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String lookupName = LOOKUP_NAME_EDEFAULT;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -176,9 +197,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JavaeePackage.PERSISTENCE_UNIT_REF__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JavaeePackage.PERSISTENCE_UNIT_REF__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -251,9 +272,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInjectionTargets() {
>+	public List<InjectionTarget> getInjectionTargets() {
> 		if (injectionTargets == null) {
>-			injectionTargets = new EObjectContainmentEList(InjectionTarget.class, this, JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS);
>+			injectionTargets = new EObjectContainmentEList<InjectionTarget>(InjectionTarget.class, this, JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS);
> 		}
> 		return injectionTargets;
> 	}
>@@ -263,6 +284,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String getLookupName() {
>+		return lookupName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLookupName(String newLookupName) {
>+		String oldLookupName = lookupName;
>+		lookupName = newLookupName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME, oldLookupName, lookupName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -288,9 +330,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JavaeePackage.PERSISTENCE_UNIT_REF__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
>-				return ((InternalEList)getInjectionTargets()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInjectionTargets()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -313,6 +355,8 @@
> 				return getMappedName();
> 			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
> 				return getInjectionTargets();
>+			case JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME:
>+				return getLookupName();
> 			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
> 				return getId();
> 		}
>@@ -324,12 +368,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JavaeePackage.PERSISTENCE_UNIT_REF__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JavaeePackage.PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_REF_NAME:
> 				setPersistenceUnitRefName((String)newValue);
>@@ -342,7 +387,10 @@
> 				return;
> 			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
>-				getInjectionTargets().addAll((Collection)newValue);
>+				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
>+				return;
>+			case JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME:
>+				setLookupName((String)newValue);
> 				return;
> 			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
> 				setId((String)newValue);
>@@ -374,6 +422,9 @@
> 			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
> 				getInjectionTargets().clear();
> 				return;
>+			case JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME:
>+				setLookupName(LOOKUP_NAME_EDEFAULT);
>+				return;
> 			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -399,6 +450,8 @@
> 				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__LOOKUP_NAME:
>+				return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName);
> 			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -421,6 +474,8 @@
> 		result.append(persistenceUnitName);
> 		result.append(", mappedName: "); //$NON-NLS-1$
> 		result.append(mappedName);
>+		result.append(", lookupName: "); //$NON-NLS-1$
>+		result.append(lookupName);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
>Index: jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationSwitch.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationSwitch.java,v
>retrieving revision 1.2
>diff -u -r1.2 ApplicationSwitch.java
>--- jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationSwitch.java	26 Jul 2007 16:56:13 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationSwitch.java	14 Oct 2009 21:44:47 -0000
>@@ -32,7 +32,7 @@
> * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage
> * @generated
> */
>-public class ApplicationSwitch {
>+public class ApplicationSwitch<T> {
> 	/**
> 	 * The cached model package
> 	 * 
>@@ -60,7 +60,7 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	public Object doSwitch(EObject theEObject) {
>+	public T doSwitch(EObject theEObject) {
> 		return doSwitch(theEObject.eClass(), theEObject);
> 	}
> 
>@@ -71,16 +71,16 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
>+	protected T doSwitch(EClass theEClass, EObject theEObject) {
> 		if (theEClass.eContainer() == modelPackage) {
> 			return doSwitch(theEClass.getClassifierID(), theEObject);
> 		}
> 		else {
>-			List eSuperTypes = theEClass.getESuperTypes();
>+			List<EClass> eSuperTypes = theEClass.getESuperTypes();
> 			return
> 				eSuperTypes.isEmpty() ?
> 					defaultCase(theEObject) :
>-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
>+					doSwitch(eSuperTypes.get(0), theEObject);
> 		}
> 	}
> 
>@@ -91,29 +91,29 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	protected Object doSwitch(int classifierID, EObject theEObject) {
>+	protected T doSwitch(int classifierID, EObject theEObject) {
> 		switch (classifierID) {
> 			case ApplicationPackage.APPLICATION: {
> 				Application application = (Application)theEObject;
>-				Object result = caseApplication(application);
>+				T result = caseApplication(application);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case ApplicationPackage.APPLICATION_DEPLOYMENT_DESCRIPTOR: {
> 				ApplicationDeploymentDescriptor applicationDeploymentDescriptor = (ApplicationDeploymentDescriptor)theEObject;
>-				Object result = caseApplicationDeploymentDescriptor(applicationDeploymentDescriptor);
>+				T result = caseApplicationDeploymentDescriptor(applicationDeploymentDescriptor);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case ApplicationPackage.MODULE: {
> 				Module module = (Module)theEObject;
>-				Object result = caseModule(module);
>+				T result = caseModule(module);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case ApplicationPackage.WEB: {
> 				Web web = (Web)theEObject;
>-				Object result = caseWeb(web);
>+				T result = caseWeb(web);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
>@@ -122,77 +122,77 @@
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Application'.
>+	 * Returns the result of interpreting the object as an instance of 'Application'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Application'.
>+	 * @return the result of interpreting the object as an instance of 'Application'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseApplication(Application object) {
>+	public T caseApplication(Application object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Deployment Descriptor'.
>+	 * Returns the result of interpreting the object as an instance of 'Deployment Descriptor'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Deployment Descriptor'.
>+	 * @return the result of interpreting the object as an instance of 'Deployment Descriptor'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseApplicationDeploymentDescriptor(ApplicationDeploymentDescriptor object) {
>+	public T caseApplicationDeploymentDescriptor(ApplicationDeploymentDescriptor object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Module'.
>+	 * Returns the result of interpreting the object as an instance of 'Module'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Module'.
>+	 * @return the result of interpreting the object as an instance of 'Module'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseModule(Module object) {
>+	public T caseModule(Module object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Web'.
>+	 * Returns the result of interpreting the object as an instance of 'Web'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Web'.
>+	 * @return the result of interpreting the object as an instance of 'Web'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseWeb(Web object) {
>+	public T caseWeb(Web object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'EObject'.
>+	 * Returns the result of interpreting the object as an instance of 'EObject'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'EObject'.
>+	 * @return the result of interpreting the object as an instance of 'EObject'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> 	 * @generated
> 	 */
>-	public Object defaultCase(EObject object) {
>+	public T defaultCase(EObject object) {
> 		return null;
> 	}
> 
>Index: jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationAdapterFactory.java,v
>retrieving revision 1.3
>diff -u -r1.3 ApplicationAdapterFactory.java
>--- jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationAdapterFactory.java	9 Jun 2009 19:37:05 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationAdapterFactory.java	14 Oct 2009 21:44:47 -0000
>@@ -70,31 +70,31 @@
> 	}
> 
> 	/**
>-	 * The switch the delegates to the <code>createXXX</code> methods.
>+	 * The switch that delegates to the <code>createXXX</code> methods.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	protected ApplicationSwitch modelSwitch =
>-		new ApplicationSwitch() {
>+	protected ApplicationSwitch<Adapter> modelSwitch =
>+		new ApplicationSwitch<Adapter>() {
> 			@Override
>-			public Object caseApplication(Application object) {
>+			public Adapter caseApplication(Application object) {
> 				return createApplicationAdapter();
> 			}
> 			@Override
>-			public Object caseApplicationDeploymentDescriptor(ApplicationDeploymentDescriptor object) {
>+			public Adapter caseApplicationDeploymentDescriptor(ApplicationDeploymentDescriptor object) {
> 				return createApplicationDeploymentDescriptorAdapter();
> 			}
> 			@Override
>-			public Object caseModule(Module object) {
>+			public Adapter caseModule(Module object) {
> 				return createModuleAdapter();
> 			}
> 			@Override
>-			public Object caseWeb(Web object) {
>+			public Adapter caseWeb(Web object) {
> 				return createWebAdapter();
> 			}
> 			@Override
>-			public Object defaultCase(EObject object) {
>+			public Adapter defaultCase(EObject object) {
> 				return createEObjectAdapter();
> 			}
> 		};
>@@ -109,7 +109,7 @@
> 	 */
> 	@Override
> 	public Adapter createAdapter(Notifier target) {
>-		return (Adapter)modelSwitch.doSwitch((EObject)target);
>+		return modelSwitch.doSwitch((EObject)target);
> 	}
> 
> 
>Index: jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationXMLProcessor.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationXMLProcessor.java,v
>retrieving revision 1.3
>diff -u -r1.3 ApplicationXMLProcessor.java
>--- jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationXMLProcessor.java	9 Jun 2009 19:37:05 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/application/internal/util/ApplicationXMLProcessor.java	14 Oct 2009 21:44:47 -0000
>@@ -14,6 +14,7 @@
> 
> import org.eclipse.emf.ecore.EPackage;
> 
>+import org.eclipse.emf.ecore.resource.Resource;
> import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
> 
> import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
>@@ -43,7 +44,7 @@
> 	 * @generated
> 	 */
> 	@Override
>-	protected Map getRegistrations() {
>+	protected Map<String, Resource.Factory> getRegistrations() {
> 		if (registrations == null) {
> 			super.getRegistrations();
> 			registrations.put(XML_EXTENSION, new ApplicationResourceFactoryImpl());
>Index: jee-models/org/eclipse/jst/javaee/application/Module.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Module.java,v
>retrieving revision 1.2
>diff -u -r1.2 Module.java
>--- jee-models/org/eclipse/jst/javaee/application/Module.java	26 Jul 2007 16:56:14 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/application/Module.java	14 Oct 2009 21:44:47 -0000
>@@ -20,12 +20,13 @@
> * 
> * 
> * 
>- * 	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.
>- * 
>+ * 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.
>+ * 
>+ * @since Java EE 5, Application 5
> * 
> * 
> *
>@@ -53,11 +54,12 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The connector element specifies the URI of a
>-	 * 	 resource adapter archive file, relative to the
>-	 * 	 top level of the application package.
>-	 * 
>-	 * 	 
>+	 * The connector element specifies the URI of a
>+	 * resource adapter archive file, relative to the
>+	 * top level of the application package.
>+	 * 
>+	 * @since Java EE 5, Application 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Connector' attribute.
> 	 * @see #setConnector(String)
>@@ -83,11 +85,12 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The ejb element specifies the URI of an ejb-jar,
>-	 * 	 relative to the top level of the application
>-	 * 	 package.
>-	 * 
>-	 * 	 
>+	 * The ejb element specifies the URI of an ejb-jar,
>+	 * relative to the top level of the application
>+	 * package.
>+	 * 
>+	 * @since Java EE 5, Application 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Ejb' attribute.
> 	 * @see #setEjb(String)
>@@ -113,11 +116,12 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The java element specifies the URI of a java
>-	 * 	 application client module, relative to the top
>-	 * 	 level of the application package.
>-	 * 
>-	 * 	 
>+	 * The java element specifies the URI of a java
>+	 * application client module, relative to the top
>+	 * level of the application package.
>+	 * 
>+	 * @since Java EE 5, Application 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Java' attribute.
> 	 * @see #setJava(String)
>@@ -168,17 +172,18 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5, Application 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Alt Dd' attribute.
> 	 * @see #setAltDd(String)
>Index: jee-models/org/eclipse/jst/javaee/application/ApplicationDeploymentDescriptor.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/ApplicationDeploymentDescriptor.java,v
>retrieving revision 1.2
>diff -u -r1.2 ApplicationDeploymentDescriptor.java
>--- jee-models/org/eclipse/jst/javaee/application/ApplicationDeploymentDescriptor.java	26 Jul 2007 16:56:14 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/application/ApplicationDeploymentDescriptor.java	14 Oct 2009 21:44:47 -0000
>@@ -65,7 +65,7 @@
> 	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplicationDeploymentDescriptor_XMLNSPrefixMap()
> 	 * @generated
> 	 */
>-	Map getXMLNSPrefixMap();
>+	Map<String, String> getXMLNSPrefixMap();
> 
> 	/**
> 	 * Returns the value of the 'XSI Schema Location' map.
>@@ -81,7 +81,7 @@
> 	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplicationDeploymentDescriptor_XSISchemaLocation()
> 	 * @generated
> 	 */
>-	Map getXSISchemaLocation();
>+	Map<String, String> getXSISchemaLocation();
> 
> 	/**
> 	 * Returns the value of the 'Application' containment reference.
>@@ -90,9 +90,10 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	The application element is the root element of a Java EE
>-	 * 	application deployment descriptor.
>-	 * 
>+	 * The application element is the root element of a Java EE
>+	 * application deployment descriptor.
>+	 * 
>+	 * @since Java EE 5, Application 5
> 	 * 
> 	 * 
> 	 * @return the value of the 'Application' containment reference.
>Index: jee-models/org/eclipse/jst/javaee/application/Web.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Web.java,v
>retrieving revision 1.2
>diff -u -r1.2 Web.java
>--- jee-models/org/eclipse/jst/javaee/application/Web.java	26 Jul 2007 16:56:14 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/application/Web.java	14 Oct 2009 21:44:47 -0000
>@@ -20,9 +20,10 @@
> * 
> * 
> * 
>- * 	The webType defines the web-uri and context-root of
>- * 	a web application module.
>- * 
>+ * The webType defines the web-uri and context-root of
>+ * a web application module.
>+ * 
>+ * @since Java EE 5, Application 5
> * 
> * 
> *
>@@ -47,11 +48,12 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The web-uri element specifies the URI of a web
>-	 * 	 application file, relative to the top level of the
>-	 * 	 application package.
>-	 * 
>-	 * 	 
>+	 * The web-uri element specifies the URI of a web
>+	 * application file, relative to the top level of the
>+	 * application package.
>+	 * 
>+	 * @since Java EE 5, Application 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Web Uri' attribute.
> 	 * @see #setWebUri(String)
>@@ -77,10 +79,11 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The context-root element specifies the context root
>-	 * 	 of a web application.
>-	 * 
>-	 * 	 
>+	 * The context-root element specifies the context root
>+	 * of a web application.
>+	 * 
>+	 * @since Java EE 5, Application 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Context Root' attribute.
> 	 * @see #setContextRoot(String)
>Index: jee-models/org/eclipse/jst/javaee/application/Application.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Application.java,v
>retrieving revision 1.2
>diff -u -r1.2 Application.java
>--- jee-models/org/eclipse/jst/javaee/application/Application.java	26 Jul 2007 16:56:14 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/application/Application.java	14 Oct 2009 21:44:47 -0000
>@@ -12,7 +12,23 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.DataSourceType;
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.DisplayName;
>+import org.eclipse.jst.javaee.core.EjbLocalRef;
>+import org.eclipse.jst.javaee.core.EjbRef;
>+import org.eclipse.jst.javaee.core.EnvEntry;
>+import org.eclipse.jst.javaee.core.GenericBooleanType;
>+import org.eclipse.jst.javaee.core.Icon;
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.MessageDestination;
>+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.SecurityRole;
>+import org.eclipse.jst.javaee.core.ServiceRef;
> 
> /**
> * 
>@@ -22,21 +38,35 @@
> * 
> * 
> * 
>- * 	The applicationType defines the structure of the
>- * 	application.
>- * 
>+ * The applicationType defines the structure of the
>+ * application. 
>+ * 
>+ * @since Java EE 5, Application 5
> * 
> * 
> *
> * 
> * The following features are supported:
> * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getApplicationName Application Name}</li>
> * <li>{@link org.eclipse.jst.javaee.application.Application#getDescriptions Descriptions}</li>
> * <li>{@link org.eclipse.jst.javaee.application.Application#getDisplayNames Display Names}</li>
> * <li>{@link org.eclipse.jst.javaee.application.Application#getIcons Icons}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getInitializeInOrder Initialize In Order}</li>
> * <li>{@link org.eclipse.jst.javaee.application.Application#getModules Modules}</li>
> * <li>{@link org.eclipse.jst.javaee.application.Application#getSecurityRoles Security Roles}</li>
> * <li>{@link org.eclipse.jst.javaee.application.Application#getLibraryDirectory Library Directory}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getEnvEntry Env Entry}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getEjbRef Ejb Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getEjbLocalRef Ejb Local Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getServiceRefs Service Refs}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getResourceRef Resource Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getResourceEnvRef Resource Env Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getMessageDestinationRef Message Destination Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getPersistenceContextRef Persistence Context Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getPersistenceUnitRef Persistence Unit Ref}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getMessageDestination Message Destination}</li>
>+ * <li>{@link org.eclipse.jst.javaee.application.Application#getDataSource Data Source}</li>
> * <li>{@link org.eclipse.jst.javaee.application.Application#getId Id}</li>
> * <li>{@link org.eclipse.jst.javaee.application.Application#getVersion Version}</li>
> * </ul>
>@@ -48,6 +78,32 @@
> */
> public interface Application extends JavaEEObject {
> 	/**
>+	 * Returns the value of the 'Application Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Application Name' attribute.
>+	 * @see #setApplicationName(String)
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_ApplicationName()
>+	 * @generated
>+	 */
>+	String getApplicationName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Application#getApplicationName Application Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Application Name' attribute.
>+	 * @see #getApplicationName()
>+	 * @generated
>+	 */
>+	void setApplicationName(String value);
>+
>+	/**
> 	 * Returns the value of the 'Descriptions' containment reference list.
> 	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
> 	 * 
>@@ -60,7 +116,7 @@
> 	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -75,7 +131,7 @@
> 	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -90,7 +146,69 @@
> 	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
>+
>+	/**
>+	 * Returns the value of the 'Initialize In Order' attribute.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.GenericBooleanType}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * If initialize-in-order is true, modules must be initialized
>+	 * in the order they're listed in this deployment descriptor.
>+	 * If not set or set to false, the order of initialization is
>+	 * unspecified and may be product-dependent.
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Initialize In Order' attribute.
>+	 * @see org.eclipse.jst.javaee.core.GenericBooleanType
>+	 * @see #isSetInitializeInOrder()
>+	 * @see #unsetInitializeInOrder()
>+	 * @see #setInitializeInOrder(GenericBooleanType)
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_InitializeInOrder()
>+	 * @generated
>+	 */
>+	GenericBooleanType getInitializeInOrder();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.application.Application#getInitializeInOrder Initialize In Order}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Initialize In Order' attribute.
>+	 * @see org.eclipse.jst.javaee.core.GenericBooleanType
>+	 * @see #isSetInitializeInOrder()
>+	 * @see #unsetInitializeInOrder()
>+	 * @see #getInitializeInOrder()
>+	 * @generated
>+	 */
>+	void setInitializeInOrder(GenericBooleanType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.application.Application#getInitializeInOrder Initialize In Order}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetInitializeInOrder()
>+	 * @see #getInitializeInOrder()
>+	 * @see #setInitializeInOrder(GenericBooleanType)
>+	 * @generated
>+	 */
>+	void unsetInitializeInOrder();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.application.Application#getInitializeInOrder Initialize In Order}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Initialize In Order' attribute is set.
>+	 * @see #unsetInitializeInOrder()
>+	 * @see #getInitializeInOrder()
>+	 * @see #setInitializeInOrder(GenericBooleanType)
>+	 * @generated
>+	 */
>+	boolean isSetInitializeInOrder();
> 
> 	/**
> 	 * Returns the value of the 'Modules' containment reference list.
>@@ -100,18 +218,19 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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. 
>+	 * 
>+	 * @since Java EE 5, Application 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Modules' containment reference list.
> 	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_Modules()
> 	 * @generated
> 	 */
>-	List getModules();
>+	List<Module> getModules();
> 
> 	/**
> 	 * Returns the value of the 'Security Roles' containment reference list.
>@@ -122,11 +241,16 @@
> 	 * there really should be more of a description here...
> 	 * 
> 	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
> 	 * @return the value of the 'Security Roles' containment reference list.
> 	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_SecurityRoles()
> 	 * @generated
> 	 */
>-	List getSecurityRoles();
>+	List<SecurityRole> getSecurityRoles();
> 
> 	/**
> 	 * Returns the value of the 'Library Directory' attribute.
>@@ -135,16 +259,17 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5, Application 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Library Directory' attribute.
> 	 * @see #setLibraryDirectory(String)
>@@ -164,6 +289,181 @@
> 	void setLibraryDirectory(String value);
> 
> 	/**
>+	 * Returns the value of the 'Env Entry' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EnvEntry}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Env Entry' containment reference list.
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_EnvEntry()
>+	 * @generated
>+	 */
>+	List<EnvEntry> getEnvEntry();
>+
>+	/**
>+	 * Returns the value of the 'Ejb Ref' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbRef}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Ejb Ref' containment reference list.
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_EjbRef()
>+	 * @generated
>+	 */
>+	List<EjbRef> getEjbRef();
>+
>+	/**
>+	 * Returns the value of the 'Ejb Local Ref' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EjbLocalRef}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Ejb Local Ref' containment reference list.
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_EjbLocalRef()
>+	 * @generated
>+	 */
>+	List<EjbLocalRef> getEjbLocalRef();
>+
>+	/**
>+	 * Returns the value of the 'Service Refs' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ServiceRef}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Service Refs' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Service Refs' containment reference list.
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_ServiceRefs()
>+	 * @generated
>+	 */
>+	List<ServiceRef> getServiceRefs();
>+
>+	/**
>+	 * Returns the value of the 'Resource Ref' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceRef}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Resource Ref' containment reference list.
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_ResourceRef()
>+	 * @generated
>+	 */
>+	List<ResourceRef> getResourceRef();
>+
>+	/**
>+	 * Returns the value of the 'Resource Env Ref' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.ResourceEnvRef}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Resource Env Ref' containment reference list.
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_ResourceEnvRef()
>+	 * @generated
>+	 */
>+	List<ResourceEnvRef> getResourceEnvRef();
>+
>+	/**
>+	 * Returns the value of the 'Message Destination Ref' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestinationRef}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Message Destination Ref' containment reference list.
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_MessageDestinationRef()
>+	 * @generated
>+	 */
>+	List<MessageDestinationRef> getMessageDestinationRef();
>+
>+	/**
>+	 * Returns the value of the 'Persistence Context Ref' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceContextRef}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Persistence Context Ref' containment reference list.
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_PersistenceContextRef()
>+	 * @generated
>+	 */
>+	List<PersistenceContextRef> getPersistenceContextRef();
>+
>+	/**
>+	 * Returns the value of the 'Persistence Unit Ref' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PersistenceUnitRef}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Persistence Unit Ref' containment reference list.
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_PersistenceUnitRef()
>+	 * @generated
>+	 */
>+	List<PersistenceUnitRef> getPersistenceUnitRef();
>+
>+	/**
>+	 * Returns the value of the 'Message Destination' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.MessageDestination}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Message Destination' containment reference list.
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_MessageDestination()
>+	 * @generated
>+	 */
>+	List<MessageDestination> getMessageDestination();
>+
>+	/**
>+	 * Returns the value of the 'Data Source' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DataSourceType}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Data Source' containment reference list.
>+	 * @see org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage#getApplication_DataSource()
>+	 * @generated
>+	 */
>+	List<DataSourceType> getDataSource();
>+
>+	/**
> 	 * Returns the value of the 'Id' attribute.
> 	 * 
> 	 * 
>@@ -190,15 +490,15 @@
> 
> 	/**
> 	 * Returns the value of the 'Version' attribute.
>-	 * The default value is <code>"5"</code>.
>+	 * The default value is <code>"6"</code>.
> 	 * 
> 	 * 
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The required value for the version is 5.
>-	 * 
>-	 * 	
>+	 * The required value for the version is 6.
>+	 * 
>+	 * 
> 	 * 
> 	 * @return the value of the 'Version' attribute.
> 	 * @see #isSetVersion()
>Index: jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeSwitch.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeSwitch.java,v
>retrieving revision 1.2
>diff -u -r1.2 JavaeeSwitch.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeSwitch.java	26 Jul 2007 16:56:13 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeSwitch.java	14 Oct 2009 21:44:48 -0000
>@@ -32,7 +32,7 @@
> * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage
> * @generated
> */
>-public class JavaeeSwitch {
>+public class JavaeeSwitch<T> {
> 	/**
> 	 * The cached model package
> 	 * 
>@@ -60,7 +60,7 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	public Object doSwitch(EObject theEObject) {
>+	public T doSwitch(EObject theEObject) {
> 		return doSwitch(theEObject.eClass(), theEObject);
> 	}
> 
>@@ -71,16 +71,16 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
>+	protected T doSwitch(EClass theEClass, EObject theEObject) {
> 		if (theEClass.eContainer() == modelPackage) {
> 			return doSwitch(theEClass.getClassifierID(), theEObject);
> 		}
> 		else {
>-			List eSuperTypes = theEClass.getESuperTypes();
>+			List<EClass> eSuperTypes = theEClass.getESuperTypes();
> 			return
> 				eSuperTypes.isEmpty() ?
> 					defaultCase(theEObject) :
>-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
>+					doSwitch(eSuperTypes.get(0), theEObject);
> 		}
> 	}
> 
>@@ -91,167 +91,185 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	protected Object doSwitch(int classifierID, EObject theEObject) {
>+	protected T doSwitch(int classifierID, EObject theEObject) {
> 		switch (classifierID) {
>+			case JavaeePackage.ADDRESSING_TYPE: {
>+				AddressingType addressingType = (AddressingType)theEObject;
>+				T result = caseAddressingType(addressingType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case JavaeePackage.DATA_SOURCE_TYPE: {
>+				DataSourceType dataSourceType = (DataSourceType)theEObject;
>+				T result = caseDataSourceType(dataSourceType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
> 			case JavaeePackage.DESCRIPTION: {
> 				Description description = (Description)theEObject;
>-				Object result = caseDescription(description);
>+				T result = caseDescription(description);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.DISPLAY_NAME: {
> 				DisplayName displayName = (DisplayName)theEObject;
>-				Object result = caseDisplayName(displayName);
>+				T result = caseDisplayName(displayName);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.EJB_LOCAL_REF: {
> 				EjbLocalRef ejbLocalRef = (EjbLocalRef)theEObject;
>-				Object result = caseEjbLocalRef(ejbLocalRef);
>+				T result = caseEjbLocalRef(ejbLocalRef);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.EJB_REF: {
> 				EjbRef ejbRef = (EjbRef)theEObject;
>-				Object result = caseEjbRef(ejbRef);
>+				T result = caseEjbRef(ejbRef);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.EMPTY_TYPE: {
> 				EmptyType emptyType = (EmptyType)theEObject;
>-				Object result = caseEmptyType(emptyType);
>+				T result = caseEmptyType(emptyType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.ENV_ENTRY: {
> 				EnvEntry envEntry = (EnvEntry)theEObject;
>-				Object result = caseEnvEntry(envEntry);
>+				T result = caseEnvEntry(envEntry);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.ICON: {
> 				Icon icon = (Icon)theEObject;
>-				Object result = caseIcon(icon);
>+				T result = caseIcon(icon);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.INJECTION_TARGET: {
> 				InjectionTarget injectionTarget = (InjectionTarget)theEObject;
>-				Object result = caseInjectionTarget(injectionTarget);
>+				T result = caseInjectionTarget(injectionTarget);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.LIFECYCLE_CALLBACK: {
> 				LifecycleCallback lifecycleCallback = (LifecycleCallback)theEObject;
>-				Object result = caseLifecycleCallback(lifecycleCallback);
>+				T result = caseLifecycleCallback(lifecycleCallback);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.LISTENER: {
> 				Listener listener = (Listener)theEObject;
>-				Object result = caseListener(listener);
>+				T result = caseListener(listener);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.MESSAGE_DESTINATION: {
> 				MessageDestination messageDestination = (MessageDestination)theEObject;
>-				Object result = caseMessageDestination(messageDestination);
>+				T result = caseMessageDestination(messageDestination);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.MESSAGE_DESTINATION_REF: {
> 				MessageDestinationRef messageDestinationRef = (MessageDestinationRef)theEObject;
>-				Object result = caseMessageDestinationRef(messageDestinationRef);
>+				T result = caseMessageDestinationRef(messageDestinationRef);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.PARAM_VALUE: {
> 				ParamValue paramValue = (ParamValue)theEObject;
>-				Object result = caseParamValue(paramValue);
>+				T result = caseParamValue(paramValue);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.PERSISTENCE_CONTEXT_REF: {
> 				PersistenceContextRef persistenceContextRef = (PersistenceContextRef)theEObject;
>-				Object result = casePersistenceContextRef(persistenceContextRef);
>+				T result = casePersistenceContextRef(persistenceContextRef);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.PERSISTENCE_UNIT_REF: {
> 				PersistenceUnitRef persistenceUnitRef = (PersistenceUnitRef)theEObject;
>-				Object result = casePersistenceUnitRef(persistenceUnitRef);
>+				T result = casePersistenceUnitRef(persistenceUnitRef);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.PORT_COMPONENT_REF: {
> 				PortComponentRef portComponentRef = (PortComponentRef)theEObject;
>-				Object result = casePortComponentRef(portComponentRef);
>+				T result = casePortComponentRef(portComponentRef);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.PROPERTY_TYPE: {
> 				PropertyType propertyType = (PropertyType)theEObject;
>-				Object result = casePropertyType(propertyType);
>+				T result = casePropertyType(propertyType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.RESOURCE_ENV_REF: {
> 				ResourceEnvRef resourceEnvRef = (ResourceEnvRef)theEObject;
>-				Object result = caseResourceEnvRef(resourceEnvRef);
>+				T result = caseResourceEnvRef(resourceEnvRef);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.RESOURCE_REF: {
> 				ResourceRef resourceRef = (ResourceRef)theEObject;
>-				Object result = caseResourceRef(resourceRef);
>+				T result = caseResourceRef(resourceRef);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case JavaeePackage.RESPECT_BINDING_TYPE: {
>+				RespectBindingType respectBindingType = (RespectBindingType)theEObject;
>+				T result = caseRespectBindingType(respectBindingType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.RUN_AS: {
> 				RunAs runAs = (RunAs)theEObject;
>-				Object result = caseRunAs(runAs);
>+				T result = caseRunAs(runAs);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.SECURITY_ROLE: {
> 				SecurityRole securityRole = (SecurityRole)theEObject;
>-				Object result = caseSecurityRole(securityRole);
>+				T result = caseSecurityRole(securityRole);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.SECURITY_ROLE_REF: {
> 				SecurityRoleRef securityRoleRef = (SecurityRoleRef)theEObject;
>-				Object result = caseSecurityRoleRef(securityRoleRef);
>+				T result = caseSecurityRoleRef(securityRoleRef);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.SERVICE_REF: {
> 				ServiceRef serviceRef = (ServiceRef)theEObject;
>-				Object result = caseServiceRef(serviceRef);
>+				T result = caseServiceRef(serviceRef);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.SERVICE_REF_HANDLER: {
> 				ServiceRefHandler serviceRefHandler = (ServiceRefHandler)theEObject;
>-				Object result = caseServiceRefHandler(serviceRefHandler);
>+				T 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);
>+				T 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);
>+				T result = caseServiceRefHandlerChains(serviceRefHandlerChains);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JavaeePackage.URL_PATTERN_TYPE: {
> 				UrlPatternType urlPatternType = (UrlPatternType)theEObject;
>-				Object result = caseUrlPatternType(urlPatternType);
>+				T result = caseUrlPatternType(urlPatternType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
>@@ -260,422 +278,467 @@
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Description'.
>+	 * Returns the result of interpreting the object as an instance of 'Addressing Type'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Addressing Type'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseAddressingType(AddressingType object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Data Source Type'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Data Source Type'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseDataSourceType(DataSourceType object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Description'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Description'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseDescription(Description object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Display Name'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Description'.
>+	 * @return the result of interpreting the object as an instance of 'Display Name'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseDescription(Description object) {
>+	public T caseDisplayName(DisplayName object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Display Name'.
>+	 * Returns the result of interpreting the object as an instance of 'Ejb Local Ref'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Display Name'.
>+	 * @return the result of interpreting the object as an instance of 'Ejb Local Ref'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseDisplayName(DisplayName object) {
>+	public T caseEjbLocalRef(EjbLocalRef object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Ejb Local Ref'.
>+	 * Returns the result of interpreting the object as an instance of 'Ejb Ref'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Ejb Local Ref'.
>+	 * @return the result of interpreting the object as an instance of 'Ejb Ref'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseEjbLocalRef(EjbLocalRef object) {
>+	public T caseEjbRef(EjbRef object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Ejb Ref'.
>+	 * Returns the result of interpreting the object as an instance of 'Empty Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Ejb Ref'.
>+	 * @return the result of interpreting the object as an instance of 'Empty Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseEjbRef(EjbRef object) {
>+	public T caseEmptyType(EmptyType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Empty Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Env Entry'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Empty Type'.
>+	 * @return the result of interpreting the object as an instance of 'Env Entry'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseEmptyType(EmptyType object) {
>+	public T caseEnvEntry(EnvEntry object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Env Entry'.
>+	 * Returns the result of interpreting the object as an instance of 'Icon'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Env Entry'.
>+	 * @return the result of interpreting the object as an instance of 'Icon'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseEnvEntry(EnvEntry object) {
>+	public T caseIcon(Icon object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Icon'.
>+	 * Returns the result of interpreting the object as an instance of 'Injection Target'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Icon'.
>+	 * @return the result of interpreting the object as an instance of 'Injection Target'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseIcon(Icon object) {
>+	public T caseInjectionTarget(InjectionTarget object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Injection Target'.
>+	 * Returns the result of interpreting the object as an instance of 'Lifecycle Callback'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Injection Target'.
>+	 * @return the result of interpreting the object as an instance of 'Lifecycle Callback'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseInjectionTarget(InjectionTarget object) {
>+	public T caseLifecycleCallback(LifecycleCallback object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Lifecycle Callback'.
>+	 * Returns the result of interpreting the object as an instance of 'Listener'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Lifecycle Callback'.
>+	 * @return the result of interpreting the object as an instance of 'Listener'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseLifecycleCallback(LifecycleCallback object) {
>+	public T caseListener(Listener object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Listener'.
>+	 * Returns the result of interpreting the object as an instance of 'Message Destination'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Listener'.
>+	 * @return the result of interpreting the object as an instance of 'Message Destination'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseListener(Listener object) {
>+	public T caseMessageDestination(MessageDestination object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Message Destination'.
>+	 * Returns the result of interpreting the object as an instance of 'Message Destination Ref'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Message Destination'.
>+	 * @return the result of interpreting the object as an instance of 'Message Destination Ref'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseMessageDestination(MessageDestination object) {
>+	public T caseMessageDestinationRef(MessageDestinationRef object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Message Destination Ref'.
>+	 * Returns the result of interpreting the object as an instance of 'Param Value'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Message Destination Ref'.
>+	 * @return the result of interpreting the object as an instance of 'Param Value'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseMessageDestinationRef(MessageDestinationRef object) {
>+	public T caseParamValue(ParamValue object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Param Value'.
>+	 * Returns the result of interpreting the object as an instance of 'Persistence Context Ref'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Param Value'.
>+	 * @return the result of interpreting the object as an instance of 'Persistence Context Ref'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseParamValue(ParamValue object) {
>+	public T casePersistenceContextRef(PersistenceContextRef object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Persistence Context Ref'.
>+	 * Returns the result of interpreting the object as an instance of 'Persistence Unit Ref'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Persistence Context Ref'.
>+	 * @return the result of interpreting the object as an instance of 'Persistence Unit Ref'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object casePersistenceContextRef(PersistenceContextRef object) {
>+	public T casePersistenceUnitRef(PersistenceUnitRef object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Persistence Unit Ref'.
>+	 * Returns the result of interpreting the object as an instance of 'Port Component Ref'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Persistence Unit Ref'.
>+	 * @return the result of interpreting the object as an instance of 'Port Component Ref'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object casePersistenceUnitRef(PersistenceUnitRef object) {
>+	public T casePortComponentRef(PortComponentRef object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Port Component Ref'.
>+	 * Returns the result of interpreting the object as an instance of 'Property Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Port Component Ref'.
>+	 * @return the result of interpreting the object as an instance of 'Property Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object casePortComponentRef(PortComponentRef object) {
>+	public T casePropertyType(PropertyType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Property Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Resource Env Ref'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Property Type'.
>+	 * @return the result of interpreting the object as an instance of 'Resource Env Ref'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object casePropertyType(PropertyType object) {
>+	public T caseResourceEnvRef(ResourceEnvRef object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Resource Env Ref'.
>+	 * Returns the result of interpreting the object as an instance of 'Resource Ref'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Resource Env Ref'.
>+	 * @return the result of interpreting the object as an instance of 'Resource Ref'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseResourceEnvRef(ResourceEnvRef object) {
>+	public T caseResourceRef(ResourceRef object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Resource Ref'.
>+	 * Returns the result of interpreting the object as an instance of 'Respect Binding Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Resource Ref'.
>+	 * @return the result of interpreting the object as an instance of 'Respect Binding Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseResourceRef(ResourceRef object) {
>+	public T caseRespectBindingType(RespectBindingType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Run As'.
>+	 * Returns the result of interpreting the object as an instance of 'Run As'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Run As'.
>+	 * @return the result of interpreting the object as an instance of 'Run As'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseRunAs(RunAs object) {
>+	public T caseRunAs(RunAs object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Security Role'.
>+	 * Returns the result of interpreting the object as an instance of 'Security Role'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Security Role'.
>+	 * @return the result of interpreting the object as an instance of 'Security Role'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseSecurityRole(SecurityRole object) {
>+	public T caseSecurityRole(SecurityRole object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Security Role Ref'.
>+	 * Returns the result of interpreting the object as an instance of 'Security Role Ref'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Security Role Ref'.
>+	 * @return the result of interpreting the object as an instance of 'Security Role Ref'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseSecurityRoleRef(SecurityRoleRef object) {
>+	public T caseSecurityRoleRef(SecurityRoleRef object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Service Ref'.
>+	 * Returns the result of interpreting the object as an instance of 'Service Ref'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Service Ref'.
>+	 * @return the result of interpreting the object as an instance of 'Service Ref'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseServiceRef(ServiceRef object) {
>+	public T caseServiceRef(ServiceRef object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Service Ref Handler'.
>+	 * Returns the result of interpreting the object as an instance of 'Service Ref Handler'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Service Ref Handler'.
>+	 * @return the result of interpreting the object as an instance of 'Service Ref Handler'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseServiceRefHandler(ServiceRefHandler object) {
>+	public T caseServiceRefHandler(ServiceRefHandler object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Service Ref Handler Chain'.
>+	 * Returns the result of interpreting the object as an instance of 'Service Ref Handler Chain'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Service Ref Handler Chain'.
>+	 * @return the result of interpreting the object as an instance of 'Service Ref Handler Chain'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseServiceRefHandlerChain(ServiceRefHandlerChain object) {
>+	public T caseServiceRefHandlerChain(ServiceRefHandlerChain object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Service Ref Handler Chains'.
>+	 * Returns the result of interpreting the object as an instance of 'Service Ref Handler Chains'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Service Ref Handler Chains'.
>+	 * @return the result of interpreting the object as an instance of 'Service Ref Handler Chains'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseServiceRefHandlerChains(ServiceRefHandlerChains object) {
>+	public T caseServiceRefHandlerChains(ServiceRefHandlerChains object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Url Pattern Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Url Pattern Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Url Pattern Type'.
>+	 * @return the result of interpreting the object as an instance of 'Url Pattern Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseUrlPatternType(UrlPatternType object) {
>+	public T caseUrlPatternType(UrlPatternType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'EObject'.
>+	 * Returns the result of interpreting the object as an instance of 'EObject'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'EObject'.
>+	 * @return the result of interpreting the object as an instance of 'EObject'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> 	 * @generated
> 	 */
>-	public Object defaultCase(EObject object) {
>+	public T defaultCase(EObject object) {
> 		return null;
> 	}
> 
>Index: jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeValidator.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeValidator.java,v
>retrieving revision 1.4
>diff -u -r1.4 JavaeeValidator.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeValidator.java	9 Jun 2009 22:38:41 -0000	1.4
>+++ jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeValidator.java	14 Oct 2009 21:44:48 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.emf.common.util.Diagnostic;
> import org.eclipse.emf.common.util.DiagnosticChain;
> 
>+import org.eclipse.emf.common.util.ResourceLocator;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.EPackage;
> 
>@@ -105,14 +106,18 @@
> 	}
> 
> 	/**
>-	 * Calls <code>validateXXX</code> for the corresonding classifier of the model.
>+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
> 	@Override
>-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map context) {
>+	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		switch (classifierID) {
>+			case JavaeePackage.ADDRESSING_TYPE:
>+				return validateAddressingType((AddressingType)value, diagnostics, context);
>+			case JavaeePackage.DATA_SOURCE_TYPE:
>+				return validateDataSourceType((DataSourceType)value, diagnostics, context);
> 			case JavaeePackage.DESCRIPTION:
> 				return validateDescription((Description)value, diagnostics, context);
> 			case JavaeePackage.DISPLAY_NAME:
>@@ -151,6 +156,8 @@
> 				return validateResourceEnvRef((ResourceEnvRef)value, diagnostics, context);
> 			case JavaeePackage.RESOURCE_REF:
> 				return validateResourceRef((ResourceRef)value, diagnostics, context);
>+			case JavaeePackage.RESPECT_BINDING_TYPE:
>+				return validateRespectBindingType((RespectBindingType)value, diagnostics, context);
> 			case JavaeePackage.RUN_AS:
> 				return validateRunAs((RunAs)value, diagnostics, context);
> 			case JavaeePackage.SECURITY_ROLE:
>@@ -167,10 +174,14 @@
> 				return validateServiceRefHandlerChains((ServiceRefHandlerChains)value, diagnostics, context);
> 			case JavaeePackage.URL_PATTERN_TYPE:
> 				return validateUrlPatternType((UrlPatternType)value, diagnostics, context);
>+			case JavaeePackage.ADDRESSING_RESPONSES_TYPE:
>+				return validateAddressingResponsesType((AddressingResponsesType)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.GENERIC_BOOLEAN_TYPE:
>+				return validateGenericBooleanType((GenericBooleanType)value, diagnostics, context);
>+			case JavaeePackage.ISOLATION_LEVEL_TYPE:
>+				return validateIsolationLevelType((IsolationLevelType)value, diagnostics, context);
> 			case JavaeePackage.MESSAGE_DESTINATION_USAGE_TYPE:
> 				return validateMessageDestinationUsageType((MessageDestinationUsageType)value, diagnostics, context);
> 			case JavaeePackage.PERSISTENCE_CONTEXT_TYPE:
>@@ -179,6 +190,8 @@
> 				return validateResAuthType((ResAuthType)value, diagnostics, context);
> 			case JavaeePackage.RES_SHARING_SCOPE_TYPE:
> 				return validateResSharingScopeType((ResSharingScopeType)value, diagnostics, context);
>+			case JavaeePackage.ADDRESSING_RESPONSES_TYPE_OBJECT:
>+				return validateAddressingResponsesTypeObject((AddressingResponsesType)value, diagnostics, context);
> 			case JavaeePackage.DEWEY_VERSION_TYPE:
> 				return validateDeweyVersionType((String)value, diagnostics, context);
> 			case JavaeePackage.EJB_LINK:
>@@ -187,16 +200,22 @@
> 				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.ENV_ENTRY_TYPE:
>+				return validateEnvEntryType((String)value, diagnostics, context);
> 			case JavaeePackage.FULLY_QUALIFIED_CLASS_TYPE:
> 				return validateFullyQualifiedClassType((String)value, diagnostics, context);
>+			case JavaeePackage.GENERIC_BOOLEAN_TYPE_OBJECT:
>+				return validateGenericBooleanTypeObject((GenericBooleanType)value, diagnostics, context);
> 			case JavaeePackage.HOME:
> 				return validateHome((String)value, diagnostics, context);
>+			case JavaeePackage.ISOLATION_LEVEL_TYPE_OBJECT:
>+				return validateIsolationLevelTypeObject((IsolationLevelType)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.JDBC_URL_TYPE:
>+				return validateJdbcUrlType((String)value, diagnostics, context);
> 			case JavaeePackage.JNDI_NAME:
> 				return validateJNDIName((String)value, diagnostics, context);
> 			case JavaeePackage.LOCAL:
>@@ -213,6 +232,14 @@
> 				return validatePathType((String)value, diagnostics, context);
> 			case JavaeePackage.PERSISTENCE_CONTEXT_TYPE_OBJECT:
> 				return validatePersistenceContextTypeObject((PersistenceContextType)value, diagnostics, context);
>+			case JavaeePackage.PROTOCOL_BINDING_LIST_TYPE:
>+				return validateProtocolBindingListType((List<?>)value, diagnostics, context);
>+			case JavaeePackage.PROTOCOL_BINDING_TYPE:
>+				return validateProtocolBindingType((String)value, diagnostics, context);
>+			case JavaeePackage.PROTOCOL_URI_ALIAS_TYPE:
>+				return validateProtocolURIAliasType((String)value, diagnostics, context);
>+			case JavaeePackage.QNAME_PATTERN:
>+				return validateQnamePattern((String)value, diagnostics, context);
> 			case JavaeePackage.REMOTE:
> 				return validateRemote((String)value, diagnostics, context);
> 			case JavaeePackage.RES_AUTH_TYPE_OBJECT:
>@@ -221,19 +248,11 @@
> 				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);
>+				return validateTrueFalseType((Boolean)value, diagnostics, context);
> 			case JavaeePackage.TRUE_FALSE_TYPE_OBJECT:
> 				return validateTrueFalseTypeObject((Boolean)value, diagnostics, context);
>-			default: 
>+			default:
> 				return true;
> 		}
> 	}
>@@ -243,7 +262,25 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateDescription(Description description, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateAddressingType(AddressingType addressingType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)addressingType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateDataSourceType(DataSourceType dataSourceType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)dataSourceType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateDescription(Description description, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)description, diagnostics, context);
> 	}
> 
>@@ -252,7 +289,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateDisplayName(DisplayName displayName, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateDisplayName(DisplayName displayName, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)displayName, diagnostics, context);
> 	}
> 
>@@ -261,7 +298,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEjbLocalRef(EjbLocalRef ejbLocalRef, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateEjbLocalRef(EjbLocalRef ejbLocalRef, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)ejbLocalRef, diagnostics, context);
> 	}
> 
>@@ -270,7 +307,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEjbRef(EjbRef ejbRef, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateEjbRef(EjbRef ejbRef, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)ejbRef, diagnostics, context);
> 	}
> 
>@@ -279,7 +316,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEmptyType(EmptyType emptyType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateEmptyType(EmptyType emptyType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)emptyType, diagnostics, context);
> 	}
> 
>@@ -288,7 +325,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEnvEntry(EnvEntry envEntry, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateEnvEntry(EnvEntry envEntry, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)envEntry, diagnostics, context);
> 	}
> 
>@@ -297,7 +334,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateIcon(Icon icon, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateIcon(Icon icon, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)icon, diagnostics, context);
> 	}
> 
>@@ -306,7 +343,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateInjectionTarget(InjectionTarget injectionTarget, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateInjectionTarget(InjectionTarget injectionTarget, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)injectionTarget, diagnostics, context);
> 	}
> 
>@@ -315,7 +352,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateLifecycleCallback(LifecycleCallback lifecycleCallback, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateLifecycleCallback(LifecycleCallback lifecycleCallback, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)lifecycleCallback, diagnostics, context);
> 	}
> 
>@@ -324,7 +361,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateListener(Listener listener, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateListener(Listener listener, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)listener, diagnostics, context);
> 	}
> 
>@@ -333,7 +370,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateMessageDestination(MessageDestination messageDestination, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateMessageDestination(MessageDestination messageDestination, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)messageDestination, diagnostics, context);
> 	}
> 
>@@ -342,7 +379,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateMessageDestinationRef(MessageDestinationRef messageDestinationRef, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateMessageDestinationRef(MessageDestinationRef messageDestinationRef, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)messageDestinationRef, diagnostics, context);
> 	}
> 
>@@ -351,7 +388,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateParamValue(ParamValue paramValue, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateParamValue(ParamValue paramValue, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)paramValue, diagnostics, context);
> 	}
> 
>@@ -360,7 +397,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validatePersistenceContextRef(PersistenceContextRef persistenceContextRef, DiagnosticChain diagnostics, Map context) {
>+	public boolean validatePersistenceContextRef(PersistenceContextRef persistenceContextRef, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)persistenceContextRef, diagnostics, context);
> 	}
> 
>@@ -369,7 +406,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validatePersistenceUnitRef(PersistenceUnitRef persistenceUnitRef, DiagnosticChain diagnostics, Map context) {
>+	public boolean validatePersistenceUnitRef(PersistenceUnitRef persistenceUnitRef, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)persistenceUnitRef, diagnostics, context);
> 	}
> 
>@@ -378,7 +415,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validatePortComponentRef(PortComponentRef portComponentRef, DiagnosticChain diagnostics, Map context) {
>+	public boolean validatePortComponentRef(PortComponentRef portComponentRef, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)portComponentRef, diagnostics, context);
> 	}
> 
>@@ -387,7 +424,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validatePropertyType(PropertyType propertyType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validatePropertyType(PropertyType propertyType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)propertyType, diagnostics, context);
> 	}
> 
>@@ -396,7 +433,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateResourceEnvRef(ResourceEnvRef resourceEnvRef, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateResourceEnvRef(ResourceEnvRef resourceEnvRef, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)resourceEnvRef, diagnostics, context);
> 	}
> 
>@@ -405,7 +442,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateResourceRef(ResourceRef resourceRef, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateResourceRef(ResourceRef resourceRef, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)resourceRef, diagnostics, context);
> 	}
> 
>@@ -414,7 +451,16 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateRunAs(RunAs runAs, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateRespectBindingType(RespectBindingType respectBindingType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validate_EveryDefaultConstraint((EObject)respectBindingType, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateRunAs(RunAs runAs, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)runAs, diagnostics, context);
> 	}
> 
>@@ -423,7 +469,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateSecurityRole(SecurityRole securityRole, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateSecurityRole(SecurityRole securityRole, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)securityRole, diagnostics, context);
> 	}
> 
>@@ -432,7 +478,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateSecurityRoleRef(SecurityRoleRef securityRoleRef, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateSecurityRoleRef(SecurityRoleRef securityRoleRef, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)securityRoleRef, diagnostics, context);
> 	}
> 
>@@ -441,7 +487,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServiceRef(ServiceRef serviceRef, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateServiceRef(ServiceRef serviceRef, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)serviceRef, diagnostics, context);
> 	}
> 
>@@ -450,7 +496,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServiceRefHandler(ServiceRefHandler serviceRefHandler, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateServiceRefHandler(ServiceRefHandler serviceRefHandler, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)serviceRefHandler, diagnostics, context);
> 	}
> 
>@@ -459,7 +505,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServiceRefHandlerChain(ServiceRefHandlerChain serviceRefHandlerChain, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateServiceRefHandlerChain(ServiceRefHandlerChain serviceRefHandlerChain, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)serviceRefHandlerChain, diagnostics, context);
> 	}
> 
>@@ -468,7 +514,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServiceRefHandlerChains(ServiceRefHandlerChains serviceRefHandlerChains, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateServiceRefHandlerChains(ServiceRefHandlerChains serviceRefHandlerChains, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)serviceRefHandlerChains, diagnostics, context);
> 	}
> 
>@@ -477,7 +523,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateUrlPatternType(UrlPatternType urlPatternType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateUrlPatternType(UrlPatternType urlPatternType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validate_EveryDefaultConstraint((EObject)urlPatternType, diagnostics, context);
> 	}
> 
>@@ -486,7 +532,34 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEjbRefType(EjbRefType ejbRefType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateAddressingResponsesType(AddressingResponsesType addressingResponsesType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateEjbRefType(EjbRefType ejbRefType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateGenericBooleanType(GenericBooleanType genericBooleanType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateIsolationLevelType(IsolationLevelType isolationLevelType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -495,7 +568,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEnvEntryType(EnvEntryType envEntryType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateMessageDestinationUsageType(MessageDestinationUsageType messageDestinationUsageType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -504,7 +577,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateMessageDestinationUsageType(MessageDestinationUsageType messageDestinationUsageType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validatePersistenceContextType(PersistenceContextType persistenceContextType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -513,7 +586,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validatePersistenceContextType(PersistenceContextType persistenceContextType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateResAuthType(ResAuthType resAuthType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -522,7 +595,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateResAuthType(ResAuthType resAuthType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateResSharingScopeType(ResSharingScopeType resSharingScopeType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -531,7 +604,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateResSharingScopeType(ResSharingScopeType resSharingScopeType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateAddressingResponsesTypeObject(AddressingResponsesType addressingResponsesTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -540,7 +613,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateDeweyVersionType(String deweyVersionType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateDeweyVersionType(String deweyVersionType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateDeweyVersionType_Pattern(deweyVersionType, diagnostics, context);
> 		return result;
> 	}
>@@ -564,7 +637,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateDeweyVersionType_Pattern(String deweyVersionType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateDeweyVersionType_Pattern(String deweyVersionType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validatePattern(JavaeePackage.Literals.DEWEY_VERSION_TYPE, deweyVersionType, DEWEY_VERSION_TYPE__PATTERN__VALUES, diagnostics, context);
> 	}
> 
>@@ -573,7 +646,25 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEJBLink(String ejbLink, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateEJBLink(String ejbLink, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateEjbRefNameType(String ejbRefNameType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateEjbRefTypeObject(EjbRefType ejbRefTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -582,7 +673,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEjbRefNameType(String ejbRefNameType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateEnvEntryType(String envEntryType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -591,7 +682,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEjbRefTypeObject(EjbRefType ejbRefTypeObject, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateFullyQualifiedClassType(String fullyQualifiedClassType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -600,7 +691,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEnvEntryTypeObject(EnvEntryType envEntryTypeObject, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateGenericBooleanTypeObject(GenericBooleanType genericBooleanTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -609,7 +700,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateFullyQualifiedClassType(String fullyQualifiedClassType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateHome(String home, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -618,7 +709,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateHome(String home, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateIsolationLevelTypeObject(IsolationLevelType isolationLevelTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -627,7 +718,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateJavaIdentifier(String javaIdentifier, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateJavaIdentifier(String javaIdentifier, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateJavaIdentifier_Pattern(javaIdentifier, diagnostics, context);
> 		return result;
> 	}
>@@ -651,7 +742,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateJavaIdentifier_Pattern(String javaIdentifier, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateJavaIdentifier_Pattern(String javaIdentifier, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validatePattern(JavaeePackage.Literals.JAVA_IDENTIFIER, javaIdentifier, JAVA_IDENTIFIER__PATTERN__VALUES, diagnostics, context);
> 	}
> 
>@@ -660,7 +751,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateJavaType(String javaType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateJavaType(String javaType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateJavaType_Pattern(javaType, diagnostics, context);
> 		return result;
> 	}
>@@ -684,7 +775,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateJavaType_Pattern(String javaType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateJavaType_Pattern(String javaType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return validatePattern(JavaeePackage.Literals.JAVA_TYPE, javaType, JAVA_TYPE__PATTERN__VALUES, diagnostics, context);
> 	}
> 
>@@ -693,35 +784,32 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateJNDIName(String jndiName, DiagnosticChain diagnostics, Map context) {
>-		return true;
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public boolean validateLocal(String local, DiagnosticChain diagnostics, Map context) {
>-		return true;
>+	public boolean validateJdbcUrlType(String jdbcUrlType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		boolean result = validateJdbcUrlType_Pattern(jdbcUrlType, diagnostics, context);
>+		return result;
> 	}
> 
> 	/**
> 	 * 
> 	 * 
> 	 * @generated
>+	 * @see #validateJdbcUrlType_Pattern
> 	 */
>-	public boolean validateLocalHome(String localHome, DiagnosticChain diagnostics, Map context) {
>-		return true;
>-	}
>+	public static final PatternMatcher [][] JDBC_URL_TYPE__PATTERN__VALUES =
>+		new PatternMatcher [][] {
>+			new PatternMatcher [] {
>+				XMLTypeUtil.createPatternMatcher("jdbc:(.*):(.*)") //$NON-NLS-1$
>+			}
>+		};
> 
> 	/**
>+	 * Validates the Pattern constraint of 'Jdbc Url Type'.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateMessageDestinationLink(String messageDestinationLink, DiagnosticChain diagnostics, Map context) {
>-		return true;
>+	public boolean validateJdbcUrlType_Pattern(String jdbcUrlType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validatePattern(JavaeePackage.Literals.JDBC_URL_TYPE, jdbcUrlType, JDBC_URL_TYPE__PATTERN__VALUES, diagnostics, context);
> 	}
> 
> 	/**
>@@ -729,7 +817,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateMessageDestinationTypeType(String messageDestinationTypeType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateJNDIName(String jndiName, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -738,7 +826,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateMessageDestinationUsageTypeObject(MessageDestinationUsageType messageDestinationUsageTypeObject, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateLocal(String local, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -747,7 +835,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validatePathType(String pathType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateLocalHome(String localHome, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -756,7 +844,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validatePersistenceContextTypeObject(PersistenceContextType persistenceContextTypeObject, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateMessageDestinationLink(String messageDestinationLink, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -765,7 +853,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateRemote(String remote, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateMessageDestinationTypeType(String messageDestinationTypeType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -774,7 +862,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateResAuthTypeObject(ResAuthType resAuthTypeObject, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateMessageDestinationUsageTypeObject(MessageDestinationUsageType messageDestinationUsageTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -783,7 +871,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateResSharingScopeTypeObject(ResSharingScopeType resSharingScopeTypeObject, DiagnosticChain diagnostics, Map context) {
>+	public boolean validatePathType(String pathType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -792,7 +880,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateRoleName(String roleName, DiagnosticChain diagnostics, Map context) {
>+	public boolean validatePersistenceContextTypeObject(PersistenceContextType persistenceContextTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		return true;
> 	}
> 
>@@ -801,27 +889,27 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServiceRefProtocolBindingListType(List serviceRefProtocolBindingListType, DiagnosticChain diagnostics, Map context) {
>-		boolean result = validateServiceRefProtocolBindingListType_ItemType(serviceRefProtocolBindingListType, diagnostics, context);
>+	public boolean validateProtocolBindingListType(List<?> protocolBindingListType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		boolean result = validateProtocolBindingListType_ItemType(protocolBindingListType, diagnostics, context);
> 		return result;
> 	}
> 
> 	/**
>-	 * Validates the ItemType constraint of 'Service Ref Protocol Binding List Type'.
>+	 * Validates the ItemType constraint of 'Protocol Binding List Type'.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServiceRefProtocolBindingListType_ItemType(List serviceRefProtocolBindingListType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateProtocolBindingListType_ItemType(List<?> protocolBindingListType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = true;
>-		for (Iterator i = serviceRefProtocolBindingListType.iterator(); i.hasNext() && (result || diagnostics != null); ) {
>+		for (Iterator<?> i = protocolBindingListType.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);
>+			if (JavaeePackage.Literals.PROTOCOL_BINDING_TYPE.isInstance(item)) {
>+				result &= validateProtocolBindingType((String)item, diagnostics, context);
> 			}
> 			else {
> 				result = false;
>-				reportDataValueTypeViolation(JavaeePackage.Literals.SERVICE_REF_PROTOCOL_BINDING_TYPE, item, diagnostics, context);
>+				reportDataValueTypeViolation(JavaeePackage.Literals.PROTOCOL_BINDING_TYPE, item, diagnostics, context);
> 			}
> 		}
> 		return result;
>@@ -832,37 +920,36 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServiceRefProtocolBindingType(String serviceRefProtocolBindingType, DiagnosticChain diagnostics, Map context) {
>-		boolean result = validateServiceRefProtocolBindingType_MemberTypes(serviceRefProtocolBindingType, diagnostics, context);
>+	public boolean validateProtocolBindingType(String protocolBindingType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		boolean result = validateProtocolBindingType_MemberTypes(protocolBindingType, diagnostics, context);
> 		return result;
> 	}
> 
> 	/**
>-	 * Validates the MemberTypes constraint of 'Service Ref Protocol Binding Type'.
>+	 * Validates the MemberTypes constraint of 'Protocol Binding Type'.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServiceRefProtocolBindingType_MemberTypes(String serviceRefProtocolBindingType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateProtocolBindingType_MemberTypes(String protocolBindingType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		if (diagnostics != null) {
> 			BasicDiagnostic tempDiagnostics = new BasicDiagnostic();
>-			if (XMLTypePackage.Literals.ANY_URI.isInstance(serviceRefProtocolBindingType)) {
>-				if (xmlTypeValidator.validateAnyURI(serviceRefProtocolBindingType, tempDiagnostics, context)) return true;
>+			if (XMLTypePackage.Literals.ANY_URI.isInstance(protocolBindingType)) {
>+				if (xmlTypeValidator.validateAnyURI(protocolBindingType, tempDiagnostics, context)) return true;
> 			}
>-			if (JavaeePackage.Literals.SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE.isInstance(serviceRefProtocolBindingType)) {
>-				if (validateServiceRefProtocolURIAliasType(serviceRefProtocolBindingType, tempDiagnostics, context)) return true;
>+			if (JavaeePackage.Literals.PROTOCOL_URI_ALIAS_TYPE.isInstance(protocolBindingType)) {
>+				if (validateProtocolURIAliasType(protocolBindingType, tempDiagnostics, context)) return true;
> 			}
>-			List children = tempDiagnostics.getChildren();
>-			for (int i = 0; i < children.size(); i++) {
>-				diagnostics.add((Diagnostic)children.get(i));
>+			for (Diagnostic diagnostic : tempDiagnostics.getChildren()) {
>+				diagnostics.add(diagnostic);
> 			}
> 		}
> 		else {
>-			if (XMLTypePackage.Literals.ANY_URI.isInstance(serviceRefProtocolBindingType)) {
>-				if (xmlTypeValidator.validateAnyURI(serviceRefProtocolBindingType, null, context)) return true;
>+			if (XMLTypePackage.Literals.ANY_URI.isInstance(protocolBindingType)) {
>+				if (xmlTypeValidator.validateAnyURI(protocolBindingType, null, context)) return true;
> 			}
>-			if (JavaeePackage.Literals.SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE.isInstance(serviceRefProtocolBindingType)) {
>-				if (validateServiceRefProtocolURIAliasType(serviceRefProtocolBindingType, null, context)) return true;
>+			if (JavaeePackage.Literals.PROTOCOL_URI_ALIAS_TYPE.isInstance(protocolBindingType)) {
>+				if (validateProtocolURIAliasType(protocolBindingType, null, context)) return true;
> 			}
> 		}
> 		return false;
>@@ -873,8 +960,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServiceRefProtocolURIAliasType(String serviceRefProtocolURIAliasType, DiagnosticChain diagnostics, Map context) {
>-		boolean result = validateServiceRefProtocolURIAliasType_Pattern(serviceRefProtocolURIAliasType, diagnostics, context);
>+	public boolean validateProtocolURIAliasType(String protocolURIAliasType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		boolean result = validateProtocolURIAliasType_Pattern(protocolURIAliasType, diagnostics, context);
> 		return result;
> 	}
> 
>@@ -882,9 +969,9 @@
> 	 * 
> 	 * 
> 	 * @generated
>-	 * @see #validateServiceRefProtocolURIAliasType_Pattern
>+	 * @see #validateProtocolURIAliasType_Pattern
> 	 */
>-	public static final PatternMatcher [][] SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE__PATTERN__VALUES =
>+	public static final PatternMatcher [][] PROTOCOL_URI_ALIAS_TYPE__PATTERN__VALUES =
> 		new PatternMatcher [][] {
> 			new PatternMatcher [] {
> 				XMLTypeUtil.createPatternMatcher("##.+") //$NON-NLS-1$
>@@ -892,13 +979,13 @@
> 		};
> 
> 	/**
>-	 * Validates the Pattern constraint of 'Service Ref Protocol URI Alias Type'.
>+	 * Validates the Pattern constraint of 'Protocol URI Alias Type'.
> 	 * 
> 	 * 
> 	 * @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);
>+	public boolean validateProtocolURIAliasType_Pattern(String protocolURIAliasType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validatePattern(JavaeePackage.Literals.PROTOCOL_URI_ALIAS_TYPE, protocolURIAliasType, PROTOCOL_URI_ALIAS_TYPE__PATTERN__VALUES, diagnostics, context);
> 	}
> 
> 	/**
>@@ -906,8 +993,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateServiceRefQnamePattern(String serviceRefQnamePattern, DiagnosticChain diagnostics, Map context) {
>-		boolean result = validateServiceRefQnamePattern_Pattern(serviceRefQnamePattern, diagnostics, context);
>+	public boolean validateQnamePattern(String qnamePattern, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		boolean result = validateQnamePattern_Pattern(qnamePattern, diagnostics, context);
> 		return result;
> 	}
> 
>@@ -915,9 +1002,9 @@
> 	 * 
> 	 * 
> 	 * @generated
>-	 * @see #validateServiceRefQnamePattern_Pattern
>+	 * @see #validateQnamePattern_Pattern
> 	 */
>-	public static final PatternMatcher [][] SERVICE_REF_QNAME_PATTERN__PATTERN__VALUES =
>+	public static final PatternMatcher [][] QNAME_PATTERN__PATTERN__VALUES =
> 		new PatternMatcher [][] {
> 			new PatternMatcher [] {
> 				XMLTypeUtil.createPatternMatcher("\\*|([\\i-[:]][\\c-[:]]*:)?[\\i-[:]][\\c-[:]]*\\*?") //$NON-NLS-1$
>@@ -925,13 +1012,49 @@
> 		};
> 
> 	/**
>-	 * Validates the Pattern constraint of 'Service Ref Qname Pattern'.
>+	 * Validates the Pattern constraint of 'Qname Pattern'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateQnamePattern_Pattern(String qnamePattern, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validatePattern(JavaeePackage.Literals.QNAME_PATTERN, qnamePattern, QNAME_PATTERN__PATTERN__VALUES, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateRemote(String remote, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateResAuthTypeObject(ResAuthType resAuthTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateResSharingScopeTypeObject(ResSharingScopeType resSharingScopeTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return true;
>+	}
>+
>+	/**
> 	 * 
> 	 * 
> 	 * @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);
>+	public boolean validateRoleName(String roleName, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return true;
> 	}
> 
> 	/**
>@@ -939,7 +1062,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateTrueFalseType(boolean trueFalseType, DiagnosticChain diagnostics, Map context) {
>+	public boolean validateTrueFalseType(boolean trueFalseType, DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validateTrueFalseType_Pattern(trueFalseType, diagnostics, context);
> 		return result;
> 	}
>@@ -963,8 +1086,8 @@
> 	 * 
> 	 * @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);
>+	public boolean validateTrueFalseType_Pattern(boolean trueFalseType, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return validatePattern(JavaeePackage.Literals.TRUE_FALSE_TYPE, trueFalseType, TRUE_FALSE_TYPE__PATTERN__VALUES, diagnostics, context);
> 	}
> 
> 	/**
>@@ -972,9 +1095,23 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateTrueFalseTypeObject(Boolean trueFalseTypeObject, DiagnosticChain diagnostics, Map context) {
>-		boolean result = validateTrueFalseType_Pattern(trueFalseTypeObject.booleanValue(), diagnostics, context);
>+	public boolean validateTrueFalseTypeObject(Boolean trueFalseTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		boolean result = validateTrueFalseType_Pattern(trueFalseTypeObject, diagnostics, context);
> 		return result;
> 	}
> 
>+	/**
>+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public ResourceLocator getResourceLocator() {
>+		// TODO
>+		// Specialize this to return a resource locator for messages specific to this validator.
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		return super.getResourceLocator();
>+	}
>+
> } //JavaeeValidator
>Index: jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeXMLProcessor.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeXMLProcessor.java,v
>retrieving revision 1.3
>diff -u -r1.3 JavaeeXMLProcessor.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeXMLProcessor.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeXMLProcessor.java	14 Oct 2009 21:44:48 -0000
>@@ -14,6 +14,7 @@
> 
> import org.eclipse.emf.ecore.EPackage;
> 
>+import org.eclipse.emf.ecore.resource.Resource;
> import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
> 
> import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
>@@ -43,7 +44,7 @@
> 	 * @generated
> 	 */
> 	@Override
>-	protected Map getRegistrations() {
>+	protected Map<String, Resource.Factory> getRegistrations() {
> 		if (registrations == null) {
> 			super.getRegistrations();
> 			registrations.put(XML_EXTENSION, new JavaeeResourceFactoryImpl());
>Index: jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeAdapterFactory.java,v
>retrieving revision 1.3
>diff -u -r1.3 JavaeeAdapterFactory.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeAdapterFactory.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/core/internal/util/JavaeeAdapterFactory.java	14 Oct 2009 21:44:48 -0000
>@@ -70,123 +70,135 @@
> 	}
> 
> 	/**
>-	 * The switch the delegates to the <code>createXXX</code> methods.
>+	 * The switch that delegates to the <code>createXXX</code> methods.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	protected JavaeeSwitch modelSwitch =
>-		new JavaeeSwitch() {
>+	protected JavaeeSwitch<Adapter> modelSwitch =
>+		new JavaeeSwitch<Adapter>() {
> 			@Override
>-			public Object caseDescription(Description object) {
>+			public Adapter caseAddressingType(AddressingType object) {
>+				return createAddressingTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseDataSourceType(DataSourceType object) {
>+				return createDataSourceTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseDescription(Description object) {
> 				return createDescriptionAdapter();
> 			}
> 			@Override
>-			public Object caseDisplayName(DisplayName object) {
>+			public Adapter caseDisplayName(DisplayName object) {
> 				return createDisplayNameAdapter();
> 			}
> 			@Override
>-			public Object caseEjbLocalRef(EjbLocalRef object) {
>+			public Adapter caseEjbLocalRef(EjbLocalRef object) {
> 				return createEjbLocalRefAdapter();
> 			}
> 			@Override
>-			public Object caseEjbRef(EjbRef object) {
>+			public Adapter caseEjbRef(EjbRef object) {
> 				return createEjbRefAdapter();
> 			}
> 			@Override
>-			public Object caseEmptyType(EmptyType object) {
>+			public Adapter caseEmptyType(EmptyType object) {
> 				return createEmptyTypeAdapter();
> 			}
> 			@Override
>-			public Object caseEnvEntry(EnvEntry object) {
>+			public Adapter caseEnvEntry(EnvEntry object) {
> 				return createEnvEntryAdapter();
> 			}
> 			@Override
>-			public Object caseIcon(Icon object) {
>+			public Adapter caseIcon(Icon object) {
> 				return createIconAdapter();
> 			}
> 			@Override
>-			public Object caseInjectionTarget(InjectionTarget object) {
>+			public Adapter caseInjectionTarget(InjectionTarget object) {
> 				return createInjectionTargetAdapter();
> 			}
> 			@Override
>-			public Object caseLifecycleCallback(LifecycleCallback object) {
>+			public Adapter caseLifecycleCallback(LifecycleCallback object) {
> 				return createLifecycleCallbackAdapter();
> 			}
> 			@Override
>-			public Object caseListener(Listener object) {
>+			public Adapter caseListener(Listener object) {
> 				return createListenerAdapter();
> 			}
> 			@Override
>-			public Object caseMessageDestination(MessageDestination object) {
>+			public Adapter caseMessageDestination(MessageDestination object) {
> 				return createMessageDestinationAdapter();
> 			}
> 			@Override
>-			public Object caseMessageDestinationRef(MessageDestinationRef object) {
>+			public Adapter caseMessageDestinationRef(MessageDestinationRef object) {
> 				return createMessageDestinationRefAdapter();
> 			}
> 			@Override
>-			public Object caseParamValue(ParamValue object) {
>+			public Adapter caseParamValue(ParamValue object) {
> 				return createParamValueAdapter();
> 			}
> 			@Override
>-			public Object casePersistenceContextRef(PersistenceContextRef object) {
>+			public Adapter casePersistenceContextRef(PersistenceContextRef object) {
> 				return createPersistenceContextRefAdapter();
> 			}
> 			@Override
>-			public Object casePersistenceUnitRef(PersistenceUnitRef object) {
>+			public Adapter casePersistenceUnitRef(PersistenceUnitRef object) {
> 				return createPersistenceUnitRefAdapter();
> 			}
> 			@Override
>-			public Object casePortComponentRef(PortComponentRef object) {
>+			public Adapter casePortComponentRef(PortComponentRef object) {
> 				return createPortComponentRefAdapter();
> 			}
> 			@Override
>-			public Object casePropertyType(PropertyType object) {
>+			public Adapter casePropertyType(PropertyType object) {
> 				return createPropertyTypeAdapter();
> 			}
> 			@Override
>-			public Object caseResourceEnvRef(ResourceEnvRef object) {
>+			public Adapter caseResourceEnvRef(ResourceEnvRef object) {
> 				return createResourceEnvRefAdapter();
> 			}
> 			@Override
>-			public Object caseResourceRef(ResourceRef object) {
>+			public Adapter caseResourceRef(ResourceRef object) {
> 				return createResourceRefAdapter();
> 			}
> 			@Override
>-			public Object caseRunAs(RunAs object) {
>+			public Adapter caseRespectBindingType(RespectBindingType object) {
>+				return createRespectBindingTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseRunAs(RunAs object) {
> 				return createRunAsAdapter();
> 			}
> 			@Override
>-			public Object caseSecurityRole(SecurityRole object) {
>+			public Adapter caseSecurityRole(SecurityRole object) {
> 				return createSecurityRoleAdapter();
> 			}
> 			@Override
>-			public Object caseSecurityRoleRef(SecurityRoleRef object) {
>+			public Adapter caseSecurityRoleRef(SecurityRoleRef object) {
> 				return createSecurityRoleRefAdapter();
> 			}
> 			@Override
>-			public Object caseServiceRef(ServiceRef object) {
>+			public Adapter caseServiceRef(ServiceRef object) {
> 				return createServiceRefAdapter();
> 			}
> 			@Override
>-			public Object caseServiceRefHandler(ServiceRefHandler object) {
>+			public Adapter caseServiceRefHandler(ServiceRefHandler object) {
> 				return createServiceRefHandlerAdapter();
> 			}
> 			@Override
>-			public Object caseServiceRefHandlerChain(ServiceRefHandlerChain object) {
>+			public Adapter caseServiceRefHandlerChain(ServiceRefHandlerChain object) {
> 				return createServiceRefHandlerChainAdapter();
> 			}
> 			@Override
>-			public Object caseServiceRefHandlerChains(ServiceRefHandlerChains object) {
>+			public Adapter caseServiceRefHandlerChains(ServiceRefHandlerChains object) {
> 				return createServiceRefHandlerChainsAdapter();
> 			}
> 			@Override
>-			public Object caseUrlPatternType(UrlPatternType object) {
>+			public Adapter caseUrlPatternType(UrlPatternType object) {
> 				return createUrlPatternTypeAdapter();
> 			}
> 			@Override
>-			public Object defaultCase(EObject object) {
>+			public Adapter defaultCase(EObject object) {
> 				return createEObjectAdapter();
> 			}
> 		};
>@@ -201,11 +213,39 @@
> 	 */
> 	@Override
> 	public Adapter createAdapter(Notifier target) {
>-		return (Adapter)modelSwitch.doSwitch((EObject)target);
>+		return modelSwitch.doSwitch((EObject)target);
> 	}
> 
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.AddressingType Addressing Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.core.AddressingType
>+	 * @generated
>+	 */
>+	public Adapter createAddressingTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.DataSourceType Data Source Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType
>+	 * @generated
>+	 */
>+	public Adapter createDataSourceTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.Description Description}'.
> 	 * 
> 	 * This default implementation returns null so that we can easily ignore cases;
>@@ -472,6 +512,20 @@
> 	}
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.RespectBindingType Respect Binding Type}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.jst.javaee.core.RespectBindingType
>+	 * @generated
>+	 */
>+	public Adapter createRespectBindingTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.core.RunAs Run As}'.
> 	 * 
> 	 * This default implementation returns null so that we can easily ignore cases;
>Index: jee-models/org/eclipse/jst/javaee/jsp/internal/metadata/JspPackage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/metadata/JspPackage.java,v
>retrieving revision 1.2
>diff -u -r1.2 JspPackage.java
>--- jee-models/org/eclipse/jst/javaee/jsp/internal/metadata/JspPackage.java	26 Jul 2007 16:56:16 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/jsp/internal/metadata/JspPackage.java	14 Oct 2009 21:44:49 -0000
>@@ -30,11 +30,11 @@
> * 
> * 
> * 
>- * @(#)jsp_2_1.xsds	1.5 08/11/05
>+ * @(#)jsp_2_2.xsds	02/26/09
> * 
> * 
> * 
>- * Copyright 2003-2006 Sun Microsystems, Inc.
>+ * Copyright 2003-2009 Sun Microsystems, Inc.
> * 4150 Network Circle
> * Santa Clara, California 95054
> * U.S.A
>@@ -68,12 +68,12 @@
> * 
> * 
> * 
>- * This is the XML Schema for the JSP 2.1 deployment descriptor
>- * types. The JSP 2.1 schema contains all the special
>+ * This is the XML Schema for the JSP 2.2 deployment descriptor
>+ * types. The JSP 2.2 schema contains all the special
> * structures and datatypes that are necessary to use JSP files
> * from a web application.
> * 
>- * The contents of this schema is used by the web-app_2_5.xsd
>+ * The contents of this schema is used by the web-app_3_0.xsd
> * file to define JSP specific content.
> * 
> * 
>@@ -93,184 +93,195 @@
> * 
> * 
> * 
>- * @(#)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.
> * 
>+ * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
>+ * 
> * 
> * 
> * 
>- * The following definitions that appear in the common
>- * shareable schema(s) of J2EE deployment descriptors should be
>- * interpreted with respect to the context they are included:
>- * 
>- * Deployment Component may indicate one of the following:
>- * j2ee application;
>- * application client;
>- * web application;
>- * enterprise bean;
>- * resource adapter;
>- * 
>- * Deployment File may indicate one of the following:
>- * ear file;
>- * war file;
>- * jar file;
>- * rar file;
>- * 
>- * 
>- * 
>- * @(#)javaee_web_services_client_1_2.xsds	1.19 02/13/06
>+ * The following definitions that appear in the common
>+ * shareable schema(s) of Java EE deployment descriptors should be
>+ * interpreted with respect to the context they are included:
>+ * 
>+ * Deployment Component may indicate one of the following:
>+ * java ee application;
>+ * application client;
>+ * web application;
>+ * enterprise bean;
>+ * resource adapter; 
>+ * 
>+ * Deployment File may indicate one of the following:
>+ * ear file;
>+ * war file;
>+ * jar file;
>+ * rar file;
>+ * 
> * 
> * 
> * 
>- * Copyright 2003-2006 Sun Microsystems, Inc.
>- * 4150 Network Circle
>- * Santa Clara, California 95054
>- * U.S.A
>- * All rights reserved.
>- * 
>- * Sun Microsystems, Inc. has intellectual property rights
>- * relating to technology described in this document. In
>- * particular, and without limitation, these intellectual
>- * property rights may include one or more of the U.S. patents
>- * listed at http://www.sun.com/patents and one or more
>- * additional patents or pending patent applications in the
>- * U.S. and other countries.
>- * 
>- * This document and the technology which it describes are
>- * distributed under licenses restricting their use, copying,
>- * distribution, and decompilation. No part of this document
>- * may be reproduced in any form by any means without prior
>- * written authorization of Sun and its licensors, if any.
>- * 
>- * Third-party software, including font technology, is
>- * copyrighted and licensed from Sun suppliers.
>- * 
>- * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
>- * JavaServer Pages, Enterprise JavaBeans and the Java Coffee
>- * Cup logo are trademarks or registered trademarks of Sun
>- * Microsystems, Inc. in the U.S. and other countries.
>- * 
>- * Federal Acquisitions: Commercial Software - Government Users
>- * Subject to Standard License Terms and Conditions.
>- * 
>+ * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
>+ * 
> * 
> * 
> * 
> * (C) Copyright International Business Machines Corporation 2002
>- * 
>+ * 
> * 
> * 
>- * See http://www.w3.org/XML/1998/namespace.html and
>- * http://www.w3.org/TR/REC-xml for information about this namespace.
>+ * <div xmlns="http://www.w3.org/1999/xhtml">
>+ * <h1>About the XML namespace</h1>
> * 
>- * This schema document describes the XML namespace, in a form
>- * suitable for import by other schema documents. 
>+ * <div class="bodytext">
>+ * 
>+ * This schema document describes the XML namespace, in a form
>+ * suitable for import by other schema documents.
>+ * 
>+ * 
>+ * See <a href="http://www.w3.org/XML/1998/namespace.html">
>+ * http://www.w3.org/XML/1998/namespace.html</a> and
>+ * <a href="http://www.w3.org/TR/REC-xml">
>+ * http://www.w3.org/TR/REC-xml</a> for information 
>+ * about this namespace.
>+ * 
>+ * 
>+ * Note that local names in this namespace are intended to be
>+ * defined only by the World Wide Web Consortium or its subgroups.
>+ * The names currently defined in this namespace are listed below.
>+ * They should not be used with conflicting semantics by any Working
>+ * Group, specification, or document instance.
>+ * 
>+ * 
>+ * See further below in this document for more information about <a href="#usage">how to refer to this schema document from your own
>+ * XSD schema documents</a> and about <a href="#nsversioning">the
>+ * namespace-versioning policy governing this schema document</a>.
>+ * 
>+ * </div>
>+ * </div>
>+ * 
> * 
>- * 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.
>+ * <div xmlns="http://www.w3.org/1999/xhtml">
>+ * 
>+ * <h3>Father (in any context at all)</h3> 
>+ * 
>+ * <div class="bodytext">
>+ * 
>+ * denotes Jon Bosak, the chair of 
>+ * the original XML Working Group. This name is reserved by 
>+ * the following decision of the W3C XML Plenary and 
>+ * XML Coordination groups:
>+ * 
>+ * <blockquote>
>+ * 
>+ * 	In appreciation for his vision, leadership and
>+ * 	dedication the W3C XML Plenary on this 10th day of
>+ * 	February, 2000, reserves for Jon Bosak in perpetuity
>+ * 	the XML name "xml:Father".
>+ * 
>+ * </blockquote>
>+ * </div>
>+ * </div>
> * 
>- * space (as an attribute name): denotes an attribute whose
>- * value is a keyword indicating what whitespace processing
>- * discipline is intended for the content of the element; its
>- * value is inherited. This name is reserved by virtue of its
>- * definition in the XML specification.
>- * 
>- * Father (in any context at all): denotes Jon Bosak, the chair of 
>- * the original XML Working Group. This name is reserved by 
>- * the following decision of the W3C XML Plenary and 
>- * XML Coordination groups:
>- * 
>- * In appreciation for his vision, leadership and dedication
>- * the W3C XML Plenary on this 10th day of February, 2000
>- * reserves for Jon Bosak in perpetuity the XML name
>- * xml:Father
>+ * 
>+ * <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml">
>+ * <h2>
>+ * <a name="usage">About this schema document</a>
>+ * </h2>
>+ * 
>+ * <div class="bodytext">
>+ * 
>+ * This schema defines attributes and an attribute group suitable
>+ * for use by schemas wishing to allow <code>xml:base</code>,
>+ * <code>xml:lang</code>, <code>xml:space</code> or
>+ * <code>xml:id</code> attributes on elements they define.
>+ * 
>+ * 
>+ * To enable this, such a schema must import this schema for
>+ * the XML namespace, e.g. as follows:
>+ * 
>+ * <pre>
>+ * &lt;schema . . .&gt;
>+ * . . .
>+ * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>+ * schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
>+ * </pre>
>+ * 
>+ * or
>+ * 
>+ * <pre>
>+ * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>+ * schemaLocation="http://www.w3.org/2009/01/xml.xsd"/&gt;
>+ * </pre>
>+ * 
>+ * Subsequently, qualified reference to any of the attributes or the
>+ * group defined below will have the desired effect, e.g.
>+ * 
>+ * <pre>
>+ * &lt;type . . .&gt;
>+ * . . .
>+ * &lt;attributeGroup ref="xml:specialAttrs"/&gt;
>+ * </pre>
>+ * 
>+ * will define a type which will schema-validate an instance element
>+ * with any of those attributes.
>+ * 
>+ * </div>
>+ * </div>
> * 
>- * 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.
>+ * 
>+ * <div id="nsversioning" xml:id="nsversioning" xmlns="http://www.w3.org/1999/xhtml">
>+ * <h2>
>+ * <a name="nsversioning">Versioning policy for this schema document</a>
>+ * </h2>
>+ * <div class="bodytext">
>+ * 
>+ * In keeping with the XML Schema WG's standard versioning
>+ * policy, this schema document will persist at
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * http://www.w3.org/2009/01/xml.xsd</a>.
>+ * 
>+ * 
>+ * At the date of issue it can also be found at
>+ * <a href="http://www.w3.org/2001/xml.xsd">
>+ * http://www.w3.org/2001/xml.xsd</a>.
>+ * 
>+ * 
>+ * The schema document at that URI may however change in the future,
>+ * in order to remain compatible with the latest version of XML
>+ * Schema itself, or with the XML namespace itself. In other words,
>+ * if the XML Schema or XML namespaces change, the version of this
>+ * document at <a href="http://www.w3.org/2001/xml.xsd">
>+ * http://www.w3.org/2001/xml.xsd 
>+ * </a> 
>+ * will change accordingly; the version at 
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * http://www.w3.org/2009/01/xml.xsd 
>+ * </a> 
>+ * will not change.
>+ * 
>+ * 
>+ * Previous dated (and unchanging) versions of this schema 
>+ * document are at:
>+ * 
>+ * <ul>
>+ * <li>
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * 	http://www.w3.org/2009/01/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2007/08/xml.xsd">
>+ * 	http://www.w3.org/2007/08/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2004/10/xml.xsd">
>+ * 	http://www.w3.org/2004/10/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2001/03/xml.xsd">
>+ * 	http://www.w3.org/2001/03/xml.xsd</a>
>+ * </li>
>+ * </ul>
>+ * </div>
>+ * </div>
> * 
> * 
> * @see org.eclipse.jst.javaee.jsp.JspFactory
>@@ -474,13 +485,40 @@
> 	int JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES = 11;
> 
> 	/**
>+	 * The feature id for the 'Default Content Type' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int JSP_PROPERTY_GROUP__DEFAULT_CONTENT_TYPE = 12;
>+
>+	/**
>+	 * The feature id for the 'Buffer' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int JSP_PROPERTY_GROUP__BUFFER = 13;
>+
>+	/**
>+	 * The feature id for the 'Error On Undeclared Namespace' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int JSP_PROPERTY_GROUP__ERROR_ON_UNDECLARED_NAMESPACE = 14;
>+
>+	/**
> 	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JSP_PROPERTY_GROUP__ID = 12;
>+	int JSP_PROPERTY_GROUP__ID = 15;
> 
> 	/**
> 	 * The number of structural features of the 'Property Group' class.
>@@ -489,7 +527,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JSP_PROPERTY_GROUP_FEATURE_COUNT = 13;
>+	int JSP_PROPERTY_GROUP_FEATURE_COUNT = 16;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.jsp.internal.impl.TagLibImpl Tag Lib}' class.
>@@ -734,6 +772,39 @@
> 	EAttribute getJspPropertyGroup_TrimDirectiveWhitespaces();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getDefaultContentType Default Content Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Default Content Type'.
>+	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#getDefaultContentType()
>+	 * @see #getJspPropertyGroup()
>+	 * @generated
>+	 */
>+	EAttribute getJspPropertyGroup_DefaultContentType();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getBuffer Buffer}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Buffer'.
>+	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#getBuffer()
>+	 * @see #getJspPropertyGroup()
>+	 * @generated
>+	 */
>+	EAttribute getJspPropertyGroup_Buffer();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isErrorOnUndeclaredNamespace Error On Undeclared Namespace}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Error On Undeclared Namespace'.
>+	 * @see org.eclipse.jst.javaee.jsp.JspPropertyGroup#isErrorOnUndeclaredNamespace()
>+	 * @see #getJspPropertyGroup()
>+	 * @generated
>+	 */
>+	EAttribute getJspPropertyGroup_ErrorOnUndeclaredNamespace();
>+
>+	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getId Id}'.
> 	 * 
> 	 * 
>@@ -960,6 +1031,30 @@
> 		EAttribute JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES = eINSTANCE.getJspPropertyGroup_TrimDirectiveWhitespaces();
> 
> 		/**
>+		 * The meta object literal for the 'Default Content Type' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute JSP_PROPERTY_GROUP__DEFAULT_CONTENT_TYPE = eINSTANCE.getJspPropertyGroup_DefaultContentType();
>+
>+		/**
>+		 * The meta object literal for the 'Buffer' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute JSP_PROPERTY_GROUP__BUFFER = eINSTANCE.getJspPropertyGroup_Buffer();
>+
>+		/**
>+		 * The meta object literal for the 'Error On Undeclared Namespace' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute JSP_PROPERTY_GROUP__ERROR_ON_UNDECLARED_NAMESPACE = eINSTANCE.getJspPropertyGroup_ErrorOnUndeclaredNamespace();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>Index: jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPropertyGroupImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPropertyGroupImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 JspPropertyGroupImpl.java
>--- jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPropertyGroupImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPropertyGroupImpl.java	14 Oct 2009 21:44:49 -0000
>@@ -56,6 +56,9 @@
> * <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#getIncludeCodas Include Codas}</li>
> * <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#isDeferredSyntaxAllowedAsLiteral Deferred Syntax Allowed As Literal}</li>
> * <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#isTrimDirectiveWhitespaces Trim Directive Whitespaces}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#getDefaultContentType Default Content Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#getBuffer Buffer}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#isErrorOnUndeclaredNamespace Error On Undeclared Namespace}</li>
> * <li>{@link org.eclipse.jst.javaee.jsp.internal.impl.JspPropertyGroupImpl#getId Id}</li>
> * </ul>
> * 
>@@ -71,7 +74,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>@@ -81,7 +84,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -91,7 +94,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
> 
> 	/**
> 	 * The cached value of the '{@link #getUrlPatterns() Url Patterns}' containment reference list.
>@@ -101,7 +104,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList urlPatterns = null;
>+	protected EList<UrlPatternType> urlPatterns;
> 
> 	/**
> 	 * The default value of the '{@link #isElIgnored() El Ignored}' attribute.
>@@ -130,7 +133,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean elIgnoredESet = false;
>+	protected boolean elIgnoredESet;
> 
> 	/**
> 	 * The default value of the '{@link #getPageEncoding() Page Encoding}' attribute.
>@@ -179,7 +182,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean scriptingInvalidESet = false;
>+	protected boolean scriptingInvalidESet;
> 
> 	/**
> 	 * The default value of the '{@link #isIsXml() Is Xml}' attribute.
>@@ -208,7 +211,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean isXmlESet = false;
>+	protected boolean isXmlESet;
> 
> 	/**
> 	 * The cached value of the '{@link #getIncludePreludes() Include Preludes}' attribute list.
>@@ -218,7 +221,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList includePreludes = null;
>+	protected EList<String> includePreludes;
> 
> 	/**
> 	 * The cached value of the '{@link #getIncludeCodas() Include Codas}' attribute list.
>@@ -228,7 +231,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList includeCodas = null;
>+	protected EList<String> includeCodas;
> 
> 	/**
> 	 * The default value of the '{@link #isDeferredSyntaxAllowedAsLiteral() Deferred Syntax Allowed As Literal}' attribute.
>@@ -257,7 +260,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean deferredSyntaxAllowedAsLiteralESet = false;
>+	protected boolean deferredSyntaxAllowedAsLiteralESet;
> 
> 	/**
> 	 * The default value of the '{@link #isTrimDirectiveWhitespaces() Trim Directive Whitespaces}' attribute.
>@@ -286,7 +289,76 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean trimDirectiveWhitespacesESet = false;
>+	protected boolean trimDirectiveWhitespacesESet;
>+
>+	/**
>+	 * The default value of the '{@link #getDefaultContentType() Default Content Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getDefaultContentType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String DEFAULT_CONTENT_TYPE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getDefaultContentType() Default Content Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getDefaultContentType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String defaultContentType = DEFAULT_CONTENT_TYPE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getBuffer() Buffer}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getBuffer()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String BUFFER_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getBuffer() Buffer}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getBuffer()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String buffer = BUFFER_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #isErrorOnUndeclaredNamespace() Error On Undeclared Namespace}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isErrorOnUndeclaredNamespace()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean ERROR_ON_UNDECLARED_NAMESPACE_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isErrorOnUndeclaredNamespace() Error On Undeclared Namespace}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isErrorOnUndeclaredNamespace()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean errorOnUndeclaredNamespace = ERROR_ON_UNDECLARED_NAMESPACE_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Error On Undeclared Namespace attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean errorOnUndeclaredNamespaceESet;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -332,9 +404,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -344,9 +416,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -356,9 +428,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, JspPackage.JSP_PROPERTY_GROUP__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, JspPackage.JSP_PROPERTY_GROUP__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -368,9 +440,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getUrlPatterns() {
>+	public List<UrlPatternType> getUrlPatterns() {
> 		if (urlPatterns == null) {
>-			urlPatterns = new EObjectContainmentEList(UrlPatternType.class, this, JspPackage.JSP_PROPERTY_GROUP__URL_PATTERNS);
>+			urlPatterns = new EObjectContainmentEList<UrlPatternType>(UrlPatternType.class, this, JspPackage.JSP_PROPERTY_GROUP__URL_PATTERNS);
> 		}
> 		return urlPatterns;
> 	}
>@@ -539,9 +611,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIncludePreludes() {
>+	public List<String> getIncludePreludes() {
> 		if (includePreludes == null) {
>-			includePreludes = new EDataTypeEList(String.class, this, JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES);
>+			includePreludes = new EDataTypeEList<String>(String.class, this, JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES);
> 		}
> 		return includePreludes;
> 	}
>@@ -551,9 +623,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIncludeCodas() {
>+	public List<String> getIncludeCodas() {
> 		if (includeCodas == null) {
>-			includeCodas = new EDataTypeEList(String.class, this, JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS);
>+			includeCodas = new EDataTypeEList<String>(String.class, this, JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS);
> 		}
> 		return includeCodas;
> 	}
>@@ -655,6 +727,94 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String getDefaultContentType() {
>+		return defaultContentType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setDefaultContentType(String newDefaultContentType) {
>+		String oldDefaultContentType = defaultContentType;
>+		defaultContentType = newDefaultContentType;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__DEFAULT_CONTENT_TYPE, oldDefaultContentType, defaultContentType));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getBuffer() {
>+		return buffer;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setBuffer(String newBuffer) {
>+		String oldBuffer = buffer;
>+		buffer = newBuffer;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__BUFFER, oldBuffer, buffer));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isErrorOnUndeclaredNamespace() {
>+		return errorOnUndeclaredNamespace;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setErrorOnUndeclaredNamespace(boolean newErrorOnUndeclaredNamespace) {
>+		boolean oldErrorOnUndeclaredNamespace = errorOnUndeclaredNamespace;
>+		errorOnUndeclaredNamespace = newErrorOnUndeclaredNamespace;
>+		boolean oldErrorOnUndeclaredNamespaceESet = errorOnUndeclaredNamespaceESet;
>+		errorOnUndeclaredNamespaceESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__ERROR_ON_UNDECLARED_NAMESPACE, oldErrorOnUndeclaredNamespace, errorOnUndeclaredNamespace, !oldErrorOnUndeclaredNamespaceESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetErrorOnUndeclaredNamespace() {
>+		boolean oldErrorOnUndeclaredNamespace = errorOnUndeclaredNamespace;
>+		boolean oldErrorOnUndeclaredNamespaceESet = errorOnUndeclaredNamespaceESet;
>+		errorOnUndeclaredNamespace = ERROR_ON_UNDECLARED_NAMESPACE_EDEFAULT;
>+		errorOnUndeclaredNamespaceESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JspPackage.JSP_PROPERTY_GROUP__ERROR_ON_UNDECLARED_NAMESPACE, oldErrorOnUndeclaredNamespace, ERROR_ON_UNDECLARED_NAMESPACE_EDEFAULT, oldErrorOnUndeclaredNamespaceESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetErrorOnUndeclaredNamespace() {
>+		return errorOnUndeclaredNamespaceESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -680,13 +840,13 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case JspPackage.JSP_PROPERTY_GROUP__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERNS:
>-				return ((InternalEList)getUrlPatterns()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getUrlPatterns()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -708,21 +868,27 @@
> 			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERNS:
> 				return getUrlPatterns();
> 			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
>-				return isElIgnored() ? Boolean.TRUE : Boolean.FALSE;
>+				return isElIgnored();
> 			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
> 				return getPageEncoding();
> 			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
>-				return isScriptingInvalid() ? Boolean.TRUE : Boolean.FALSE;
>+				return isScriptingInvalid();
> 			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
>-				return isIsXml() ? Boolean.TRUE : Boolean.FALSE;
>+				return isIsXml();
> 			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;
>+				return isDeferredSyntaxAllowedAsLiteral();
> 			case JspPackage.JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES:
>-				return isTrimDirectiveWhitespaces() ? Boolean.TRUE : Boolean.FALSE;
>+				return isTrimDirectiveWhitespaces();
>+			case JspPackage.JSP_PROPERTY_GROUP__DEFAULT_CONTENT_TYPE:
>+				return getDefaultContentType();
>+			case JspPackage.JSP_PROPERTY_GROUP__BUFFER:
>+				return getBuffer();
>+			case JspPackage.JSP_PROPERTY_GROUP__ERROR_ON_UNDECLARED_NAMESPACE:
>+				return isErrorOnUndeclaredNamespace();
> 			case JspPackage.JSP_PROPERTY_GROUP__ID:
> 				return getId();
> 		}
>@@ -734,50 +900,60 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
> 				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERNS:
> 				getUrlPatterns().clear();
>-				getUrlPatterns().addAll((Collection)newValue);
>+				getUrlPatterns().addAll((Collection<? extends UrlPatternType>)newValue);
> 				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
>-				setElIgnored(((Boolean)newValue).booleanValue());
>+				setElIgnored((Boolean)newValue);
> 				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
> 				setPageEncoding((String)newValue);
> 				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
>-				setScriptingInvalid(((Boolean)newValue).booleanValue());
>+				setScriptingInvalid((Boolean)newValue);
> 				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
>-				setIsXml(((Boolean)newValue).booleanValue());
>+				setIsXml((Boolean)newValue);
> 				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
> 				getIncludePreludes().clear();
>-				getIncludePreludes().addAll((Collection)newValue);
>+				getIncludePreludes().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
> 				getIncludeCodas().clear();
>-				getIncludeCodas().addAll((Collection)newValue);
>+				getIncludeCodas().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__DEFERRED_SYNTAX_ALLOWED_AS_LITERAL:
>-				setDeferredSyntaxAllowedAsLiteral(((Boolean)newValue).booleanValue());
>+				setDeferredSyntaxAllowedAsLiteral((Boolean)newValue);
> 				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES:
>-				setTrimDirectiveWhitespaces(((Boolean)newValue).booleanValue());
>+				setTrimDirectiveWhitespaces((Boolean)newValue);
>+				return;
>+			case JspPackage.JSP_PROPERTY_GROUP__DEFAULT_CONTENT_TYPE:
>+				setDefaultContentType((String)newValue);
>+				return;
>+			case JspPackage.JSP_PROPERTY_GROUP__BUFFER:
>+				setBuffer((String)newValue);
>+				return;
>+			case JspPackage.JSP_PROPERTY_GROUP__ERROR_ON_UNDECLARED_NAMESPACE:
>+				setErrorOnUndeclaredNamespace((Boolean)newValue);
> 				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__ID:
> 				setId((String)newValue);
>@@ -830,6 +1006,15 @@
> 			case JspPackage.JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES:
> 				unsetTrimDirectiveWhitespaces();
> 				return;
>+			case JspPackage.JSP_PROPERTY_GROUP__DEFAULT_CONTENT_TYPE:
>+				setDefaultContentType(DEFAULT_CONTENT_TYPE_EDEFAULT);
>+				return;
>+			case JspPackage.JSP_PROPERTY_GROUP__BUFFER:
>+				setBuffer(BUFFER_EDEFAULT);
>+				return;
>+			case JspPackage.JSP_PROPERTY_GROUP__ERROR_ON_UNDECLARED_NAMESPACE:
>+				unsetErrorOnUndeclaredNamespace();
>+				return;
> 			case JspPackage.JSP_PROPERTY_GROUP__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -869,6 +1054,12 @@
> 				return isSetDeferredSyntaxAllowedAsLiteral();
> 			case JspPackage.JSP_PROPERTY_GROUP__TRIM_DIRECTIVE_WHITESPACES:
> 				return isSetTrimDirectiveWhitespaces();
>+			case JspPackage.JSP_PROPERTY_GROUP__DEFAULT_CONTENT_TYPE:
>+				return DEFAULT_CONTENT_TYPE_EDEFAULT == null ? defaultContentType != null : !DEFAULT_CONTENT_TYPE_EDEFAULT.equals(defaultContentType);
>+			case JspPackage.JSP_PROPERTY_GROUP__BUFFER:
>+				return BUFFER_EDEFAULT == null ? buffer != null : !BUFFER_EDEFAULT.equals(buffer);
>+			case JspPackage.JSP_PROPERTY_GROUP__ERROR_ON_UNDECLARED_NAMESPACE:
>+				return isSetErrorOnUndeclaredNamespace();
> 			case JspPackage.JSP_PROPERTY_GROUP__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -901,6 +1092,12 @@
> 		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(", defaultContentType: "); //$NON-NLS-1$
>+		result.append(defaultContentType);
>+		result.append(", buffer: "); //$NON-NLS-1$
>+		result.append(buffer);
>+		result.append(", errorOnUndeclaredNamespace: "); //$NON-NLS-1$
>+		if (errorOnUndeclaredNamespaceESet) result.append(errorOnUndeclaredNamespace); else result.append("<unset>"); //$NON-NLS-1$
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
> 		result.append(')');
>Index: jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspFactoryImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 JspFactoryImpl.java
>--- jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspFactoryImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspFactoryImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -171,6 +171,7 @@
> 	 * @deprecated
> 	 * @generated
> 	 */
>+	@Deprecated
> 	public static JspPackage getPackage() {
> 		return JspPackage.eINSTANCE;
> 	}
>Index: jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 JspPackageImpl.java
>--- jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java	26 Jul 2007 16:56:12 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -38,6 +38,8 @@
> 
> import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
> 
>+import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
> import org.eclipse.jst.javaee.jsp.JspConfig;
> import org.eclipse.jst.javaee.jsp.JspFactory;
> import org.eclipse.jst.javaee.jsp.JspPropertyGroup;
>@@ -48,6 +50,10 @@
> import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
> 
> import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
>+import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
>+import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
> 
> /**
> * 
>@@ -111,20 +117,10 @@
> 	private static boolean isInited = false;
> 
> 	/**
>-	 * Creates, registers, and initializes the Package for this
>-	 * model, and for any others upon which it depends. Simple
>-	 * dependencies are satisfied by calling this method on all
>-	 * dependent packages before doing anything else. This method drives
>-	 * initialization for interdependent packages directly, in parallel
>-	 * with this package, itself.
>-	 * Of this package and its interdependencies, all packages which
>-	 * have not yet been registered by their URI values are first created
>-	 * and registered. The packages are then initialized in two steps:
>-	 * meta-model objects for all of the packages are created before any
>-	 * are initialized, since one package's meta-model objects may refer to
>-	 * those of another.
>-	 * Invocation of this method will not affect any packages that have
>-	 * already been initialized.
>+	 * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>+	 * 
>+	 * This method is used to initialize {@link JspPackage#eINSTANCE} when that field is accessed.
>+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
> 	 * 
> 	 * 
> 	 * @see #eNS_URI
>@@ -136,7 +132,7 @@
> 		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());
>+		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new JspPackageImpl());
> 
> 		isInited = true;
> 
>@@ -145,31 +141,43 @@
> 		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);
>+		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
>+		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
>+		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
>+		WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
>+		WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
> 
> 		// Create package meta-data objects
> 		theJspPackage.createPackageContents();
>-		theWebPackage.createPackageContents();
> 		theApplicationPackage.createPackageContents();
> 		theJavaeePackage.createPackageContents();
>-		theEjbPackage.createPackageContents();
> 		theApplicationclientPackage.createPackageContents();
>+		theJcaPackage.createPackageContents();
>+		theEjbPackage.createPackageContents();
>+		theWebPackage.createPackageContents();
>+		theWebappPackage.createPackageContents();
>+		theWebfragmentPackage.createPackageContents();
> 
> 		// Initialize created meta-data
> 		theJspPackage.initializePackageContents();
>-		theWebPackage.initializePackageContents();
> 		theApplicationPackage.initializePackageContents();
> 		theJavaeePackage.initializePackageContents();
>-		theEjbPackage.initializePackageContents();
> 		theApplicationclientPackage.initializePackageContents();
>+		theJcaPackage.initializePackageContents();
>+		theEjbPackage.initializePackageContents();
>+		theWebPackage.initializePackageContents();
>+		theWebappPackage.initializePackageContents();
>+		theWebfragmentPackage.initializePackageContents();
> 
> 		// Mark meta-data to indicate it can't be changed
> 		theJspPackage.freeze();
> 
>+ 
>+		// Update the registry and return the package
>+		EPackage.Registry.INSTANCE.put(JspPackage.eNS_URI, theJspPackage);
> 		return theJspPackage;
> 	}
> 
>@@ -331,7 +339,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getJspPropertyGroup_Id() {
>+	public EAttribute getJspPropertyGroup_DefaultContentType() {
> 		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(12);
> 	}
> 
>@@ -340,6 +348,33 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getJspPropertyGroup_Buffer() {
>+		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(13);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getJspPropertyGroup_ErrorOnUndeclaredNamespace() {
>+		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(14);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getJspPropertyGroup_Id() {
>+		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(15);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getTagLib() {
> 		return tagLibEClass;
> 	}
>@@ -426,6 +461,9 @@
> 		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__DEFAULT_CONTENT_TYPE);
>+		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__BUFFER);
>+		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__ERROR_ON_UNDECLARED_NAMESPACE);
> 		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__ID);
> 
> 		tagLibEClass = createEClass(TAG_LIB);
>@@ -464,33 +502,40 @@
> 		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
> 		JavaeePackage theJavaeePackage = (JavaeePackage)EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI);
> 
>+		// Create type parameters
>+
>+		// Set bounds for type parameters
>+
> 		// 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$
>+		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_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$
>+		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_DefaultContentType(), theXMLTypePackage.getToken(), "defaultContentType", 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_Buffer(), theXMLTypePackage.getToken(), "buffer", 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_ErrorOnUndeclaredNamespace(), theJavaeePackage.getTrueFalseType(), "errorOnUndeclaredNamespace", 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$
>+		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$
>@@ -650,6 +695,30 @@
> 			 "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_DefaultContentType(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "default-content-type", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getJspPropertyGroup_Buffer(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "buffer", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getJspPropertyGroup_ErrorOnUndeclaredNamespace(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "error-on-undeclared-namespace", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getJspPropertyGroup_Id(), 
>Index: jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspConfigImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspConfigImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 JspConfigImpl.java
>--- jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspConfigImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspConfigImpl.java	14 Oct 2009 21:44:48 -0000
>@@ -57,7 +57,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList tagLibs = null;
>+	protected EList<TagLib> tagLibs;
> 
> 	/**
> 	 * The cached value of the '{@link #getJspPropertyGroups() Jsp Property Groups}' containment reference list.
>@@ -67,7 +67,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList jspPropertyGroups = null;
>+	protected EList<JspPropertyGroup> jspPropertyGroups;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -113,9 +113,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getTagLibs() {
>+	public List<TagLib> getTagLibs() {
> 		if (tagLibs == null) {
>-			tagLibs = new EObjectContainmentEList(TagLib.class, this, JspPackage.JSP_CONFIG__TAG_LIBS);
>+			tagLibs = new EObjectContainmentEList<TagLib>(TagLib.class, this, JspPackage.JSP_CONFIG__TAG_LIBS);
> 		}
> 		return tagLibs;
> 	}
>@@ -125,9 +125,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getJspPropertyGroups() {
>+	public List<JspPropertyGroup> getJspPropertyGroups() {
> 		if (jspPropertyGroups == null) {
>-			jspPropertyGroups = new EObjectContainmentEList(JspPropertyGroup.class, this, JspPackage.JSP_CONFIG__JSP_PROPERTY_GROUPS);
>+			jspPropertyGroups = new EObjectContainmentEList<JspPropertyGroup>(JspPropertyGroup.class, this, JspPackage.JSP_CONFIG__JSP_PROPERTY_GROUPS);
> 		}
> 		return jspPropertyGroups;
> 	}
>@@ -162,9 +162,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case JspPackage.JSP_CONFIG__TAG_LIBS:
>-				return ((InternalEList)getTagLibs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getTagLibs()).basicRemove(otherEnd, msgs);
> 			case JspPackage.JSP_CONFIG__JSP_PROPERTY_GROUPS:
>-				return ((InternalEList)getJspPropertyGroups()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getJspPropertyGroups()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -192,16 +192,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case JspPackage.JSP_CONFIG__TAG_LIBS:
> 				getTagLibs().clear();
>-				getTagLibs().addAll((Collection)newValue);
>+				getTagLibs().addAll((Collection<? extends TagLib>)newValue);
> 				return;
> 			case JspPackage.JSP_CONFIG__JSP_PROPERTY_GROUPS:
> 				getJspPropertyGroups().clear();
>-				getJspPropertyGroups().addAll((Collection)newValue);
>+				getJspPropertyGroups().addAll((Collection<? extends JspPropertyGroup>)newValue);
> 				return;
> 			case JspPackage.JSP_CONFIG__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientSwitch.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientSwitch.java,v
>retrieving revision 1.2
>diff -u -r1.2 ApplicationclientSwitch.java
>--- jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientSwitch.java	26 Jul 2007 16:56:13 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientSwitch.java	14 Oct 2009 21:44:47 -0000
>@@ -32,7 +32,7 @@
> * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage
> * @generated
> */
>-public class ApplicationclientSwitch {
>+public class ApplicationclientSwitch<T> {
> 	/**
> 	 * The cached model package
> 	 * 
>@@ -60,7 +60,7 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	public Object doSwitch(EObject theEObject) {
>+	public T doSwitch(EObject theEObject) {
> 		return doSwitch(theEObject.eClass(), theEObject);
> 	}
> 
>@@ -71,16 +71,16 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
>+	protected T doSwitch(EClass theEClass, EObject theEObject) {
> 		if (theEClass.eContainer() == modelPackage) {
> 			return doSwitch(theEClass.getClassifierID(), theEObject);
> 		}
> 		else {
>-			List eSuperTypes = theEClass.getESuperTypes();
>+			List<EClass> eSuperTypes = theEClass.getESuperTypes();
> 			return
> 				eSuperTypes.isEmpty() ?
> 					defaultCase(theEObject) :
>-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
>+					doSwitch(eSuperTypes.get(0), theEObject);
> 		}
> 	}
> 
>@@ -91,17 +91,17 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	protected Object doSwitch(int classifierID, EObject theEObject) {
>+	protected T doSwitch(int classifierID, EObject theEObject) {
> 		switch (classifierID) {
> 			case ApplicationclientPackage.APPLICATION_CLIENT: {
> 				ApplicationClient applicationClient = (ApplicationClient)theEObject;
>-				Object result = caseApplicationClient(applicationClient);
>+				T 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);
>+				T result = caseApplicationClientDeploymentDescriptor(applicationClientDeploymentDescriptor);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
>@@ -110,47 +110,47 @@
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Application Client'.
>+	 * Returns the result of interpreting the object as an instance of 'Application Client'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Application Client'.
>+	 * @return the result of interpreting the object as an instance of 'Application Client'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseApplicationClient(ApplicationClient object) {
>+	public T caseApplicationClient(ApplicationClient object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Application Client Deployment Descriptor'.
>+	 * Returns the result of interpreting the object as an instance of 'Application Client Deployment Descriptor'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Application Client Deployment Descriptor'.
>+	 * @return the result of interpreting the object as an instance of 'Application Client Deployment Descriptor'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseApplicationClientDeploymentDescriptor(ApplicationClientDeploymentDescriptor object) {
>+	public T caseApplicationClientDeploymentDescriptor(ApplicationClientDeploymentDescriptor object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'EObject'.
>+	 * Returns the result of interpreting the object as an instance of 'EObject'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'EObject'.
>+	 * @return the result of interpreting the object as an instance of 'EObject'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> 	 * @generated
> 	 */
>-	public Object defaultCase(EObject object) {
>+	public T defaultCase(EObject object) {
> 		return null;
> 	}
> 
>Index: jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientResourceImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientResourceImpl.java,v
>retrieving revision 1.7
>diff -u -r1.7 ApplicationclientResourceImpl.java
>--- jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientResourceImpl.java	9 Jun 2009 19:37:07 -0000	1.7
>+++ jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientResourceImpl.java	14 Oct 2009 21:44:47 -0000
>@@ -28,7 +28,7 @@
> * @see org.eclipse.jst.javaee.applicationclient.internal.util.ApplicationclientResourceFactoryImpl
> * @generated
> */
>-public class ApplicationclientResourceImpl extends JavaeeResourceImpl implements IRootObjectResource, IApplicationClientResource{
>+public class ApplicationclientResourceImpl extends JavaeeResourceImpl implements IRootObjectResource, IApplicationClientResource {
> 	/**
> 	 * Creates an instance of the resource.
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientXMLProcessor.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientXMLProcessor.java,v
>retrieving revision 1.3
>diff -u -r1.3 ApplicationclientXMLProcessor.java
>--- jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientXMLProcessor.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientXMLProcessor.java	14 Oct 2009 21:44:47 -0000
>@@ -14,6 +14,7 @@
> 
> import org.eclipse.emf.ecore.EPackage;
> 
>+import org.eclipse.emf.ecore.resource.Resource;
> import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
> 
> import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
>@@ -43,7 +44,7 @@
> 	 * @generated
> 	 */
> 	@Override
>-	protected Map getRegistrations() {
>+	protected Map<String, Resource.Factory> getRegistrations() {
> 		if (registrations == null) {
> 			super.getRegistrations();
> 			registrations.put(XML_EXTENSION, new ApplicationclientResourceFactoryImpl());
>Index: jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientAdapterFactory.java,v
>retrieving revision 1.3
>diff -u -r1.3 ApplicationclientAdapterFactory.java
>--- jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientAdapterFactory.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/applicationclient/internal/util/ApplicationclientAdapterFactory.java	14 Oct 2009 21:44:47 -0000
>@@ -70,23 +70,23 @@
> 	}
> 
> 	/**
>-	 * The switch the delegates to the <code>createXXX</code> methods.
>+	 * The switch that delegates to the <code>createXXX</code> methods.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	protected ApplicationclientSwitch modelSwitch =
>-		new ApplicationclientSwitch() {
>+	protected ApplicationclientSwitch<Adapter> modelSwitch =
>+		new ApplicationclientSwitch<Adapter>() {
> 			@Override
>-			public Object caseApplicationClient(ApplicationClient object) {
>+			public Adapter caseApplicationClient(ApplicationClient object) {
> 				return createApplicationClientAdapter();
> 			}
> 			@Override
>-			public Object caseApplicationClientDeploymentDescriptor(ApplicationClientDeploymentDescriptor object) {
>+			public Adapter caseApplicationClientDeploymentDescriptor(ApplicationClientDeploymentDescriptor object) {
> 				return createApplicationClientDeploymentDescriptorAdapter();
> 			}
> 			@Override
>-			public Object defaultCase(EObject object) {
>+			public Adapter defaultCase(EObject object) {
> 				return createEObjectAdapter();
> 			}
> 		};
>@@ -101,7 +101,7 @@
> 	 */
> 	@Override
> 	public Adapter createAdapter(Notifier target) {
>-		return (Adapter)modelSwitch.doSwitch((EObject)target);
>+		return modelSwitch.doSwitch((EObject)target);
> 	}
> 
> 
>Index: jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java,v
>retrieving revision 1.2
>diff -u -r1.2 JavaeePackage.java
>--- jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java	26 Jul 2007 16:56:15 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java	14 Oct 2009 21:44:48 -0000
>@@ -31,184 +31,195 @@
> * 
> * 
> * 
>- * @(#)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.
> * 
>+ * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
>+ * 
> * 
> * 
> * 
>- * The following definitions that appear in the common
>- * shareable schema(s) of J2EE deployment descriptors should be
>- * interpreted with respect to the context they are included:
>- * 
>- * Deployment Component may indicate one of the following:
>- * j2ee application;
>- * application client;
>- * web application;
>- * enterprise bean;
>- * resource adapter;
>- * 
>- * Deployment File may indicate one of the following:
>- * ear file;
>- * war file;
>- * jar file;
>- * rar file;
>- * 
>- * 
>- * 
>- * @(#)javaee_web_services_client_1_2.xsds	1.19 02/13/06
>+ * The following definitions that appear in the common
>+ * shareable schema(s) of Java EE deployment descriptors should be
>+ * interpreted with respect to the context they are included:
>+ * 
>+ * Deployment Component may indicate one of the following:
>+ * java ee application;
>+ * application client;
>+ * web application;
>+ * enterprise bean;
>+ * resource adapter; 
>+ * 
>+ * Deployment File may indicate one of the following:
>+ * ear file;
>+ * war file;
>+ * jar file;
>+ * rar file;
>+ * 
> * 
> * 
> * 
>- * Copyright 2003-2006 Sun Microsystems, Inc.
>- * 4150 Network Circle
>- * Santa Clara, California 95054
>- * U.S.A
>- * All rights reserved.
>- * 
>- * Sun Microsystems, Inc. has intellectual property rights
>- * relating to technology described in this document. In
>- * particular, and without limitation, these intellectual
>- * property rights may include one or more of the U.S. patents
>- * listed at http://www.sun.com/patents and one or more
>- * additional patents or pending patent applications in the
>- * U.S. and other countries.
>- * 
>- * This document and the technology which it describes are
>- * distributed under licenses restricting their use, copying,
>- * distribution, and decompilation. No part of this document
>- * may be reproduced in any form by any means without prior
>- * written authorization of Sun and its licensors, if any.
>- * 
>- * Third-party software, including font technology, is
>- * copyrighted and licensed from Sun suppliers.
>- * 
>- * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
>- * JavaServer Pages, Enterprise JavaBeans and the Java Coffee
>- * Cup logo are trademarks or registered trademarks of Sun
>- * Microsystems, Inc. in the U.S. and other countries.
>- * 
>- * Federal Acquisitions: Commercial Software - Government Users
>- * Subject to Standard License Terms and Conditions.
>- * 
>+ * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
>+ * 
> * 
> * 
> * 
> * (C) Copyright International Business Machines Corporation 2002
>- * 
>+ * 
> * 
> * 
>- * See http://www.w3.org/XML/1998/namespace.html and
>- * http://www.w3.org/TR/REC-xml for information about this namespace.
>- * 
>- * This schema document describes the XML namespace, in a form
>- * suitable for import by other schema documents. 
>- * 
>- * Note that local names in this namespace are intended to be defined
>- * only by the World Wide Web Consortium or its subgroups. The
>- * following names are currently defined in this namespace and should
>- * not be used with conflicting semantics by any Working Group,
>- * specification, or document instance:
>- * 
>- * 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.
>+ * <div xmlns="http://www.w3.org/1999/xhtml">
>+ * <h1>About the XML namespace</h1>
> * 
>- * lang (as an attribute name): denotes an attribute whose value
>- * is a language code for the natural language of the content of
>- * any element; its value is inherited. This name is reserved
>- * by virtue of its definition in the XML specification.
>+ * <div class="bodytext">
>+ * 
>+ * This schema document describes the XML namespace, in a form
>+ * suitable for import by other schema documents.
>+ * 
>+ * 
>+ * See <a href="http://www.w3.org/XML/1998/namespace.html">
>+ * http://www.w3.org/XML/1998/namespace.html</a> and
>+ * <a href="http://www.w3.org/TR/REC-xml">
>+ * http://www.w3.org/TR/REC-xml</a> for information 
>+ * about this namespace.
>+ * 
>+ * 
>+ * Note that local names in this namespace are intended to be
>+ * defined only by the World Wide Web Consortium or its subgroups.
>+ * The names currently defined in this namespace are listed below.
>+ * They should not be used with conflicting semantics by any Working
>+ * Group, specification, or document instance.
>+ * 
>+ * 
>+ * See further below in this document for more information about <a href="#usage">how to refer to this schema document from your own
>+ * XSD schema documents</a> and about <a href="#nsversioning">the
>+ * namespace-versioning policy governing this schema document</a>.
>+ * 
>+ * </div>
>+ * </div>
> * 
>- * space (as an attribute name): denotes an attribute whose
>- * value is a keyword indicating what whitespace processing
>- * discipline is intended for the content of the element; its
>- * value is inherited. This name is reserved by virtue of its
>- * definition in the XML specification.
> * 
>- * Father (in any context at all): denotes Jon Bosak, the chair of 
>- * the original XML Working Group. This name is reserved by 
>- * the following decision of the W3C XML Plenary and 
>- * XML Coordination groups:
>+ * <div xmlns="http://www.w3.org/1999/xhtml">
>+ * 
>+ * <h3>Father (in any context at all)</h3> 
> * 
>- * In appreciation for his vision, leadership and dedication
>- * the W3C XML Plenary on this 10th day of February, 2000
>- * reserves for Jon Bosak in perpetuity the XML name
>- * xml:Father
>+ * <div class="bodytext">
>+ * 
>+ * denotes Jon Bosak, the chair of 
>+ * the original XML Working Group. This name is reserved by 
>+ * the following decision of the W3C XML Plenary and 
>+ * XML Coordination groups:
>+ * 
>+ * <blockquote>
>+ * 
>+ * 	In appreciation for his vision, leadership and
>+ * 	dedication the W3C XML Plenary on this 10th day of
>+ * 	February, 2000, reserves for Jon Bosak in perpetuity
>+ * 	the XML name "xml:Father".
>+ * 
>+ * </blockquote>
>+ * </div>
>+ * </div>
> * 
>- * This schema defines attributes and an attribute group
>- * suitable for use by
>- * schemas wishing to allow xml:base, xml:lang, xml:space or xml:id
>- * attributes on elements they define.
> * 
>- * To enable this, such a schema must import this schema
>- * for the XML namespace, e.g. as follows:
>- * &lt;schema . . .&gt;
>- * . . .
>- * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>- * schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
>+ * <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml">
>+ * <h2>
>+ * <a name="usage">About this schema document</a>
>+ * </h2>
> * 
>- * Subsequently, qualified reference to any of the attributes
>- * or the group defined below will have the desired effect, e.g.
>+ * <div class="bodytext">
>+ * 
>+ * This schema defines attributes and an attribute group suitable
>+ * for use by schemas wishing to allow <code>xml:base</code>,
>+ * <code>xml:lang</code>, <code>xml:space</code> or
>+ * <code>xml:id</code> attributes on elements they define.
>+ * 
>+ * 
>+ * To enable this, such a schema must import this schema for
>+ * the XML namespace, e.g. as follows:
>+ * 
>+ * <pre>
>+ * &lt;schema . . .&gt;
>+ * . . .
>+ * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>+ * schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
>+ * </pre>
>+ * 
>+ * or
>+ * 
>+ * <pre>
>+ * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>+ * schemaLocation="http://www.w3.org/2009/01/xml.xsd"/&gt;
>+ * </pre>
>+ * 
>+ * Subsequently, qualified reference to any of the attributes or the
>+ * group defined below will have the desired effect, e.g.
>+ * 
>+ * <pre>
>+ * &lt;type . . .&gt;
>+ * . . .
>+ * &lt;attributeGroup ref="xml:specialAttrs"/&gt;
>+ * </pre>
>+ * 
>+ * will define a type which will schema-validate an instance element
>+ * with any of those attributes.
>+ * 
>+ * </div>
>+ * </div>
>+ * 
> * 
>- * &lt;type . . .&gt;
>- * . . .
>- * &lt;attributeGroup ref="xml:specialAttrs"/&gt;
>- * 
>- * will define a type which will schema-validate an instance
>- * element with any of those attributes
>- * In keeping with the XML Schema WG's standard versioning
>- * policy, this schema document will persist at
>- * http://www.w3.org/2005/08/xml.xsd.
>- * At the date of issue it can also be found at
>- * http://www.w3.org/2001/xml.xsd.
>- * The schema document at that URI may however change in the future,
>- * in order to remain compatible with the latest version of XML Schema
>- * itself, or with the XML namespace itself. In other words, if the XML
>- * Schema or XML namespaces change, the version of this document at
>- * http://www.w3.org/2001/xml.xsd will change
>- * accordingly; the version at
>- * http://www.w3.org/2005/08/xml.xsd will not change.
>+ * <div id="nsversioning" xml:id="nsversioning" xmlns="http://www.w3.org/1999/xhtml">
>+ * <h2>
>+ * <a name="nsversioning">Versioning policy for this schema document</a>
>+ * </h2>
>+ * <div class="bodytext">
>+ * 
>+ * In keeping with the XML Schema WG's standard versioning
>+ * policy, this schema document will persist at
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * http://www.w3.org/2009/01/xml.xsd</a>.
>+ * 
>+ * 
>+ * At the date of issue it can also be found at
>+ * <a href="http://www.w3.org/2001/xml.xsd">
>+ * http://www.w3.org/2001/xml.xsd</a>.
>+ * 
>+ * 
>+ * The schema document at that URI may however change in the future,
>+ * in order to remain compatible with the latest version of XML
>+ * Schema itself, or with the XML namespace itself. In other words,
>+ * if the XML Schema or XML namespaces change, the version of this
>+ * document at <a href="http://www.w3.org/2001/xml.xsd">
>+ * http://www.w3.org/2001/xml.xsd 
>+ * </a> 
>+ * will change accordingly; the version at 
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * http://www.w3.org/2009/01/xml.xsd 
>+ * </a> 
>+ * will not change.
>+ * 
>+ * 
>+ * Previous dated (and unchanging) versions of this schema 
>+ * document are at:
>+ * 
>+ * <ul>
>+ * <li>
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * 	http://www.w3.org/2009/01/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2007/08/xml.xsd">
>+ * 	http://www.w3.org/2007/08/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2004/10/xml.xsd">
>+ * 	http://www.w3.org/2004/10/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2001/03/xml.xsd">
>+ * 	http://www.w3.org/2001/03/xml.xsd</a>
>+ * </li>
>+ * </ul>
>+ * </div>
>+ * </div>
> * 
> * 
> * @see org.eclipse.jst.javaee.core.JavaeeFactory
>@@ -248,6 +259,242 @@
> 	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.AddressingTypeImpl Addressing Type}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.AddressingTypeImpl
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getAddressingType()
>+	 * @generated
>+	 */
>+	int ADDRESSING_TYPE = 0;
>+
>+	/**
>+	 * The feature id for the 'Enabled' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ADDRESSING_TYPE__ENABLED = 0;
>+
>+	/**
>+	 * The feature id for the 'Required' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ADDRESSING_TYPE__REQUIRED = 1;
>+
>+	/**
>+	 * The feature id for the 'Responses' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ADDRESSING_TYPE__RESPONSES = 2;
>+
>+	/**
>+	 * The number of structural features of the 'Addressing Type' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ADDRESSING_TYPE_FEATURE_COUNT = 3;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl Data Source Type}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getDataSourceType()
>+	 * @generated
>+	 */
>+	int DATA_SOURCE_TYPE = 1;
>+
>+	/**
>+	 * The feature id for the 'Description' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__DESCRIPTION = 0;
>+
>+	/**
>+	 * The feature id for the 'Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__NAME = 1;
>+
>+	/**
>+	 * The feature id for the 'Class Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__CLASS_NAME = 2;
>+
>+	/**
>+	 * The feature id for the 'Server Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__SERVER_NAME = 3;
>+
>+	/**
>+	 * The feature id for the 'Port Number' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__PORT_NUMBER = 4;
>+
>+	/**
>+	 * The feature id for the 'Database Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__DATABASE_NAME = 5;
>+
>+	/**
>+	 * The feature id for the 'Url' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__URL = 6;
>+
>+	/**
>+	 * The feature id for the 'User' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__USER = 7;
>+
>+	/**
>+	 * The feature id for the 'Password' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__PASSWORD = 8;
>+
>+	/**
>+	 * The feature id for the 'Property' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__PROPERTY = 9;
>+
>+	/**
>+	 * The feature id for the 'Login Timeout' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__LOGIN_TIMEOUT = 10;
>+
>+	/**
>+	 * The feature id for the 'Transactional' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__TRANSACTIONAL = 11;
>+
>+	/**
>+	 * The feature id for the 'Isolation Level' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__ISOLATION_LEVEL = 12;
>+
>+	/**
>+	 * The feature id for the 'Initial Pool Size' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__INITIAL_POOL_SIZE = 13;
>+
>+	/**
>+	 * The feature id for the 'Max Pool Size' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__MAX_POOL_SIZE = 14;
>+
>+	/**
>+	 * The feature id for the 'Min Pool Size' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__MIN_POOL_SIZE = 15;
>+
>+	/**
>+	 * The feature id for the 'Max Idle Time' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__MAX_IDLE_TIME = 16;
>+
>+	/**
>+	 * The feature id for the 'Max Statements' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__MAX_STATEMENTS = 17;
>+
>+	/**
>+	 * The feature id for the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE__ID = 18;
>+
>+	/**
>+	 * The number of structural features of the 'Data Source Type' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DATA_SOURCE_TYPE_FEATURE_COUNT = 19;
>+
>+	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.DescriptionImpl Description}' class.
> 	 * 
> 	 * 
>@@ -255,7 +502,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getDescription()
> 	 * @generated
> 	 */
>-	int DESCRIPTION = 0;
>+	int DESCRIPTION = 2;
> 
> 	/**
> 	 * The feature id for the 'Value' attribute.
>@@ -292,7 +539,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getDisplayName()
> 	 * @generated
> 	 */
>-	int DISPLAY_NAME = 1;
>+	int DISPLAY_NAME = 3;
> 
> 	/**
> 	 * The feature id for the 'Value' attribute.
>@@ -329,7 +576,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbLocalRef()
> 	 * @generated
> 	 */
>-	int EJB_LOCAL_REF = 2;
>+	int EJB_LOCAL_REF = 4;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -404,13 +651,22 @@
> 	int EJB_LOCAL_REF__INJECTION_TARGETS = 7;
> 
> 	/**
>+	 * The feature id for the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int EJB_LOCAL_REF__LOOKUP_NAME = 8;
>+
>+	/**
> 	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_LOCAL_REF__ID = 8;
>+	int EJB_LOCAL_REF__ID = 9;
> 
> 	/**
> 	 * The number of structural features of the 'Ejb Local Ref' class.
>@@ -419,7 +675,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_LOCAL_REF_FEATURE_COUNT = 9;
>+	int EJB_LOCAL_REF_FEATURE_COUNT = 10;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.EjbRefImpl Ejb Ref}' class.
>@@ -429,7 +685,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRef()
> 	 * @generated
> 	 */
>-	int EJB_REF = 3;
>+	int EJB_REF = 5;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -504,13 +760,22 @@
> 	int EJB_REF__INJECTION_TARGETS = 7;
> 
> 	/**
>+	 * The feature id for the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int EJB_REF__LOOKUP_NAME = 8;
>+
>+	/**
> 	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_REF__ID = 8;
>+	int EJB_REF__ID = 9;
> 
> 	/**
> 	 * The number of structural features of the 'Ejb Ref' class.
>@@ -519,7 +784,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_REF_FEATURE_COUNT = 9;
>+	int EJB_REF_FEATURE_COUNT = 10;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.EmptyTypeImpl Empty Type}' class.
>@@ -529,7 +794,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEmptyType()
> 	 * @generated
> 	 */
>-	int EMPTY_TYPE = 4;
>+	int EMPTY_TYPE = 6;
> 
> 	/**
> 	 * The feature id for the 'Id' attribute.
>@@ -557,7 +822,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEnvEntry()
> 	 * @generated
> 	 */
>-	int ENV_ENTRY = 5;
>+	int ENV_ENTRY = 7;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -614,13 +879,22 @@
> 	int ENV_ENTRY__INJECTION_TARGETS = 5;
> 
> 	/**
>+	 * The feature id for the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ENV_ENTRY__LOOKUP_NAME = 6;
>+
>+	/**
> 	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ENV_ENTRY__ID = 6;
>+	int ENV_ENTRY__ID = 7;
> 
> 	/**
> 	 * The number of structural features of the 'Env Entry' class.
>@@ -629,7 +903,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ENV_ENTRY_FEATURE_COUNT = 7;
>+	int ENV_ENTRY_FEATURE_COUNT = 8;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.IconImpl Icon}' class.
>@@ -639,7 +913,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getIcon()
> 	 * @generated
> 	 */
>-	int ICON = 6;
>+	int ICON = 8;
> 
> 	/**
> 	 * The feature id for the 'Small Icon' attribute.
>@@ -694,7 +968,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getInjectionTarget()
> 	 * @generated
> 	 */
>-	int INJECTION_TARGET = 7;
>+	int INJECTION_TARGET = 9;
> 
> 	/**
> 	 * The feature id for the 'Injection Target Class' attribute.
>@@ -731,7 +1005,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getLifecycleCallback()
> 	 * @generated
> 	 */
>-	int LIFECYCLE_CALLBACK = 8;
>+	int LIFECYCLE_CALLBACK = 10;
> 
> 	/**
> 	 * The feature id for the 'Lifecycle Callback Class' attribute.
>@@ -768,7 +1042,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getListener()
> 	 * @generated
> 	 */
>-	int LISTENER = 9;
>+	int LISTENER = 11;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -832,7 +1106,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestination()
> 	 * @generated
> 	 */
>-	int MESSAGE_DESTINATION = 10;
>+	int MESSAGE_DESTINATION = 12;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -905,7 +1179,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationRef()
> 	 * @generated
> 	 */
>-	int MESSAGE_DESTINATION_REF = 11;
>+	int MESSAGE_DESTINATION_REF = 13;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -971,13 +1245,22 @@
> 	int MESSAGE_DESTINATION_REF__INJECTION_TARGETS = 6;
> 
> 	/**
>+	 * The feature id for the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MESSAGE_DESTINATION_REF__LOOKUP_NAME = 7;
>+
>+	/**
> 	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DESTINATION_REF__ID = 7;
>+	int MESSAGE_DESTINATION_REF__ID = 8;
> 
> 	/**
> 	 * The number of structural features of the 'Message Destination Ref' class.
>@@ -986,7 +1269,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DESTINATION_REF_FEATURE_COUNT = 8;
>+	int MESSAGE_DESTINATION_REF_FEATURE_COUNT = 9;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ParamValueImpl Param Value}' class.
>@@ -996,7 +1279,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getParamValue()
> 	 * @generated
> 	 */
>-	int PARAM_VALUE = 12;
>+	int PARAM_VALUE = 14;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1051,7 +1334,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceContextRef()
> 	 * @generated
> 	 */
>-	int PERSISTENCE_CONTEXT_REF = 13;
>+	int PERSISTENCE_CONTEXT_REF = 15;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1117,13 +1400,22 @@
> 	int PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS = 6;
> 
> 	/**
>+	 * The feature id for the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PERSISTENCE_CONTEXT_REF__LOOKUP_NAME = 7;
>+
>+	/**
> 	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PERSISTENCE_CONTEXT_REF__ID = 7;
>+	int PERSISTENCE_CONTEXT_REF__ID = 8;
> 
> 	/**
> 	 * The number of structural features of the 'Persistence Context Ref' class.
>@@ -1132,7 +1424,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PERSISTENCE_CONTEXT_REF_FEATURE_COUNT = 8;
>+	int PERSISTENCE_CONTEXT_REF_FEATURE_COUNT = 9;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl Persistence Unit Ref}' class.
>@@ -1142,7 +1434,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceUnitRef()
> 	 * @generated
> 	 */
>-	int PERSISTENCE_UNIT_REF = 14;
>+	int PERSISTENCE_UNIT_REF = 16;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1190,13 +1482,22 @@
> 	int PERSISTENCE_UNIT_REF__INJECTION_TARGETS = 4;
> 
> 	/**
>+	 * The feature id for the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PERSISTENCE_UNIT_REF__LOOKUP_NAME = 5;
>+
>+	/**
> 	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PERSISTENCE_UNIT_REF__ID = 5;
>+	int PERSISTENCE_UNIT_REF__ID = 6;
> 
> 	/**
> 	 * The number of structural features of the 'Persistence Unit Ref' class.
>@@ -1205,7 +1506,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PERSISTENCE_UNIT_REF_FEATURE_COUNT = 6;
>+	int PERSISTENCE_UNIT_REF_FEATURE_COUNT = 7;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl Port Component Ref}' class.
>@@ -1215,7 +1516,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPortComponentRef()
> 	 * @generated
> 	 */
>-	int PORT_COMPONENT_REF = 15;
>+	int PORT_COMPONENT_REF = 17;
> 
> 	/**
> 	 * The feature id for the 'Service Endpoint Interface' attribute.
>@@ -1236,41 +1537,68 @@
> 	int PORT_COMPONENT_REF__ENABLE_MTOM = 1;
> 
> 	/**
>-	 * The feature id for the 'Port Component Link' attribute.
>+	 * The feature id for the 'Mtom Threshold' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PORT_COMPONENT_REF__PORT_COMPONENT_LINK = 2;
>+	int PORT_COMPONENT_REF__MTOM_THRESHOLD = 2;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The feature id for the 'Addressing' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PORT_COMPONENT_REF__ID = 3;
>+	int PORT_COMPONENT_REF__ADDRESSING = 3;
> 
> 	/**
>-	 * The number of structural features of the 'Port Component Ref' class.
>+	 * The feature id for the 'Respect Binding' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PORT_COMPONENT_REF_FEATURE_COUNT = 4;
>+	int PORT_COMPONENT_REF__RESPECT_BINDING = 4;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PropertyTypeImpl Property Type}' class.
>+	 * The feature id for the 'Port Component Link' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.PropertyTypeImpl
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPropertyType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int PROPERTY_TYPE = 16;
>+	int PORT_COMPONENT_REF__PORT_COMPONENT_LINK = 5;
>+
>+	/**
>+	 * The feature id for the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PORT_COMPONENT_REF__ID = 6;
>+
>+	/**
>+	 * The number of structural features of the 'Port Component Ref' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PORT_COMPONENT_REF_FEATURE_COUNT = 7;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PropertyTypeImpl Property Type}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.PropertyTypeImpl
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPropertyType()
>+	 * @generated
>+	 */
>+	int PROPERTY_TYPE = 18;
> 
> 	/**
> 	 * The feature id for the 'Name' attribute.
>@@ -1316,7 +1644,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResourceEnvRef()
> 	 * @generated
> 	 */
>-	int RESOURCE_ENV_REF = 17;
>+	int RESOURCE_ENV_REF = 19;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1364,13 +1692,22 @@
> 	int RESOURCE_ENV_REF__INJECTION_TARGETS = 4;
> 
> 	/**
>+	 * The feature id for the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int RESOURCE_ENV_REF__LOOKUP_NAME = 5;
>+
>+	/**
> 	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int RESOURCE_ENV_REF__ID = 5;
>+	int RESOURCE_ENV_REF__ID = 6;
> 
> 	/**
> 	 * The number of structural features of the 'Resource Env Ref' class.
>@@ -1379,7 +1716,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int RESOURCE_ENV_REF_FEATURE_COUNT = 6;
>+	int RESOURCE_ENV_REF_FEATURE_COUNT = 7;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl Resource Ref}' class.
>@@ -1389,7 +1726,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResourceRef()
> 	 * @generated
> 	 */
>-	int RESOURCE_REF = 18;
>+	int RESOURCE_REF = 20;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1455,13 +1792,22 @@
> 	int RESOURCE_REF__INJECTION_TARGETS = 6;
> 
> 	/**
>+	 * The feature id for the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int RESOURCE_REF__LOOKUP_NAME = 7;
>+
>+	/**
> 	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int RESOURCE_REF__ID = 7;
>+	int RESOURCE_REF__ID = 8;
> 
> 	/**
> 	 * The number of structural features of the 'Resource Ref' class.
>@@ -1470,7 +1816,35 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int RESOURCE_REF_FEATURE_COUNT = 8;
>+	int RESOURCE_REF_FEATURE_COUNT = 9;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.RespectBindingTypeImpl Respect Binding Type}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.RespectBindingTypeImpl
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRespectBindingType()
>+	 * @generated
>+	 */
>+	int RESPECT_BINDING_TYPE = 21;
>+
>+	/**
>+	 * The feature id for the 'Enabled' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int RESPECT_BINDING_TYPE__ENABLED = 0;
>+
>+	/**
>+	 * The number of structural features of the 'Respect Binding Type' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int RESPECT_BINDING_TYPE_FEATURE_COUNT = 1;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.RunAsImpl Run As}' class.
>@@ -1480,7 +1854,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRunAs()
> 	 * @generated
> 	 */
>-	int RUN_AS = 19;
>+	int RUN_AS = 22;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1526,7 +1900,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getSecurityRole()
> 	 * @generated
> 	 */
>-	int SECURITY_ROLE = 20;
>+	int SECURITY_ROLE = 23;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1572,7 +1946,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getSecurityRoleRef()
> 	 * @generated
> 	 */
>-	int SECURITY_ROLE_REF = 21;
>+	int SECURITY_ROLE_REF = 24;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1627,7 +2001,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRef()
> 	 * @generated
> 	 */
>-	int SERVICE_REF = 22;
>+	int SERVICE_REF = 25;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1756,13 +2130,22 @@
> 	int SERVICE_REF__INJECTION_TARGETS = 13;
> 
> 	/**
>+	 * The feature id for the 'Lookup Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SERVICE_REF__LOOKUP_NAME = 14;
>+
>+	/**
> 	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVICE_REF__ID = 14;
>+	int SERVICE_REF__ID = 15;
> 
> 	/**
> 	 * The number of structural features of the 'Service Ref' class.
>@@ -1771,7 +2154,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SERVICE_REF_FEATURE_COUNT = 15;
>+	int SERVICE_REF_FEATURE_COUNT = 16;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerImpl Service Ref Handler}' class.
>@@ -1781,7 +2164,7 @@
> 	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefHandler()
> 	 * @generated
> 	 */
>-	int SERVICE_REF_HANDLER = 23;
>+	int SERVICE_REF_HANDLER = 26;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1869,477 +2252,799 @@
> 	 * 
> 	 * 
> 	 * @generated
>-	 * @ordered
>+	 * @ordered
>+	 */
>+	int SERVICE_REF_HANDLER__ID = 9;
>+
>+	/**
>+	 * The number of structural features of the 'Service Ref Handler' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SERVICE_REF_HANDLER_FEATURE_COUNT = 10;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainImpl Service Ref Handler Chain}' class.
>+	 * 
>+	 * 
>+	 * @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 = 27;
>+
>+	/**
>+	 * The feature id for the 'Service Name Pattern' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SERVICE_REF_HANDLER_CHAIN__SERVICE_NAME_PATTERN = 0;
>+
>+	/**
>+	 * The feature id for the 'Port Name Pattern' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SERVICE_REF_HANDLER_CHAIN__PORT_NAME_PATTERN = 1;
>+
>+	/**
>+	 * The feature id for the 'Protocol Bindings' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SERVICE_REF_HANDLER_CHAIN__PROTOCOL_BINDINGS = 2;
>+
>+	/**
>+	 * The feature id for the 'Handlers' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SERVICE_REF_HANDLER_CHAIN__HANDLERS = 3;
>+
>+	/**
>+	 * The feature id for the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SERVICE_REF_HANDLER_CHAIN__ID = 4;
>+
>+	/**
>+	 * The number of structural features of the 'Service Ref Handler Chain' class.
>+	 * 
>+	 * 
>+	 * @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 Service Ref Handler Chains}' class.
>+	 * 
>+	 * 
>+	 * @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 = 28;
>+
>+	/**
>+	 * The feature id for the 'Handler Chains' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS = 0;
>+
>+	/**
>+	 * The feature id for the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SERVICE_REF_HANDLER_CHAINS__ID = 1;
>+
>+	/**
>+	 * The number of structural features of the 'Service Ref Handler Chains' class.
>+	 * 
>+	 * 
>+	 * @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 Url Pattern Type}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.UrlPatternTypeImpl
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getUrlPatternType()
>+	 * @generated
>+	 */
>+	int URL_PATTERN_TYPE = 29;
>+
>+	/**
>+	 * The feature id for the 'Value' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int URL_PATTERN_TYPE__VALUE = 0;
>+
>+	/**
>+	 * The number of structural features of the 'Url Pattern Type' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int URL_PATTERN_TYPE_FEATURE_COUNT = 1;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.AddressingResponsesType Addressing Responses Type}' enum.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.AddressingResponsesType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getAddressingResponsesType()
>+	 * @generated
>+	 */
>+	int ADDRESSING_RESPONSES_TYPE = 30;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.EjbRefType Ejb Ref Type}' enum.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.EjbRefType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRefType()
>+	 * @generated
>+	 */
>+	int EJB_REF_TYPE = 31;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.GenericBooleanType Generic Boolean Type}' enum.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.GenericBooleanType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getGenericBooleanType()
>+	 * @generated
>+	 */
>+	int GENERIC_BOOLEAN_TYPE = 32;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.IsolationLevelType Isolation Level Type}' enum.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.IsolationLevelType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getIsolationLevelType()
>+	 * @generated
>+	 */
>+	int ISOLATION_LEVEL_TYPE = 33;
>+
>+	/**
>+	 * The meta object id for the 'Env Entry Type' data type.
>+	 * 
>+	 * 
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEnvEntryType()
>+	 * @generated
>+	 */
>+	int ENV_ENTRY_TYPE = 43;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.MessageDestinationUsageType Message Destination Usage Type}' enum.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.MessageDestinationUsageType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationUsageType()
>+	 * @generated
>+	 */
>+	int MESSAGE_DESTINATION_USAGE_TYPE = 34;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.PersistenceContextType Persistence Context Type}' enum.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.PersistenceContextType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceContextType()
>+	 * @generated
>+	 */
>+	int PERSISTENCE_CONTEXT_TYPE = 35;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.ResAuthType Res Auth Type}' enum.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.ResAuthType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResAuthType()
>+	 * @generated
>+	 */
>+	int RES_AUTH_TYPE = 36;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.ResSharingScopeType Res Sharing Scope Type}' enum.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResSharingScopeType()
>+	 * @generated
>+	 */
>+	int RES_SHARING_SCOPE_TYPE = 37;
>+
>+	/**
>+	 * The meta object id for the 'Addressing Responses Type Object' data type.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.AddressingResponsesType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getAddressingResponsesTypeObject()
>+	 * @generated
>+	 */
>+	int ADDRESSING_RESPONSES_TYPE_OBJECT = 38;
>+
>+	/**
>+	 * The meta object id for the 'Dewey Version Type' data type.
>+	 * 
>+	 * 
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getDeweyVersionType()
>+	 * @generated
>+	 */
>+	int DEWEY_VERSION_TYPE = 39;
>+
>+	/**
>+	 * The meta object id for the 'EJB Link' data type.
>+	 * 
>+	 * 
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEJBLink()
>+	 * @generated
>+	 */
>+	int EJB_LINK = 40;
>+
>+	/**
>+	 * The meta object id for the 'Ejb Ref Name Type' data type.
>+	 * 
>+	 * 
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRefNameType()
>+	 * @generated
>+	 */
>+	int EJB_REF_NAME_TYPE = 41;
>+
>+	/**
>+	 * The meta object id for the 'Ejb Ref Type Object' data type.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.core.EjbRefType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRefTypeObject()
>+	 * @generated
>+	 */
>+	int EJB_REF_TYPE_OBJECT = 42;
>+
>+	/**
>+	 * The meta object id for the 'Fully Qualified Class Type' data type.
>+	 * 
>+	 * 
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getFullyQualifiedClassType()
>+	 * @generated
> 	 */
>-	int SERVICE_REF_HANDLER__ID = 9;
>+	int FULLY_QUALIFIED_CLASS_TYPE = 44;
> 
> 	/**
>-	 * The number of structural features of the 'Service Ref Handler' class.
>+	 * The meta object id for the 'Generic Boolean Type Object' data type.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.core.GenericBooleanType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getGenericBooleanTypeObject()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVICE_REF_HANDLER_FEATURE_COUNT = 10;
>+	int GENERIC_BOOLEAN_TYPE_OBJECT = 45;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainImpl Service Ref Handler Chain}' class.
>+	 * The meta object id for the 'Home' data type.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainImpl
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefHandlerChain()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getHome()
> 	 * @generated
> 	 */
>-	int SERVICE_REF_HANDLER_CHAIN = 24;
>+	int HOME = 46;
> 
> 	/**
>-	 * The feature id for the 'Service Name Pattern' attribute.
>+	 * The meta object id for the 'Isolation Level Type Object' data type.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.core.IsolationLevelType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getIsolationLevelTypeObject()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVICE_REF_HANDLER_CHAIN__SERVICE_NAME_PATTERN = 0;
>+	int ISOLATION_LEVEL_TYPE_OBJECT = 47;
> 
> 	/**
>-	 * The feature id for the 'Port Name Pattern' attribute.
>+	 * The meta object id for the 'Java Identifier' data type.
> 	 * 
> 	 * 
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJavaIdentifier()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVICE_REF_HANDLER_CHAIN__PORT_NAME_PATTERN = 1;
>+	int JAVA_IDENTIFIER = 48;
> 
> 	/**
>-	 * The feature id for the 'Protocol Bindings' attribute.
>+	 * The meta object id for the 'Java Type' data type.
> 	 * 
> 	 * 
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJavaType()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVICE_REF_HANDLER_CHAIN__PROTOCOL_BINDINGS = 2;
>+	int JAVA_TYPE = 49;
> 
> 	/**
>-	 * The feature id for the 'Handlers' containment reference list.
>+	 * The meta object id for the 'Jdbc Url Type' data type.
> 	 * 
> 	 * 
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJdbcUrlType()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVICE_REF_HANDLER_CHAIN__HANDLERS = 3;
>+	int JDBC_URL_TYPE = 50;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The meta object id for the 'JNDI Name' data type.
> 	 * 
> 	 * 
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJNDIName()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVICE_REF_HANDLER_CHAIN__ID = 4;
>+	int JNDI_NAME = 51;
> 
> 	/**
>-	 * The number of structural features of the 'Service Ref Handler Chain' class.
>+	 * The meta object id for the 'Local' data type.
> 	 * 
> 	 * 
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getLocal()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVICE_REF_HANDLER_CHAIN_FEATURE_COUNT = 5;
>+	int LOCAL = 52;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainsImpl Service Ref Handler Chains}' class.
>+	 * The meta object id for the 'Local Home' data type.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.ServiceRefHandlerChainsImpl
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefHandlerChains()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getLocalHome()
> 	 * @generated
> 	 */
>-	int SERVICE_REF_HANDLER_CHAINS = 25;
>+	int LOCAL_HOME = 53;
> 
> 	/**
>-	 * The feature id for the 'Handler Chains' containment reference list.
>+	 * The meta object id for the 'Message Destination Link' data type.
> 	 * 
> 	 * 
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationLink()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVICE_REF_HANDLER_CHAINS__HANDLER_CHAINS = 0;
>+	int MESSAGE_DESTINATION_LINK = 54;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The meta object id for the 'Message Destination Type Type' data type.
> 	 * 
> 	 * 
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationTypeType()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVICE_REF_HANDLER_CHAINS__ID = 1;
>+	int MESSAGE_DESTINATION_TYPE_TYPE = 55;
> 
> 	/**
>-	 * The number of structural features of the 'Service Ref Handler Chains' class.
>+	 * The meta object id for the 'Message Destination Usage Type Object' data type.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.core.MessageDestinationUsageType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationUsageTypeObject()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int SERVICE_REF_HANDLER_CHAINS_FEATURE_COUNT = 2;
>+	int MESSAGE_DESTINATION_USAGE_TYPE_OBJECT = 56;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.UrlPatternTypeImpl Url Pattern Type}' class.
>+	 * The meta object id for the 'Path Type' data type.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.UrlPatternTypeImpl
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getUrlPatternType()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPathType()
> 	 * @generated
> 	 */
>-	int URL_PATTERN_TYPE = 26;
>+	int PATH_TYPE = 57;
> 
> 	/**
>-	 * The feature id for the 'Value' attribute.
>+	 * The meta object id for the 'Persistence Context Type Object' data type.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.jst.javaee.core.PersistenceContextType
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceContextTypeObject()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int URL_PATTERN_TYPE__VALUE = 0;
>+	int PERSISTENCE_CONTEXT_TYPE_OBJECT = 58;
> 
> 	/**
>-	 * The number of structural features of the 'Url Pattern Type' class.
>+	 * The meta object id for the 'Protocol Binding List Type' data type.
> 	 * 
> 	 * 
>+	 * @see java.util.List
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getProtocolBindingListType()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int URL_PATTERN_TYPE_FEATURE_COUNT = 1;
>+	int PROTOCOL_BINDING_LIST_TYPE = 59;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.EjbRefType Ejb Ref Type}' enum.
>+	 * The meta object id for the 'Protocol Binding Type' data type.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.EjbRefType
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRefType()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getProtocolBindingType()
> 	 * @generated
> 	 */
>-	int EJB_REF_TYPE = 27;
>+	int PROTOCOL_BINDING_TYPE = 60;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.EnvEntryType Env Entry Type}' enum.
>+	 * The meta object id for the 'Protocol URI Alias Type' data type.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.EnvEntryType
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEnvEntryType()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getProtocolURIAliasType()
> 	 * @generated
> 	 */
>-	int ENV_ENTRY_TYPE = 28;
>+	int PROTOCOL_URI_ALIAS_TYPE = 61;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.MessageDestinationUsageType Message Destination Usage Type}' enum.
>+	 * The meta object id for the 'Qname Pattern' data type.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.MessageDestinationUsageType
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationUsageType()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getQnamePattern()
> 	 * @generated
> 	 */
>-	int MESSAGE_DESTINATION_USAGE_TYPE = 29;
>+	int QNAME_PATTERN = 62;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.PersistenceContextType Persistence Context Type}' enum.
>+	 * The meta object id for the 'Remote' data type.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.PersistenceContextType
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceContextType()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRemote()
> 	 * @generated
> 	 */
>-	int PERSISTENCE_CONTEXT_TYPE = 30;
>+	int REMOTE = 63;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.ResAuthType Res Auth Type}' enum.
>+	 * The meta object id for the 'Res Auth Type Object' data type.
> 	 * 
> 	 * 
> 	 * @see org.eclipse.jst.javaee.core.ResAuthType
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResAuthType()
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResAuthTypeObject()
> 	 * @generated
> 	 */
>-	int RES_AUTH_TYPE = 31;
>+	int RES_AUTH_TYPE_OBJECT = 64;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.ResSharingScopeType Res Sharing Scope Type}' enum.
>+	 * The meta object id for the 'Res Sharing Scope Type Object' data type.
> 	 * 
> 	 * 
> 	 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResSharingScopeType()
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResSharingScopeTypeObject()
> 	 * @generated
> 	 */
>-	int RES_SHARING_SCOPE_TYPE = 32;
>+	int RES_SHARING_SCOPE_TYPE_OBJECT = 65;
> 
> 	/**
>-	 * The meta object id for the 'Dewey Version Type' data type.
>+	 * The meta object id for the 'Role Name' data type.
> 	 * 
> 	 * 
> 	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getDeweyVersionType()
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRoleName()
> 	 * @generated
> 	 */
>-	int DEWEY_VERSION_TYPE = 33;
>+	int ROLE_NAME = 66;
> 
> 	/**
>-	 * The meta object id for the 'EJB Link' data type.
>+	 * The meta object id for the 'True False Type' data type.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEJBLink()
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getTrueFalseType()
> 	 * @generated
> 	 */
>-	int EJB_LINK = 34;
>+	int TRUE_FALSE_TYPE = 67;
> 
> 	/**
>-	 * The meta object id for the 'Ejb Ref Name Type' data type.
>+	 * The meta object id for the 'True False Type Object' data type.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRefNameType()
>+	 * @see java.lang.Boolean
>+	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getTrueFalseTypeObject()
> 	 * @generated
> 	 */
>-	int EJB_REF_NAME_TYPE = 35;
>+	int TRUE_FALSE_TYPE_OBJECT = 68;
>+
> 
> 	/**
>-	 * The meta object id for the 'Ejb Ref Type Object' data type.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.AddressingType Addressing Type}'.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.EjbRefType
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEjbRefTypeObject()
>+	 * @return the meta object for class 'Addressing Type'.
>+	 * @see org.eclipse.jst.javaee.core.AddressingType
> 	 * @generated
> 	 */
>-	int EJB_REF_TYPE_OBJECT = 36;
>+	EClass getAddressingType();
> 
> 	/**
>-	 * The meta object id for the 'Env Entry Type Object' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.AddressingType#isEnabled Enabled}'.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.EnvEntryType
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEnvEntryTypeObject()
>+	 * @return the meta object for the attribute 'Enabled'.
>+	 * @see org.eclipse.jst.javaee.core.AddressingType#isEnabled()
>+	 * @see #getAddressingType()
> 	 * @generated
> 	 */
>-	int ENV_ENTRY_TYPE_OBJECT = 37;
>+	EAttribute getAddressingType_Enabled();
> 
> 	/**
>-	 * The meta object id for the 'Fully Qualified Class Type' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.AddressingType#isRequired Required}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getFullyQualifiedClassType()
>+	 * @return the meta object for the attribute 'Required'.
>+	 * @see org.eclipse.jst.javaee.core.AddressingType#isRequired()
>+	 * @see #getAddressingType()
> 	 * @generated
> 	 */
>-	int FULLY_QUALIFIED_CLASS_TYPE = 38;
>+	EAttribute getAddressingType_Required();
> 
> 	/**
>-	 * The meta object id for the 'Home' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.AddressingType#getResponses Responses}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getHome()
>+	 * @return the meta object for the attribute 'Responses'.
>+	 * @see org.eclipse.jst.javaee.core.AddressingType#getResponses()
>+	 * @see #getAddressingType()
> 	 * @generated
> 	 */
>-	int HOME = 39;
>+	EAttribute getAddressingType_Responses();
> 
> 	/**
>-	 * The meta object id for the 'Java Identifier' data type.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.DataSourceType Data Source Type}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJavaIdentifier()
>+	 * @return the meta object for class 'Data Source Type'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType
> 	 * @generated
> 	 */
>-	int JAVA_IDENTIFIER = 40;
>+	EClass getDataSourceType();
> 
> 	/**
>-	 * The meta object id for the 'Java Type' data type.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.core.DataSourceType#getDescription Description}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJavaType()
>+	 * @return the meta object for the containment reference 'Description'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getDescription()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int JAVA_TYPE = 41;
>+	EReference getDataSourceType_Description();
> 
> 	/**
>-	 * The meta object id for the 'JNDI Name' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getName Name}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJNDIName()
>+	 * @return the meta object for the attribute 'Name'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getName()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int JNDI_NAME = 42;
>+	EAttribute getDataSourceType_Name();
> 
> 	/**
>-	 * The meta object id for the 'Local' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getClassName Class Name}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getLocal()
>+	 * @return the meta object for the attribute 'Class Name'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getClassName()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int LOCAL = 43;
>+	EAttribute getDataSourceType_ClassName();
> 
> 	/**
>-	 * The meta object id for the 'Local Home' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getServerName Server Name}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getLocalHome()
>+	 * @return the meta object for the attribute 'Server Name'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getServerName()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int LOCAL_HOME = 44;
>+	EAttribute getDataSourceType_ServerName();
> 
> 	/**
>-	 * The meta object id for the 'Message Destination Link' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getPortNumber Port Number}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationLink()
>+	 * @return the meta object for the attribute 'Port Number'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getPortNumber()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int MESSAGE_DESTINATION_LINK = 45;
>+	EAttribute getDataSourceType_PortNumber();
> 
> 	/**
>-	 * The meta object id for the 'Message Destination Type Type' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getDatabaseName Database Name}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationTypeType()
>+	 * @return the meta object for the attribute 'Database Name'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getDatabaseName()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int MESSAGE_DESTINATION_TYPE_TYPE = 46;
>+	EAttribute getDataSourceType_DatabaseName();
> 
> 	/**
>-	 * The meta object id for the 'Message Destination Usage Type Object' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getUrl Url}'.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.MessageDestinationUsageType
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getMessageDestinationUsageTypeObject()
>+	 * @return the meta object for the attribute 'Url'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getUrl()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int MESSAGE_DESTINATION_USAGE_TYPE_OBJECT = 47;
>+	EAttribute getDataSourceType_Url();
> 
> 	/**
>-	 * The meta object id for the 'Path Type' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getUser User}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPathType()
>+	 * @return the meta object for the attribute 'User'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getUser()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int PATH_TYPE = 48;
>+	EAttribute getDataSourceType_User();
> 
> 	/**
>-	 * The meta object id for the 'Persistence Context Type Object' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getPassword Password}'.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.PersistenceContextType
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getPersistenceContextTypeObject()
>+	 * @return the meta object for the attribute 'Password'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getPassword()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int PERSISTENCE_CONTEXT_TYPE_OBJECT = 49;
>+	EAttribute getDataSourceType_Password();
> 
> 	/**
>-	 * The meta object id for the 'Remote' data type.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.core.DataSourceType#getProperty Property}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRemote()
>+	 * @return the meta object for the containment reference list 'Property'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getProperty()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int REMOTE = 50;
>+	EReference getDataSourceType_Property();
> 
> 	/**
>-	 * The meta object id for the 'Res Auth Type Object' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getLoginTimeout Login Timeout}'.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.ResAuthType
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResAuthTypeObject()
>+	 * @return the meta object for the attribute 'Login Timeout'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getLoginTimeout()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int RES_AUTH_TYPE_OBJECT = 51;
>+	EAttribute getDataSourceType_LoginTimeout();
> 
> 	/**
>-	 * The meta object id for the 'Res Sharing Scope Type Object' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#isTransactional Transactional}'.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResSharingScopeTypeObject()
>+	 * @return the meta object for the attribute 'Transactional'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#isTransactional()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int RES_SHARING_SCOPE_TYPE_OBJECT = 52;
>+	EAttribute getDataSourceType_Transactional();
> 
> 	/**
>-	 * The meta object id for the 'Role Name' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getIsolationLevel Isolation Level}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRoleName()
>+	 * @return the meta object for the attribute 'Isolation Level'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getIsolationLevel()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int ROLE_NAME = 53;
>+	EAttribute getDataSourceType_IsolationLevel();
> 
> 	/**
>-	 * The meta object id for the 'Service Ref Protocol Binding List Type' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getInitialPoolSize Initial Pool Size}'.
> 	 * 
> 	 * 
>-	 * @see java.util.List
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefProtocolBindingListType()
>+	 * @return the meta object for the attribute 'Initial Pool Size'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getInitialPoolSize()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int SERVICE_REF_PROTOCOL_BINDING_LIST_TYPE = 54;
>+	EAttribute getDataSourceType_InitialPoolSize();
> 
> 	/**
>-	 * The meta object id for the 'Service Ref Protocol Binding Type' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getMaxPoolSize Max Pool Size}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefProtocolBindingType()
>+	 * @return the meta object for the attribute 'Max Pool Size'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getMaxPoolSize()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int SERVICE_REF_PROTOCOL_BINDING_TYPE = 55;
>+	EAttribute getDataSourceType_MaxPoolSize();
> 
> 	/**
>-	 * The meta object id for the 'Service Ref Protocol URI Alias Type' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getMinPoolSize Min Pool Size}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefProtocolURIAliasType()
>+	 * @return the meta object for the attribute 'Min Pool Size'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getMinPoolSize()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE = 56;
>+	EAttribute getDataSourceType_MinPoolSize();
> 
> 	/**
>-	 * The meta object id for the 'Service Ref Qname Pattern' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getMaxIdleTime Max Idle Time}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefQnamePattern()
>+	 * @return the meta object for the attribute 'Max Idle Time'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getMaxIdleTime()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int SERVICE_REF_QNAME_PATTERN = 57;
>+	EAttribute getDataSourceType_MaxIdleTime();
> 
> 	/**
>-	 * The meta object id for the 'True False Type' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getMaxStatements Max Statements}'.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getTrueFalseType()
>+	 * @return the meta object for the attribute 'Max Statements'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getMaxStatements()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int TRUE_FALSE_TYPE = 58;
>+	EAttribute getDataSourceType_MaxStatements();
> 
> 	/**
>-	 * The meta object id for the 'True False Type Object' data type.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.DataSourceType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @see java.lang.Boolean
>-	 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getTrueFalseTypeObject()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.core.DataSourceType#getId()
>+	 * @see #getDataSourceType()
> 	 * @generated
> 	 */
>-	int TRUE_FALSE_TYPE_OBJECT = 59;
>-
>+	EAttribute getDataSourceType_Id();
> 
> 	/**
> 	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.Description Description}'.
>@@ -2504,6 +3209,17 @@
> 	EReference getEjbLocalRef_InjectionTargets();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getLookupName Lookup Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Lookup Name'.
>+	 * @see org.eclipse.jst.javaee.core.EjbLocalRef#getLookupName()
>+	 * @see #getEjbLocalRef()
>+	 * @generated
>+	 */
>+	EAttribute getEjbLocalRef_LookupName();
>+
>+	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbLocalRef#getId Id}'.
> 	 * 
> 	 * 
>@@ -2613,6 +3329,17 @@
> 	EReference getEjbRef_InjectionTargets();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbRef#getLookupName Lookup Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Lookup Name'.
>+	 * @see org.eclipse.jst.javaee.core.EjbRef#getLookupName()
>+	 * @see #getEjbRef()
>+	 * @generated
>+	 */
>+	EAttribute getEjbRef_LookupName();
>+
>+	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EjbRef#getId Id}'.
> 	 * 
> 	 * 
>@@ -2721,6 +3448,17 @@
> 	EReference getEnvEntry_InjectionTargets();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EnvEntry#getLookupName Lookup Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Lookup Name'.
>+	 * @see org.eclipse.jst.javaee.core.EnvEntry#getLookupName()
>+	 * @see #getEnvEntry()
>+	 * @generated
>+	 */
>+	EAttribute getEnvEntry_LookupName();
>+
>+	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.EnvEntry#getId Id}'.
> 	 * 
> 	 * 
>@@ -3078,6 +3816,17 @@
> 	EReference getMessageDestinationRef_InjectionTargets();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getLookupName Lookup Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Lookup Name'.
>+	 * @see org.eclipse.jst.javaee.core.MessageDestinationRef#getLookupName()
>+	 * @see #getMessageDestinationRef()
>+	 * @generated
>+	 */
>+	EAttribute getMessageDestinationRef_LookupName();
>+
>+	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestinationRef#getId Id}'.
> 	 * 
> 	 * 
>@@ -3230,6 +3979,17 @@
> 	EReference getPersistenceContextRef_InjectionTargets();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getLookupName Lookup Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Lookup Name'.
>+	 * @see org.eclipse.jst.javaee.core.PersistenceContextRef#getLookupName()
>+	 * @see #getPersistenceContextRef()
>+	 * @generated
>+	 */
>+	EAttribute getPersistenceContextRef_LookupName();
>+
>+	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getId Id}'.
> 	 * 
> 	 * 
>@@ -3306,6 +4066,17 @@
> 	EReference getPersistenceUnitRef_InjectionTargets();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getLookupName Lookup Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Lookup Name'.
>+	 * @see org.eclipse.jst.javaee.core.PersistenceUnitRef#getLookupName()
>+	 * @see #getPersistenceUnitRef()
>+	 * @generated
>+	 */
>+	EAttribute getPersistenceUnitRef_LookupName();
>+
>+	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getId Id}'.
> 	 * 
> 	 * 
>@@ -3330,23 +4101,56 @@
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PortComponentRef#getServiceEndpointInterface Service Endpoint Interface}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Service Endpoint Interface'.
>-	 * @see org.eclipse.jst.javaee.core.PortComponentRef#getServiceEndpointInterface()
>+	 * @return the meta object for the attribute 'Service Endpoint Interface'.
>+	 * @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 Enable Mtom}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Enable Mtom'.
>+	 * @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#getMtomThreshold Mtom Threshold}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Mtom Threshold'.
>+	 * @see org.eclipse.jst.javaee.core.PortComponentRef#getMtomThreshold()
>+	 * @see #getPortComponentRef()
>+	 * @generated
>+	 */
>+	EAttribute getPortComponentRef_MtomThreshold();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.core.PortComponentRef#getAddressing Addressing}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Addressing'.
>+	 * @see org.eclipse.jst.javaee.core.PortComponentRef#getAddressing()
> 	 * @see #getPortComponentRef()
> 	 * @generated
> 	 */
>-	EAttribute getPortComponentRef_ServiceEndpointInterface();
>+	EReference getPortComponentRef_Addressing();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PortComponentRef#isEnableMtom Enable Mtom}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.core.PortComponentRef#getRespectBinding Respect Binding}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Enable Mtom'.
>-	 * @see org.eclipse.jst.javaee.core.PortComponentRef#isEnableMtom()
>+	 * @return the meta object for the containment reference 'Respect Binding'.
>+	 * @see org.eclipse.jst.javaee.core.PortComponentRef#getRespectBinding()
> 	 * @see #getPortComponentRef()
> 	 * @generated
> 	 */
>-	EAttribute getPortComponentRef_EnableMtom();
>+	EReference getPortComponentRef_RespectBinding();
> 
> 	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PortComponentRef#getPortComponentLink Port Component Link}'.
>@@ -3479,6 +4283,17 @@
> 	EReference getResourceEnvRef_InjectionTargets();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getLookupName Lookup Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Lookup Name'.
>+	 * @see org.eclipse.jst.javaee.core.ResourceEnvRef#getLookupName()
>+	 * @see #getResourceEnvRef()
>+	 * @generated
>+	 */
>+	EAttribute getResourceEnvRef_LookupName();
>+
>+	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceEnvRef#getId Id}'.
> 	 * 
> 	 * 
>@@ -3577,6 +4392,17 @@
> 	EReference getResourceRef_InjectionTargets();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceRef#getLookupName Lookup Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Lookup Name'.
>+	 * @see org.eclipse.jst.javaee.core.ResourceRef#getLookupName()
>+	 * @see #getResourceRef()
>+	 * @generated
>+	 */
>+	EAttribute getResourceRef_LookupName();
>+
>+	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ResourceRef#getId Id}'.
> 	 * 
> 	 * 
>@@ -3588,6 +4414,27 @@
> 	EAttribute getResourceRef_Id();
> 
> 	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.RespectBindingType Respect Binding Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Respect Binding Type'.
>+	 * @see org.eclipse.jst.javaee.core.RespectBindingType
>+	 * @generated
>+	 */
>+	EClass getRespectBindingType();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.RespectBindingType#isEnabled Enabled}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Enabled'.
>+	 * @see org.eclipse.jst.javaee.core.RespectBindingType#isEnabled()
>+	 * @see #getRespectBindingType()
>+	 * @generated
>+	 */
>+	EAttribute getRespectBindingType_Enabled();
>+
>+	/**
> 	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.core.RunAs Run As}'.
> 	 * 
> 	 * 
>@@ -3892,6 +4739,17 @@
> 	EReference getServiceRef_InjectionTargets();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRef#getLookupName Lookup Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Lookup Name'.
>+	 * @see org.eclipse.jst.javaee.core.ServiceRef#getLookupName()
>+	 * @see #getServiceRef()
>+	 * @generated
>+	 */
>+	EAttribute getServiceRef_LookupName();
>+
>+	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ServiceRef#getId Id}'.
> 	 * 
> 	 * 
>@@ -4141,6 +4999,16 @@
> 	EAttribute getUrlPatternType_Value();
> 
> 	/**
>+	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.core.AddressingResponsesType Addressing Responses Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for enum 'Addressing Responses Type'.
>+	 * @see org.eclipse.jst.javaee.core.AddressingResponsesType
>+	 * @generated
>+	 */
>+	EEnum getAddressingResponsesType();
>+
>+	/**
> 	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.core.EjbRefType Ejb Ref Type}'.
> 	 * 
> 	 * 
>@@ -4151,14 +5019,34 @@
> 	EEnum getEjbRefType();
> 
> 	/**
>-	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.core.EnvEntryType Env Entry Type}'.
>+	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.core.GenericBooleanType Generic Boolean Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for enum 'Generic Boolean Type'.
>+	 * @see org.eclipse.jst.javaee.core.GenericBooleanType
>+	 * @generated
>+	 */
>+	EEnum getGenericBooleanType();
>+
>+	/**
>+	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.core.IsolationLevelType Isolation Level Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for enum 'Isolation Level Type'.
>+	 * @see org.eclipse.jst.javaee.core.IsolationLevelType
>+	 * @generated
>+	 */
>+	EEnum getIsolationLevelType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Env Entry Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for enum 'Env Entry Type'.
>-	 * @see org.eclipse.jst.javaee.core.EnvEntryType
>+	 * @return the meta object for data type 'Env Entry Type'.
>+	 * @see java.lang.String
> 	 * @generated
> 	 */
>-	EEnum getEnvEntryType();
>+	EDataType getEnvEntryType();
> 
> 	/**
> 	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.core.MessageDestinationUsageType Message Destination Usage Type}'.
>@@ -4201,6 +5089,16 @@
> 	EEnum getResSharingScopeType();
> 
> 	/**
>+	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.core.AddressingResponsesType Addressing Responses Type Object}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Addressing Responses Type Object'.
>+	 * @see org.eclipse.jst.javaee.core.AddressingResponsesType
>+	 * @generated
>+	 */
>+	EDataType getAddressingResponsesTypeObject();
>+
>+	/**
> 	 * Returns the meta object for data type '{@link java.lang.String Dewey Version Type}'.
> 	 * 
> 	 * 
>@@ -4241,24 +5139,24 @@
> 	EDataType getEjbRefTypeObject();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.core.EnvEntryType Env Entry Type Object}'.
>+	 * Returns the meta object for data type '{@link java.lang.String Fully Qualified Class Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Env Entry Type Object'.
>-	 * @see org.eclipse.jst.javaee.core.EnvEntryType
>+	 * @return the meta object for data type 'Fully Qualified Class Type'.
>+	 * @see java.lang.String
> 	 * @generated
> 	 */
>-	EDataType getEnvEntryTypeObject();
>+	EDataType getFullyQualifiedClassType();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.lang.String Fully Qualified Class Type}'.
>+	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.core.GenericBooleanType Generic Boolean Type Object}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Fully Qualified Class Type'.
>-	 * @see java.lang.String
>+	 * @return the meta object for data type 'Generic Boolean Type Object'.
>+	 * @see org.eclipse.jst.javaee.core.GenericBooleanType
> 	 * @generated
> 	 */
>-	EDataType getFullyQualifiedClassType();
>+	EDataType getGenericBooleanTypeObject();
> 
> 	/**
> 	 * Returns the meta object for data type '{@link java.lang.String Home}'.
>@@ -4271,6 +5169,16 @@
> 	EDataType getHome();
> 
> 	/**
>+	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.core.IsolationLevelType Isolation Level Type Object}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Isolation Level Type Object'.
>+	 * @see org.eclipse.jst.javaee.core.IsolationLevelType
>+	 * @generated
>+	 */
>+	EDataType getIsolationLevelTypeObject();
>+
>+	/**
> 	 * Returns the meta object for data type '{@link java.lang.String Java Identifier}'.
> 	 * 
> 	 * 
>@@ -4291,6 +5199,16 @@
> 	EDataType getJavaType();
> 
> 	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Jdbc Url Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Jdbc Url Type'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getJdbcUrlType();
>+
>+	/**
> 	 * Returns the meta object for data type '{@link java.lang.String JNDI Name}'.
> 	 * 
> 	 * 
>@@ -4371,6 +5289,46 @@
> 	EDataType getPersistenceContextTypeObject();
> 
> 	/**
>+	 * Returns the meta object for data type '{@link java.util.List Protocol Binding List Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Protocol Binding List Type'.
>+	 * @see java.util.List
>+	 * @generated
>+	 */
>+	EDataType getProtocolBindingListType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Protocol Binding Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Protocol Binding Type'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getProtocolBindingType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Protocol URI Alias Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Protocol URI Alias Type'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getProtocolURIAliasType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.String Qname Pattern}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Qname Pattern'.
>+	 * @see java.lang.String
>+	 * @generated
>+	 */
>+	EDataType getQnamePattern();
>+
>+	/**
> 	 * Returns the meta object for data type '{@link java.lang.String Remote}'.
> 	 * 
> 	 * 
>@@ -4411,86 +5369,242 @@
> 	EDataType getRoleName();
> 
> 	/**
>-	 * Returns the meta object for data type '{@link java.util.List Service Ref Protocol Binding List Type}'.
>+	 * Returns the meta object for data type 'True False Type'.
> 	 * 
> 	 * 
>-	 * @return the meta object for data type 'Service Ref Protocol Binding List Type'.
>-	 * @see java.util.List
>+	 * @return the meta object for data type 'True False Type'.
>+	 * @generated
>+	 */
>+	EDataType getTrueFalseType();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link java.lang.Boolean True False Type Object}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'True False Type Object'.
>+	 * @see java.lang.Boolean
>+	 * @generated
>+	 */
>+	EDataType getTrueFalseTypeObject();
>+
>+	/**
>+	 * Returns the factory that creates the instances of the model.
>+	 * 
>+	 * 
>+	 * @return the factory that creates the instances of the model.
>+	 * @generated
>+	 */
>+	JavaeeFactory getJavaeeFactory();
>+
>+	/**
>+	 * 
>+	 * Defines literals for the meta objects that represent
>+	 * <ul>
>+	 * <li>each class,</li>
>+	 * <li>each feature of each class,</li>
>+	 * <li>each enum,</li>
>+	 * <li>and each data type</li>
>+	 * </ul>
>+	 * 
> 	 * @generated
> 	 */
>-	EDataType getServiceRefProtocolBindingListType();
>+	interface Literals {
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.AddressingTypeImpl Addressing Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.AddressingTypeImpl
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getAddressingType()
>+		 * @generated
>+		 */
>+		EClass ADDRESSING_TYPE = eINSTANCE.getAddressingType();
>+
>+		/**
>+		 * The meta object literal for the 'Enabled' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ADDRESSING_TYPE__ENABLED = eINSTANCE.getAddressingType_Enabled();
>+
>+		/**
>+		 * The meta object literal for the 'Required' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ADDRESSING_TYPE__REQUIRED = eINSTANCE.getAddressingType_Required();
>+
>+		/**
>+		 * The meta object literal for the 'Responses' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ADDRESSING_TYPE__RESPONSES = eINSTANCE.getAddressingType_Responses();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl Data Source Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getDataSourceType()
>+		 * @generated
>+		 */
>+		EClass DATA_SOURCE_TYPE = eINSTANCE.getDataSourceType();
>+
>+		/**
>+		 * The meta object literal for the 'Description' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference DATA_SOURCE_TYPE__DESCRIPTION = eINSTANCE.getDataSourceType_Description();
>+
>+		/**
>+		 * The meta object literal for the 'Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__NAME = eINSTANCE.getDataSourceType_Name();
>+
>+		/**
>+		 * The meta object literal for the 'Class Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__CLASS_NAME = eINSTANCE.getDataSourceType_ClassName();
>+
>+		/**
>+		 * The meta object literal for the 'Server Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__SERVER_NAME = eINSTANCE.getDataSourceType_ServerName();
>+
>+		/**
>+		 * The meta object literal for the 'Port Number' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__PORT_NUMBER = eINSTANCE.getDataSourceType_PortNumber();
>+
>+		/**
>+		 * The meta object literal for the 'Database Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__DATABASE_NAME = eINSTANCE.getDataSourceType_DatabaseName();
>+
>+		/**
>+		 * The meta object literal for the 'Url' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__URL = eINSTANCE.getDataSourceType_Url();
>+
>+		/**
>+		 * The meta object literal for the 'User' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__USER = eINSTANCE.getDataSourceType_User();
>+
>+		/**
>+		 * The meta object literal for the 'Password' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__PASSWORD = eINSTANCE.getDataSourceType_Password();
>+
>+		/**
>+		 * The meta object literal for the 'Property' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference DATA_SOURCE_TYPE__PROPERTY = eINSTANCE.getDataSourceType_Property();
>+
>+		/**
>+		 * The meta object literal for the 'Login Timeout' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__LOGIN_TIMEOUT = eINSTANCE.getDataSourceType_LoginTimeout();
>+
>+		/**
>+		 * The meta object literal for the 'Transactional' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__TRANSACTIONAL = eINSTANCE.getDataSourceType_Transactional();
>+
>+		/**
>+		 * The meta object literal for the 'Isolation Level' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__ISOLATION_LEVEL = eINSTANCE.getDataSourceType_IsolationLevel();
> 
>-	/**
>-	 * Returns the meta object for data type '{@link java.lang.String Service Ref Protocol Binding Type}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for data type 'Service Ref Protocol Binding Type'.
>-	 * @see java.lang.String
>-	 * @generated
>-	 */
>-	EDataType getServiceRefProtocolBindingType();
>+		/**
>+		 * The meta object literal for the 'Initial Pool Size' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__INITIAL_POOL_SIZE = eINSTANCE.getDataSourceType_InitialPoolSize();
> 
>-	/**
>-	 * Returns the meta object for data type '{@link java.lang.String Service Ref Protocol URI Alias Type}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for data type 'Service Ref Protocol URI Alias Type'.
>-	 * @see java.lang.String
>-	 * @generated
>-	 */
>-	EDataType getServiceRefProtocolURIAliasType();
>+		/**
>+		 * The meta object literal for the 'Max Pool Size' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__MAX_POOL_SIZE = eINSTANCE.getDataSourceType_MaxPoolSize();
> 
>-	/**
>-	 * Returns the meta object for data type '{@link java.lang.String Service Ref Qname Pattern}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for data type 'Service Ref Qname Pattern'.
>-	 * @see java.lang.String
>-	 * @generated
>-	 */
>-	EDataType getServiceRefQnamePattern();
>+		/**
>+		 * The meta object literal for the 'Min Pool Size' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__MIN_POOL_SIZE = eINSTANCE.getDataSourceType_MinPoolSize();
> 
>-	/**
>-	 * Returns the meta object for data type 'True False Type'.
>-	 * 
>-	 * 
>-	 * @return the meta object for data type 'True False Type'.
>-	 * @generated
>-	 */
>-	EDataType getTrueFalseType();
>+		/**
>+		 * The meta object literal for the 'Max Idle Time' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__MAX_IDLE_TIME = eINSTANCE.getDataSourceType_MaxIdleTime();
> 
>-	/**
>-	 * Returns the meta object for data type '{@link java.lang.Boolean True False Type Object}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for data type 'True False Type Object'.
>-	 * @see java.lang.Boolean
>-	 * @generated
>-	 */
>-	EDataType getTrueFalseTypeObject();
>+		/**
>+		 * The meta object literal for the 'Max Statements' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__MAX_STATEMENTS = eINSTANCE.getDataSourceType_MaxStatements();
> 
>-	/**
>-	 * Returns the factory that creates the instances of the model.
>-	 * 
>-	 * 
>-	 * @return the factory that creates the instances of the model.
>-	 * @generated
>-	 */
>-	JavaeeFactory getJavaeeFactory();
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DATA_SOURCE_TYPE__ID = eINSTANCE.getDataSourceType_Id();
> 
>-	/**
>-	 * 
>-	 * Defines literals for the meta objects that represent
>-	 * <ul>
>-	 * <li>each class,</li>
>-	 * <li>each feature of each class,</li>
>-	 * <li>each enum,</li>
>-	 * <li>and each data type</li>
>-	 * </ul>
>-	 * 
>-	 * @generated
>-	 */
>-	interface Literals {
> 		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.DescriptionImpl Description}' class.
> 		 * 
>@@ -4618,6 +5732,14 @@
> 		EReference EJB_LOCAL_REF__INJECTION_TARGETS = eINSTANCE.getEjbLocalRef_InjectionTargets();
> 
> 		/**
>+		 * The meta object literal for the 'Lookup Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute EJB_LOCAL_REF__LOOKUP_NAME = eINSTANCE.getEjbLocalRef_LookupName();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>@@ -4700,6 +5822,14 @@
> 		EReference EJB_REF__INJECTION_TARGETS = eINSTANCE.getEjbRef_InjectionTargets();
> 
> 		/**
>+		 * The meta object literal for the 'Lookup Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute EJB_REF__LOOKUP_NAME = eINSTANCE.getEjbRef_LookupName();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>@@ -4784,6 +5914,14 @@
> 		EReference ENV_ENTRY__INJECTION_TARGETS = eINSTANCE.getEnvEntry_InjectionTargets();
> 
> 		/**
>+		 * The meta object literal for the 'Lookup Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ENV_ENTRY__LOOKUP_NAME = eINSTANCE.getEnvEntry_LookupName();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>@@ -5060,6 +6198,14 @@
> 		EReference MESSAGE_DESTINATION_REF__INJECTION_TARGETS = eINSTANCE.getMessageDestinationRef_InjectionTargets();
> 
> 		/**
>+		 * The meta object literal for the 'Lookup Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute MESSAGE_DESTINATION_REF__LOOKUP_NAME = eINSTANCE.getMessageDestinationRef_LookupName();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>@@ -5176,6 +6322,14 @@
> 		EReference PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS = eINSTANCE.getPersistenceContextRef_InjectionTargets();
> 
> 		/**
>+		 * The meta object literal for the 'Lookup Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute PERSISTENCE_CONTEXT_REF__LOOKUP_NAME = eINSTANCE.getPersistenceContextRef_LookupName();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>@@ -5234,6 +6388,14 @@
> 		EReference PERSISTENCE_UNIT_REF__INJECTION_TARGETS = eINSTANCE.getPersistenceUnitRef_InjectionTargets();
> 
> 		/**
>+		 * The meta object literal for the 'Lookup Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute PERSISTENCE_UNIT_REF__LOOKUP_NAME = eINSTANCE.getPersistenceUnitRef_LookupName();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>@@ -5268,6 +6430,30 @@
> 		EAttribute PORT_COMPONENT_REF__ENABLE_MTOM = eINSTANCE.getPortComponentRef_EnableMtom();
> 
> 		/**
>+		 * The meta object literal for the 'Mtom Threshold' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute PORT_COMPONENT_REF__MTOM_THRESHOLD = eINSTANCE.getPortComponentRef_MtomThreshold();
>+
>+		/**
>+		 * The meta object literal for the 'Addressing' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference PORT_COMPONENT_REF__ADDRESSING = eINSTANCE.getPortComponentRef_Addressing();
>+
>+		/**
>+		 * The meta object literal for the 'Respect Binding' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference PORT_COMPONENT_REF__RESPECT_BINDING = eINSTANCE.getPortComponentRef_RespectBinding();
>+
>+		/**
> 		 * The meta object literal for the 'Port Component Link' attribute feature.
> 		 * 
> 		 * 
>@@ -5368,6 +6554,14 @@
> 		EReference RESOURCE_ENV_REF__INJECTION_TARGETS = eINSTANCE.getResourceEnvRef_InjectionTargets();
> 
> 		/**
>+		 * The meta object literal for the 'Lookup Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute RESOURCE_ENV_REF__LOOKUP_NAME = eINSTANCE.getResourceEnvRef_LookupName();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>@@ -5442,6 +6636,14 @@
> 		EReference RESOURCE_REF__INJECTION_TARGETS = eINSTANCE.getResourceRef_InjectionTargets();
> 
> 		/**
>+		 * The meta object literal for the 'Lookup Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute RESOURCE_REF__LOOKUP_NAME = eINSTANCE.getResourceRef_LookupName();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>@@ -5450,6 +6652,24 @@
> 		EAttribute RESOURCE_REF__ID = eINSTANCE.getResourceRef_Id();
> 
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.RespectBindingTypeImpl Respect Binding Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.RespectBindingTypeImpl
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRespectBindingType()
>+		 * @generated
>+		 */
>+		EClass RESPECT_BINDING_TYPE = eINSTANCE.getRespectBindingType();
>+
>+		/**
>+		 * The meta object literal for the 'Enabled' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute RESPECT_BINDING_TYPE__ENABLED = eINSTANCE.getRespectBindingType_Enabled();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.internal.impl.RunAsImpl Run As}' class.
> 		 * 
> 		 * 
>@@ -5682,6 +6902,14 @@
> 		EReference SERVICE_REF__INJECTION_TARGETS = eINSTANCE.getServiceRef_InjectionTargets();
> 
> 		/**
>+		 * The meta object literal for the 'Lookup Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute SERVICE_REF__LOOKUP_NAME = eINSTANCE.getServiceRef_LookupName();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>@@ -5874,6 +7102,16 @@
> 		EAttribute URL_PATTERN_TYPE__VALUE = eINSTANCE.getUrlPatternType_Value();
> 
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.AddressingResponsesType Addressing Responses Type}' enum.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.core.AddressingResponsesType
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getAddressingResponsesType()
>+		 * @generated
>+		 */
>+		EEnum ADDRESSING_RESPONSES_TYPE = eINSTANCE.getAddressingResponsesType();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.EjbRefType Ejb Ref Type}' enum.
> 		 * 
> 		 * 
>@@ -5884,14 +7122,34 @@
> 		EEnum EJB_REF_TYPE = eINSTANCE.getEjbRefType();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.EnvEntryType Env Entry Type}' enum.
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.GenericBooleanType Generic Boolean Type}' enum.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.core.GenericBooleanType
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getGenericBooleanType()
>+		 * @generated
>+		 */
>+		EEnum GENERIC_BOOLEAN_TYPE = eINSTANCE.getGenericBooleanType();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.IsolationLevelType Isolation Level Type}' enum.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.core.IsolationLevelType
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getIsolationLevelType()
>+		 * @generated
>+		 */
>+		EEnum ISOLATION_LEVEL_TYPE = eINSTANCE.getIsolationLevelType();
>+
>+		/**
>+		 * The meta object literal for the 'Env Entry Type' data type.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.core.EnvEntryType
>+		 * @see java.lang.String
> 		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEnvEntryType()
> 		 * @generated
> 		 */
>-		EEnum ENV_ENTRY_TYPE = eINSTANCE.getEnvEntryType();
>+		EDataType ENV_ENTRY_TYPE = eINSTANCE.getEnvEntryType();
> 
> 		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.core.MessageDestinationUsageType Message Destination Usage Type}' enum.
>@@ -5934,6 +7192,16 @@
> 		EEnum RES_SHARING_SCOPE_TYPE = eINSTANCE.getResSharingScopeType();
> 
> 		/**
>+		 * The meta object literal for the 'Addressing Responses Type Object' data type.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.core.AddressingResponsesType
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getAddressingResponsesTypeObject()
>+		 * @generated
>+		 */
>+		EDataType ADDRESSING_RESPONSES_TYPE_OBJECT = eINSTANCE.getAddressingResponsesTypeObject();
>+
>+		/**
> 		 * The meta object literal for the 'Dewey Version Type' data type.
> 		 * 
> 		 * 
>@@ -5974,24 +7242,24 @@
> 		EDataType EJB_REF_TYPE_OBJECT = eINSTANCE.getEjbRefTypeObject();
> 
> 		/**
>-		 * The meta object literal for the 'Env Entry Type Object' data type.
>+		 * The meta object literal for the 'Fully Qualified Class Type' data type.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.core.EnvEntryType
>-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getEnvEntryTypeObject()
>+		 * @see java.lang.String
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getFullyQualifiedClassType()
> 		 * @generated
> 		 */
>-		EDataType ENV_ENTRY_TYPE_OBJECT = eINSTANCE.getEnvEntryTypeObject();
>+		EDataType FULLY_QUALIFIED_CLASS_TYPE = eINSTANCE.getFullyQualifiedClassType();
> 
> 		/**
>-		 * The meta object literal for the 'Fully Qualified Class Type' data type.
>+		 * The meta object literal for the 'Generic Boolean Type Object' data type.
> 		 * 
> 		 * 
>-		 * @see java.lang.String
>-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getFullyQualifiedClassType()
>+		 * @see org.eclipse.jst.javaee.core.GenericBooleanType
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getGenericBooleanTypeObject()
> 		 * @generated
> 		 */
>-		EDataType FULLY_QUALIFIED_CLASS_TYPE = eINSTANCE.getFullyQualifiedClassType();
>+		EDataType GENERIC_BOOLEAN_TYPE_OBJECT = eINSTANCE.getGenericBooleanTypeObject();
> 
> 		/**
> 		 * The meta object literal for the 'Home' data type.
>@@ -6004,6 +7272,16 @@
> 		EDataType HOME = eINSTANCE.getHome();
> 
> 		/**
>+		 * The meta object literal for the 'Isolation Level Type Object' data type.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.core.IsolationLevelType
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getIsolationLevelTypeObject()
>+		 * @generated
>+		 */
>+		EDataType ISOLATION_LEVEL_TYPE_OBJECT = eINSTANCE.getIsolationLevelTypeObject();
>+
>+		/**
> 		 * The meta object literal for the 'Java Identifier' data type.
> 		 * 
> 		 * 
>@@ -6024,6 +7302,16 @@
> 		EDataType JAVA_TYPE = eINSTANCE.getJavaType();
> 
> 		/**
>+		 * The meta object literal for the 'Jdbc Url Type' data type.
>+		 * 
>+		 * 
>+		 * @see java.lang.String
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getJdbcUrlType()
>+		 * @generated
>+		 */
>+		EDataType JDBC_URL_TYPE = eINSTANCE.getJdbcUrlType();
>+
>+		/**
> 		 * The meta object literal for the 'JNDI Name' data type.
> 		 * 
> 		 * 
>@@ -6104,84 +7392,84 @@
> 		EDataType PERSISTENCE_CONTEXT_TYPE_OBJECT = eINSTANCE.getPersistenceContextTypeObject();
> 
> 		/**
>-		 * The meta object literal for the 'Remote' data type.
>+		 * The meta object literal for the 'Protocol Binding List Type' data type.
> 		 * 
> 		 * 
>-		 * @see java.lang.String
>-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRemote()
>+		 * @see java.util.List
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getProtocolBindingListType()
> 		 * @generated
> 		 */
>-		EDataType REMOTE = eINSTANCE.getRemote();
>+		EDataType PROTOCOL_BINDING_LIST_TYPE = eINSTANCE.getProtocolBindingListType();
> 
> 		/**
>-		 * The meta object literal for the 'Res Auth Type Object' data type.
>+		 * The meta object literal for the 'Protocol Binding Type' data type.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.core.ResAuthType
>-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResAuthTypeObject()
>+		 * @see java.lang.String
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getProtocolBindingType()
> 		 * @generated
> 		 */
>-		EDataType RES_AUTH_TYPE_OBJECT = eINSTANCE.getResAuthTypeObject();
>+		EDataType PROTOCOL_BINDING_TYPE = eINSTANCE.getProtocolBindingType();
> 
> 		/**
>-		 * The meta object literal for the 'Res Sharing Scope Type Object' data type.
>+		 * The meta object literal for the 'Protocol URI Alias Type' data type.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
>-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResSharingScopeTypeObject()
>+		 * @see java.lang.String
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getProtocolURIAliasType()
> 		 * @generated
> 		 */
>-		EDataType RES_SHARING_SCOPE_TYPE_OBJECT = eINSTANCE.getResSharingScopeTypeObject();
>+		EDataType PROTOCOL_URI_ALIAS_TYPE = eINSTANCE.getProtocolURIAliasType();
> 
> 		/**
>-		 * The meta object literal for the 'Role Name' data type.
>+		 * The meta object literal for the 'Qname Pattern' data type.
> 		 * 
> 		 * 
> 		 * @see java.lang.String
>-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRoleName()
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getQnamePattern()
> 		 * @generated
> 		 */
>-		EDataType ROLE_NAME = eINSTANCE.getRoleName();
>+		EDataType QNAME_PATTERN = eINSTANCE.getQnamePattern();
> 
> 		/**
>-		 * The meta object literal for the 'Service Ref Protocol Binding List Type' data type.
>+		 * The meta object literal for the 'Remote' data type.
> 		 * 
> 		 * 
>-		 * @see java.util.List
>-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefProtocolBindingListType()
>+		 * @see java.lang.String
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRemote()
> 		 * @generated
> 		 */
>-		EDataType SERVICE_REF_PROTOCOL_BINDING_LIST_TYPE = eINSTANCE.getServiceRefProtocolBindingListType();
>+		EDataType REMOTE = eINSTANCE.getRemote();
> 
> 		/**
>-		 * The meta object literal for the 'Service Ref Protocol Binding Type' data type.
>+		 * The meta object literal for the 'Res Auth Type Object' data type.
> 		 * 
> 		 * 
>-		 * @see java.lang.String
>-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefProtocolBindingType()
>+		 * @see org.eclipse.jst.javaee.core.ResAuthType
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResAuthTypeObject()
> 		 * @generated
> 		 */
>-		EDataType SERVICE_REF_PROTOCOL_BINDING_TYPE = eINSTANCE.getServiceRefProtocolBindingType();
>+		EDataType RES_AUTH_TYPE_OBJECT = eINSTANCE.getResAuthTypeObject();
> 
> 		/**
>-		 * The meta object literal for the 'Service Ref Protocol URI Alias Type' data type.
>+		 * The meta object literal for the 'Res Sharing Scope Type Object' data type.
> 		 * 
> 		 * 
>-		 * @see java.lang.String
>-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefProtocolURIAliasType()
>+		 * @see org.eclipse.jst.javaee.core.ResSharingScopeType
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getResSharingScopeTypeObject()
> 		 * @generated
> 		 */
>-		EDataType SERVICE_REF_PROTOCOL_URI_ALIAS_TYPE = eINSTANCE.getServiceRefProtocolURIAliasType();
>+		EDataType RES_SHARING_SCOPE_TYPE_OBJECT = eINSTANCE.getResSharingScopeTypeObject();
> 
> 		/**
>-		 * The meta object literal for the 'Service Ref Qname Pattern' data type.
>+		 * The meta object literal for the 'Role Name' data type.
> 		 * 
> 		 * 
> 		 * @see java.lang.String
>-		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getServiceRefQnamePattern()
>+		 * @see org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl#getRoleName()
> 		 * @generated
> 		 */
>-		EDataType SERVICE_REF_QNAME_PATTERN = eINSTANCE.getServiceRefQnamePattern();
>+		EDataType ROLE_NAME = eINSTANCE.getRoleName();
> 
> 		/**
> 		 * The meta object literal for the 'True False Type' data type.
>Index: jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspSwitch.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspSwitch.java,v
>retrieving revision 1.2
>diff -u -r1.2 JspSwitch.java
>--- jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspSwitch.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspSwitch.java	14 Oct 2009 21:44:49 -0000
>@@ -32,7 +32,7 @@
> * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage
> * @generated
> */
>-public class JspSwitch {
>+public class JspSwitch<T> {
> 	/**
> 	 * The cached model package
> 	 * 
>@@ -60,7 +60,7 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	public Object doSwitch(EObject theEObject) {
>+	public T doSwitch(EObject theEObject) {
> 		return doSwitch(theEObject.eClass(), theEObject);
> 	}
> 
>@@ -71,16 +71,16 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	protected Object doSwitch(EClass theEClass, EObject theEObject) {
>+	protected T doSwitch(EClass theEClass, EObject theEObject) {
> 		if (theEClass.eContainer() == modelPackage) {
> 			return doSwitch(theEClass.getClassifierID(), theEObject);
> 		}
> 		else {
>-			List eSuperTypes = theEClass.getESuperTypes();
>+			List<EClass> eSuperTypes = theEClass.getESuperTypes();
> 			return
> 				eSuperTypes.isEmpty() ?
> 					defaultCase(theEObject) :
>-					doSwitch((EClass)eSuperTypes.get(0), theEObject);
>+					doSwitch(eSuperTypes.get(0), theEObject);
> 		}
> 	}
> 
>@@ -91,23 +91,23 @@
> 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
> 	 * @generated
> 	 */
>-	protected Object doSwitch(int classifierID, EObject theEObject) {
>+	protected T doSwitch(int classifierID, EObject theEObject) {
> 		switch (classifierID) {
> 			case JspPackage.JSP_CONFIG: {
> 				JspConfig jspConfig = (JspConfig)theEObject;
>-				Object result = caseJspConfig(jspConfig);
>+				T result = caseJspConfig(jspConfig);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JspPackage.JSP_PROPERTY_GROUP: {
> 				JspPropertyGroup jspPropertyGroup = (JspPropertyGroup)theEObject;
>-				Object result = caseJspPropertyGroup(jspPropertyGroup);
>+				T result = caseJspPropertyGroup(jspPropertyGroup);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case JspPackage.TAG_LIB: {
> 				TagLib tagLib = (TagLib)theEObject;
>-				Object result = caseTagLib(tagLib);
>+				T result = caseTagLib(tagLib);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
>@@ -116,62 +116,62 @@
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Config'.
>+	 * Returns the result of interpreting the object as an instance of 'Config'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Config'.
>+	 * @return the result of interpreting the object as an instance of 'Config'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseJspConfig(JspConfig object) {
>+	public T caseJspConfig(JspConfig object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Property Group'.
>+	 * Returns the result of interpreting the object as an instance of 'Property Group'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Property Group'.
>+	 * @return the result of interpreting the object as an instance of 'Property Group'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseJspPropertyGroup(JspPropertyGroup object) {
>+	public T caseJspPropertyGroup(JspPropertyGroup object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Tag Lib'.
>+	 * Returns the result of interpreting the object as an instance of 'Tag Lib'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'Tag Lib'.
>+	 * @return the result of interpreting the object as an instance of 'Tag Lib'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseTagLib(TagLib object) {
>+	public T caseTagLib(TagLib object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'EObject'.
>+	 * Returns the result of interpreting the object as an instance of 'EObject'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'EObject'.
>+	 * @return the result of interpreting the object as an instance of 'EObject'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> 	 * @generated
> 	 */
>-	public Object defaultCase(EObject object) {
>+	public T defaultCase(EObject object) {
> 		return null;
> 	}
> 
>Index: jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspXMLProcessor.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspXMLProcessor.java,v
>retrieving revision 1.3
>diff -u -r1.3 JspXMLProcessor.java
>--- jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspXMLProcessor.java	9 Jun 2009 19:37:08 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspXMLProcessor.java	14 Oct 2009 21:44:49 -0000
>@@ -14,6 +14,7 @@
> 
> import org.eclipse.emf.ecore.EPackage;
> 
>+import org.eclipse.emf.ecore.resource.Resource;
> import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
> 
> import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
>@@ -43,7 +44,7 @@
> 	 * @generated
> 	 */
> 	@Override
>-	protected Map getRegistrations() {
>+	protected Map<String, Resource.Factory> getRegistrations() {
> 		if (registrations == null) {
> 			super.getRegistrations();
> 			registrations.put(XML_EXTENSION, new JspResourceFactoryImpl());
>Index: jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspAdapterFactory.java,v
>retrieving revision 1.3
>diff -u -r1.3 JspAdapterFactory.java
>--- jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspAdapterFactory.java	9 Jun 2009 19:37:08 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/jsp/internal/util/JspAdapterFactory.java	14 Oct 2009 21:44:49 -0000
>@@ -70,27 +70,27 @@
> 	}
> 
> 	/**
>-	 * The switch the delegates to the <code>createXXX</code> methods.
>+	 * The switch that delegates to the <code>createXXX</code> methods.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	protected JspSwitch modelSwitch =
>-		new JspSwitch() {
>+	protected JspSwitch<Adapter> modelSwitch =
>+		new JspSwitch<Adapter>() {
> 			@Override
>-			public Object caseJspConfig(JspConfig object) {
>+			public Adapter caseJspConfig(JspConfig object) {
> 				return createJspConfigAdapter();
> 			}
> 			@Override
>-			public Object caseJspPropertyGroup(JspPropertyGroup object) {
>+			public Adapter caseJspPropertyGroup(JspPropertyGroup object) {
> 				return createJspPropertyGroupAdapter();
> 			}
> 			@Override
>-			public Object caseTagLib(TagLib object) {
>+			public Adapter caseTagLib(TagLib object) {
> 				return createTagLibAdapter();
> 			}
> 			@Override
>-			public Object defaultCase(EObject object) {
>+			public Adapter defaultCase(EObject object) {
> 				return createEObjectAdapter();
> 			}
> 		};
>@@ -105,7 +105,7 @@
> 	 */
> 	@Override
> 	public Adapter createAdapter(Notifier target) {
>-		return (Adapter)modelSwitch.doSwitch((EObject)target);
>+		return modelSwitch.doSwitch((EObject)target);
> 	}
> 
> 
>Index: jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClientDeploymentDescriptor.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClientDeploymentDescriptor.java,v
>retrieving revision 1.2
>diff -u -r1.2 ApplicationClientDeploymentDescriptor.java
>--- jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClientDeploymentDescriptor.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClientDeploymentDescriptor.java	14 Oct 2009 21:44:47 -0000
>@@ -65,7 +65,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClientDeploymentDescriptor_XMLNSPrefixMap()
> 	 * @generated
> 	 */
>-	Map getXMLNSPrefixMap();
>+	Map<String, String> getXMLNSPrefixMap();
> 
> 	/**
> 	 * Returns the value of the 'XSI Schema Location' map.
>@@ -81,7 +81,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClientDeploymentDescriptor_XSISchemaLocation()
> 	 * @generated
> 	 */
>-	Map getXSISchemaLocation();
>+	Map<String, String> getXSISchemaLocation();
> 
> 	/**
> 	 * Returns the value of the 'Application Client' containment reference.
>@@ -90,12 +90,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	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.
>-	 * 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5, Application Client 5
> 	 * 
> 	 * 
> 	 * @return the value of the 'Application Client' containment reference.
>Index: jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClient.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClient.java,v
>retrieving revision 1.2
>diff -u -r1.2 ApplicationClient.java
>--- jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClient.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/applicationclient/ApplicationClient.java	14 Oct 2009 21:44:47 -0000
>@@ -12,7 +12,20 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.DataSourceType;
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.DisplayName;
>+import org.eclipse.jst.javaee.core.EjbRef;
>+import org.eclipse.jst.javaee.core.EnvEntry;
>+import org.eclipse.jst.javaee.core.Icon;
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.LifecycleCallback;
>+import org.eclipse.jst.javaee.core.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;
> 
> /**
> * 
>@@ -22,6 +35,7 @@
> * 
> * The following features are supported:
> * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getModuleName Module Name}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDescriptions Descriptions}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDisplayNames Display Names}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getIcons Icons}</li>
>@@ -36,6 +50,7 @@
> * <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getPreDestroys Pre Destroys}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getCallbackHandler Callback Handler}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getMessageDestinations Message Destinations}</li>
>+ * <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDataSource Data Source}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getId Id}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#isMetadataComplete Metadata Complete}</li>
> * <li>{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getVersion Version}</li>
>@@ -48,6 +63,32 @@
> */
> public interface ApplicationClient extends JavaEEObject {
> 	/**
>+	 * Returns the value of the 'Module Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application Client 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Module Name' attribute.
>+	 * @see #setModuleName(String)
>+	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_ModuleName()
>+	 * @generated
>+	 */
>+	String getModuleName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getModuleName Module Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Module Name' attribute.
>+	 * @see #getModuleName()
>+	 * @generated
>+	 */
>+	void setModuleName(String value);
>+
>+	/**
> 	 * Returns the value of the 'Descriptions' containment reference list.
> 	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
> 	 * 
>@@ -60,7 +101,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -75,7 +116,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -90,7 +131,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
> 
> 	/**
> 	 * Returns the value of the 'Env Entries' containment reference list.
>@@ -105,7 +146,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_EnvEntries()
> 	 * @generated
> 	 */
>-	List getEnvEntries();
>+	List<EnvEntry> getEnvEntries();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Refs' containment reference list.
>@@ -120,7 +161,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_EjbRefs()
> 	 * @generated
> 	 */
>-	List getEjbRefs();
>+	List<EjbRef> getEjbRefs();
> 
> 	/**
> 	 * Returns the value of the 'Service Refs' containment reference list.
>@@ -135,7 +176,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_ServiceRefs()
> 	 * @generated
> 	 */
>-	List getServiceRefs();
>+	List<ServiceRef> getServiceRefs();
> 
> 	/**
> 	 * Returns the value of the 'Resource Refs' containment reference list.
>@@ -150,7 +191,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_ResourceRefs()
> 	 * @generated
> 	 */
>-	List getResourceRefs();
>+	List<ResourceRef> getResourceRefs();
> 
> 	/**
> 	 * Returns the value of the 'Resource Env Refs' containment reference list.
>@@ -165,7 +206,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_ResourceEnvRefs()
> 	 * @generated
> 	 */
>-	List getResourceEnvRefs();
>+	List<ResourceEnvRef> getResourceEnvRefs();
> 
> 	/**
> 	 * Returns the value of the 'Message Destination Refs' containment reference list.
>@@ -180,7 +221,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_MessageDestinationRefs()
> 	 * @generated
> 	 */
>-	List getMessageDestinationRefs();
>+	List<MessageDestinationRef> getMessageDestinationRefs();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Unit Refs' containment reference list.
>@@ -195,7 +236,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_PersistenceUnitRefs()
> 	 * @generated
> 	 */
>-	List getPersistenceUnitRefs();
>+	List<PersistenceUnitRef> getPersistenceUnitRefs();
> 
> 	/**
> 	 * Returns the value of the 'Post Constructs' containment reference list.
>@@ -210,7 +251,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_PostConstructs()
> 	 * @generated
> 	 */
>-	List getPostConstructs();
>+	List<LifecycleCallback> getPostConstructs();
> 
> 	/**
> 	 * Returns the value of the 'Pre Destroys' containment reference list.
>@@ -225,7 +266,7 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_PreDestroys()
> 	 * @generated
> 	 */
>-	List getPreDestroys();
>+	List<LifecycleCallback> getPreDestroys();
> 
> 	/**
> 	 * Returns the value of the 'Callback Handler' attribute.
>@@ -234,15 +275,16 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 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.
>-	 * 
>-	 * 	 
>+	 * 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.
>+	 * 
>+	 * @since Java EE 5, Application Client 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Callback Handler' attribute.
> 	 * @see #setCallbackHandler(String)
>@@ -274,7 +316,23 @@
> 	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_MessageDestinations()
> 	 * @generated
> 	 */
>-	List getMessageDestinations();
>+	List<MessageDestination> getMessageDestinations();
>+
>+	/**
>+	 * Returns the value of the 'Data Source' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DataSourceType}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, Application Client 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Data Source' containment reference list.
>+	 * @see org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage#getApplicationClient_DataSource()
>+	 * @generated
>+	 */
>+	List<DataSourceType> getDataSource();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>@@ -308,25 +366,26 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The metadata-complete attribute defines whether this
>-	 * 	 deployment descriptor and other related deployment
>-	 * 	 descriptors for this module (e.g., web service
>-	 * 	 descriptors) are complete, or whether the class
>-	 * 	 files available to this module and packaged with
>-	 * 	 this application should be examined for annotations
>-	 * 	 that specify deployment information.
>-	 * 
>-	 * 	 If metadata-complete is set to "true", the deployment
>-	 * 	 tool must ignore any annotations that specify deployment
>-	 * 	 information, which might be present in the class files
>-	 * 	 of the application.
>-	 * 
>-	 * 	 If metadata-complete is not specified or is set to
>-	 * 	 "false", the deployment tool must examine the class
>-	 * 	 files of the application for annotations, as
>-	 * 	 specified by the specifications.
>-	 * 
>-	 * 	
>+	 * The metadata-complete attribute defines whether this
>+	 * deployment descriptor and other related deployment
>+	 * descriptors for this module (e.g., web service
>+	 * descriptors) are complete, or whether the class
>+	 * files available to this module and packaged with
>+	 * this application should be examined for annotations
>+	 * that specify deployment information.
>+	 * 
>+	 * If metadata-complete is set to "true", the deployment
>+	 * tool must ignore any annotations that specify deployment
>+	 * information, which might be present in the class files
>+	 * of the application.
>+	 * 
>+	 * If metadata-complete is not specified or is set to
>+	 * "false", the deployment tool must examine the class
>+	 * files of the application for annotations, as
>+	 * specified by the specifications.
>+	 * 
>+	 * @since Java EE 5, Application Client 5
>+	 * 
> 	 * 
> 	 * @return the value of the 'Metadata Complete' attribute.
> 	 * @see #isSetMetadataComplete()
>@@ -374,15 +433,15 @@
> 
> 	/**
> 	 * Returns the value of the 'Version' attribute.
>-	 * The default value is <code>"5"</code>.
>+	 * The default value is <code>"6"</code>.
> 	 * 
> 	 * 
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The required value for the version is 5.
>-	 * 
>-	 * 	
>+	 * The required value for the version is 6.
>+	 * 
>+	 * 
> 	 * 
> 	 * @return the value of the 'Version' attribute.
> 	 * @see #isSetVersion()
>Index: jee-models/org/eclipse/jst/javaee/jsp/TagLib.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/TagLib.java,v
>retrieving revision 1.2
>diff -u -r1.2 TagLib.java
>--- jee-models/org/eclipse/jst/javaee/jsp/TagLib.java	26 Jul 2007 16:56:14 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/jsp/TagLib.java	14 Oct 2009 21:44:48 -0000
>@@ -26,6 +26,7 @@
> * 	to override implicit map entries from TLD files and
> * 	from the container.
> * 
>+ * 	@since Java EE 5, JSP 2.1
> * 
> * 
> *
>@@ -57,6 +58,7 @@
> 	 * 	 There should be no entries in web.xml with the
> 	 * 	 same taglib-uri value.
> 	 * 
>+	 * 	 @since Java EE 5, JSP 2.1
> 	 * 	 
> 	 * 
> 	 * @return the value of the 'Taglib Uri' attribute.
>@@ -88,6 +90,7 @@
> 	 * 	 application) where to find the Tag Library
> 	 * 	 Description file for the tag library.
> 	 * 
>+	 * 	 @since Java EE 5, JSP 2.1
> 	 * 	 
> 	 * 
> 	 * @return the value of the 'Taglib Location' attribute.
>Index: jee-models/org/eclipse/jst/javaee/jsp/JspConfig.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/JspConfig.java,v
>retrieving revision 1.2
>diff -u -r1.2 JspConfig.java
>--- jee-models/org/eclipse/jst/javaee/jsp/JspConfig.java	26 Jul 2007 16:56:15 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/jsp/JspConfig.java	14 Oct 2009 21:44:48 -0000
>@@ -26,6 +26,7 @@
> * 	information for the JSP files in a web application. It has
> * 	two subelements, taglib and jsp-property-group.
> * 
>+ * 	@since Java EE 5, JSP 2.1
> * 
> * 
> *
>@@ -56,7 +57,7 @@
> 	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspConfig_TagLibs()
> 	 * @generated
> 	 */
>-	List getTagLibs();
>+	List<TagLib> getTagLibs();
> 
> 	/**
> 	 * Returns the value of the 'Jsp Property Groups' containment reference list.
>@@ -71,7 +72,7 @@
> 	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspConfig_JspPropertyGroups()
> 	 * @generated
> 	 */
>-	List getJspPropertyGroups();
>+	List<JspPropertyGroup> getJspPropertyGroups();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/jsp/JspPropertyGroup.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/JspPropertyGroup.java,v
>retrieving revision 1.2
>diff -u -r1.2 JspPropertyGroup.java
>--- jee-models/org/eclipse/jst/javaee/jsp/JspPropertyGroup.java	26 Jul 2007 16:56:14 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/jsp/JspPropertyGroup.java	14 Oct 2009 21:44:48 -0000
>@@ -12,7 +12,11 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.DisplayName;
>+import org.eclipse.jst.javaee.core.Icon;
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.UrlPatternType;
> 
> /**
> * 
>@@ -36,7 +40,12 @@
> * when used as a String literal.
> * - Control whether template text containing only
> * whitespaces must be removed from the response output.
>+ * 	 - Indicate the default contentType information.
>+ * 	 - Indicate the default buffering model for JspWriter
>+ * 	 - Control whether error should be raised for the use of
>+ * 	 undeclared namespaces in a JSP page.
> * 
>+ * 	@since Java EE 5, JSP 2.1
> * 
> * 
> *
>@@ -55,6 +64,9 @@
> * <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getIncludeCodas Include Codas}</li>
> * <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isDeferredSyntaxAllowedAsLiteral Deferred Syntax Allowed As Literal}</li>
> * <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isTrimDirectiveWhitespaces Trim Directive Whitespaces}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getDefaultContentType Default Content Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getBuffer Buffer}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isErrorOnUndeclaredNamespace Error On Undeclared Namespace}</li>
> * <li>{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getId Id}</li>
> * </ul>
> * 
>@@ -77,7 +89,7 @@
> 	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -92,7 +104,7 @@
> 	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -107,7 +119,7 @@
> 	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
> 
> 	/**
> 	 * Returns the value of the 'Url Patterns' containment reference list.
>@@ -122,7 +134,7 @@
> 	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_UrlPatterns()
> 	 * @generated
> 	 */
>-	List getUrlPatterns();
>+	List<UrlPatternType> getUrlPatterns();
> 
> 	/**
> 	 * Returns the value of the 'El Ignored' attribute.
>@@ -137,6 +149,7 @@
> 	 * 	 a Servlet 2.4 or greater web.xml, and disabled
> 	 * 	 otherwise.
> 	 * 
>+	 * 	 @since Java EE 5, JSP 2.1
> 	 * 	 
> 	 * 
> 	 * @return the value of the 'El Ignored' attribute.
>@@ -202,6 +215,7 @@
> 	 * 	 It is legal to name the same encoding through
> 	 * 	 mulitple mechanisms.
> 	 * 
>+	 * 	 @since Java EE 5, JSP 2.1
> 	 * 	 
> 	 * 
> 	 * @return the value of the 'Page Encoding' attribute.
>@@ -232,6 +246,7 @@
> 	 * 	 group of JSP pages. By default, scripting is
> 	 * 	 enabled.
> 	 * 
>+	 * 	 @since Java EE 5, JSP 2.1
> 	 * 	 
> 	 * 
> 	 * @return the value of the 'Scripting Invalid' attribute.
>@@ -292,6 +307,7 @@
> 	 * 	 be JSP documents, unless there is another
> 	 * 	 property group that indicates otherwise.
> 	 * 
>+	 * 	 @since Java EE 5, JSP 2.1
> 	 * 	 
> 	 * 
> 	 * @return the value of the 'Is Xml' attribute.
>@@ -353,13 +369,14 @@
> 	 * 	 in an include directive) at the beginning of each
> 	 * 	 JSP page in this jsp-property-group.
> 	 * 
>+	 * 	 @since Java EE 5, JSP 2.1
> 	 * 	 
> 	 * 
> 	 * @return the value of the 'Include Preludes' attribute list.
> 	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_IncludePreludes()
> 	 * @generated
> 	 */
>-	List getIncludePreludes();
>+	List<String> getIncludePreludes();
> 
> 	/**
> 	 * Returns the value of the 'Include Codas' attribute list.
>@@ -376,13 +393,14 @@
> 	 * 	 in an include directive) at the end of each
> 	 * 	 JSP page in this jsp-property-group.
> 	 * 
>+	 * 	 @since Java EE 5, JSP 2.1
> 	 * 	 
> 	 * 
> 	 * @return the value of the 'Include Codas' attribute list.
> 	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_IncludeCodas()
> 	 * @generated
> 	 */
>-	List getIncludeCodas();
>+	List<String> getIncludeCodas();
> 
> 	/**
> 	 * Returns the value of the 'Deferred Syntax Allowed As Literal' attribute.
>@@ -397,6 +415,7 @@
> 	 * this element is enabled (true). Disabled (false) by
> 	 * default.
> 	 * 
>+	 * @since Java EE 5, JSP 2.1
> 	 * 	 
> 	 * 
> 	 * @return the value of the 'Deferred Syntax Allowed As Literal' attribute.
>@@ -455,6 +474,7 @@
> 	 * effect on JSP documents (XML syntax). Disabled (false)
> 	 * by default.
> 	 * 
>+	 * @since Java EE 5, JSP 2.1
> 	 * 	 
> 	 * 
> 	 * @return the value of the 'Trim Directive Whitespaces' attribute.
>@@ -502,6 +522,130 @@
> 	boolean isSetTrimDirectiveWhitespaces();
> 
> 	/**
>+	 * Returns the value of the 'Default Content Type' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The valid values of default-content-type are those of the
>+	 * contentType page directive. It specifies the default
>+	 * response contentType if the page directive does not include
>+	 * a contentType attribute.
>+	 * 
>+	 * @since Java EE 6, JSP 2.2
>+	 * 
>+	 * 
>+	 * @return the value of the 'Default Content Type' attribute.
>+	 * @see #setDefaultContentType(String)
>+	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_DefaultContentType()
>+	 * @generated
>+	 */
>+	String getDefaultContentType();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getDefaultContentType Default Content Type}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Default Content Type' attribute.
>+	 * @see #getDefaultContentType()
>+	 * @generated
>+	 */
>+	void setDefaultContentType(String value);
>+
>+	/**
>+	 * Returns the value of the 'Buffer' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The valid values of buffer are those of the
>+	 * buffer page directive. It specifies if buffering should be
>+	 * used for the output to response, and if so, the size of the
>+	 * buffer to use.
>+	 * 
>+	 * @since Java EE 6, JSP 2.2
>+	 * 
>+	 * 
>+	 * @return the value of the 'Buffer' attribute.
>+	 * @see #setBuffer(String)
>+	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_Buffer()
>+	 * @generated
>+	 */
>+	String getBuffer();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#getBuffer Buffer}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Buffer' attribute.
>+	 * @see #getBuffer()
>+	 * @generated
>+	 */
>+	void setBuffer(String value);
>+
>+	/**
>+	 * Returns the value of the 'Error On Undeclared Namespace' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The default behavior when a tag with unknown namespace is used
>+	 * in a JSP page (regular syntax) is to silently ignore it. If
>+	 * set to true, then an error must be raised during the translation
>+	 * time when an undeclared tag is used in a JSP page. Disabled
>+	 * (false) by default.
>+	 * 
>+	 * @since Java EE 6, JSP 2.2
>+	 * 
>+	 * 
>+	 * @return the value of the 'Error On Undeclared Namespace' attribute.
>+	 * @see #isSetErrorOnUndeclaredNamespace()
>+	 * @see #unsetErrorOnUndeclaredNamespace()
>+	 * @see #setErrorOnUndeclaredNamespace(boolean)
>+	 * @see org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage#getJspPropertyGroup_ErrorOnUndeclaredNamespace()
>+	 * @generated
>+	 */
>+	boolean isErrorOnUndeclaredNamespace();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isErrorOnUndeclaredNamespace Error On Undeclared Namespace}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Error On Undeclared Namespace' attribute.
>+	 * @see #isSetErrorOnUndeclaredNamespace()
>+	 * @see #unsetErrorOnUndeclaredNamespace()
>+	 * @see #isErrorOnUndeclaredNamespace()
>+	 * @generated
>+	 */
>+	void setErrorOnUndeclaredNamespace(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isErrorOnUndeclaredNamespace Error On Undeclared Namespace}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetErrorOnUndeclaredNamespace()
>+	 * @see #isErrorOnUndeclaredNamespace()
>+	 * @see #setErrorOnUndeclaredNamespace(boolean)
>+	 * @generated
>+	 */
>+	void unsetErrorOnUndeclaredNamespace();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jsp.JspPropertyGroup#isErrorOnUndeclaredNamespace Error On Undeclared Namespace}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Error On Undeclared Namespace' attribute is set.
>+	 * @see #unsetErrorOnUndeclaredNamespace()
>+	 * @see #isErrorOnUndeclaredNamespace()
>+	 * @see #setErrorOnUndeclaredNamespace(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetErrorOnUndeclaredNamespace();
>+
>+	/**
> 	 * Returns the value of the 'Id' attribute.
> 	 * 
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java,v
>retrieving revision 1.2
>diff -u -r1.2 ApplicationclientPackage.java
>--- jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java	26 Jul 2007 16:56:17 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java	14 Oct 2009 21:44:47 -0000
>@@ -29,267 +29,245 @@
> * 
> * 
> * 
>- * @(#)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.
> * 
>+ * $Id: application-client_6.xsd,v 1.4 2009/10/02 16:04:08 ccc Exp $
>+ * 
> * 
> * 
>+ * <![CDATA[[
>+ * This is the XML Schema for the application client 6
>+ * 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:
> * 
>- * 
>- * 	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
>- * 
>- * 	
>+ * http://java.sun.com/xml/ns/javaee
>+ * 
>+ * and indicate the version of the schema by
>+ * using the version element as shown below:
>+ * 
>+ * <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_6.xsd"
>+ * version="6">
>+ * ...
>+ * </application-client>
>+ * 
>+ * 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_6.xsd
>+ * 
>+ * ]]>
> * 
> * 
> * 
> * The following conventions apply to all Java EE
> * deployment descriptor elements unless indicated otherwise.
>- * 
>+ * 
> * - In elements that specify a pathname to a file within the
>- * 	same JAR file, relative filenames (i.e., those not
>- * 	starting with "/") are considered relative to the root of
>- * 	the JAR file's namespace. Absolute filenames (i.e., those
>- * 	starting with "/") also specify names in the root of the
>- * 	JAR file's namespace. In general, relative names are
>- * 	preferred. The exception is .war files where absolute
>- * 	names are preferred for consistency with the Servlet API.
>- * 
>- * 
>- * 
>- * @(#)javaee_5.xsds	1.65 06/02/17
>+ * same JAR file, relative filenames (i.e., those not
>+ * starting with "/") are considered relative to the root of
>+ * the JAR file's namespace. Absolute filenames (i.e., those
>+ * starting with "/") also specify names in the root of the
>+ * JAR file's namespace. In general, relative names are
>+ * preferred. The exception is .war files where absolute
>+ * names are preferred for consistency with the Servlet API.
>+ * 
> * 
> * 
> * 
>- * Copyright 2003-2006 Sun Microsystems, Inc.
>- * 4150 Network Circle
>- * Santa Clara, California 95054
>- * U.S.A
>- * All rights reserved.
>- * 
>- * Sun Microsystems, Inc. has intellectual property rights
>- * relating to technology described in this document. In
>- * particular, and without limitation, these intellectual
>- * property rights may include one or more of the U.S. patents
>- * listed at http://www.sun.com/patents and one or more
>- * additional patents or pending patent applications in the
>- * U.S. and other countries.
>- * 
>- * This document and the technology which it describes are
>- * distributed under licenses restricting their use, copying,
>- * distribution, and decompilation. No part of this document
>- * may be reproduced in any form by any means without prior
>- * written authorization of Sun and its licensors, if any.
>- * 
>- * Third-party software, including font technology, is
>- * copyrighted and licensed from Sun suppliers.
>- * 
>- * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
>- * JavaServer Pages, Enterprise JavaBeans and the Java Coffee
>- * Cup logo are trademarks or registered trademarks of Sun
>- * Microsystems, Inc. in the U.S. and other countries.
>- * 
>- * Federal Acquisitions: Commercial Software - Government Users
>- * Subject to Standard License Terms and Conditions.
>- * 
>+ * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
>+ * 
> * 
> * 
> * 
>- * The following definitions that appear in the common
>- * shareable schema(s) of J2EE deployment descriptors should be
>- * interpreted with respect to the context they are included:
>- * 
>- * Deployment Component may indicate one of the following:
>- * j2ee application;
>- * application client;
>- * web application;
>- * enterprise bean;
>- * resource adapter;
>- * 
>- * Deployment File may indicate one of the following:
>- * ear file;
>- * war file;
>- * jar file;
>- * rar file;
>- * 
>- * 
>- * 
>- * @(#)javaee_web_services_client_1_2.xsds	1.19 02/13/06
>+ * The following definitions that appear in the common
>+ * shareable schema(s) of Java EE deployment descriptors should be
>+ * interpreted with respect to the context they are included:
>+ * 
>+ * Deployment Component may indicate one of the following:
>+ * java ee application;
>+ * application client;
>+ * web application;
>+ * enterprise bean;
>+ * resource adapter; 
>+ * 
>+ * Deployment File may indicate one of the following:
>+ * ear file;
>+ * war file;
>+ * jar file;
>+ * rar file;
>+ * 
> * 
> * 
> * 
>- * Copyright 2003-2006 Sun Microsystems, Inc.
>- * 4150 Network Circle
>- * Santa Clara, California 95054
>- * U.S.A
>- * All rights reserved.
>- * 
>- * Sun Microsystems, Inc. has intellectual property rights
>- * relating to technology described in this document. In
>- * particular, and without limitation, these intellectual
>- * property rights may include one or more of the U.S. patents
>- * listed at http://www.sun.com/patents and one or more
>- * additional patents or pending patent applications in the
>- * U.S. and other countries.
>- * 
>- * This document and the technology which it describes are
>- * distributed under licenses restricting their use, copying,
>- * distribution, and decompilation. No part of this document
>- * may be reproduced in any form by any means without prior
>- * written authorization of Sun and its licensors, if any.
>- * 
>- * Third-party software, including font technology, is
>- * copyrighted and licensed from Sun suppliers.
>- * 
>- * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
>- * JavaServer Pages, Enterprise JavaBeans and the Java Coffee
>- * Cup logo are trademarks or registered trademarks of Sun
>- * Microsystems, Inc. in the U.S. and other countries.
>- * 
>- * Federal Acquisitions: Commercial Software - Government Users
>- * Subject to Standard License Terms and Conditions.
>- * 
>+ * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
>+ * 
> * 
> * 
> * 
> * (C) Copyright International Business Machines Corporation 2002
>- * 
>+ * 
> * 
> * 
>- * See http://www.w3.org/XML/1998/namespace.html and
>- * http://www.w3.org/TR/REC-xml for information about this namespace.
>+ * <div xmlns="http://www.w3.org/1999/xhtml">
>+ * <h1>About the XML namespace</h1>
> * 
>- * This schema document describes the XML namespace, in a form
>- * suitable for import by other schema documents. 
>+ * <div class="bodytext">
>+ * 
>+ * This schema document describes the XML namespace, in a form
>+ * suitable for import by other schema documents.
>+ * 
>+ * 
>+ * See <a href="http://www.w3.org/XML/1998/namespace.html">
>+ * http://www.w3.org/XML/1998/namespace.html</a> and
>+ * <a href="http://www.w3.org/TR/REC-xml">
>+ * http://www.w3.org/TR/REC-xml</a> for information 
>+ * about this namespace.
>+ * 
>+ * 
>+ * Note that local names in this namespace are intended to be
>+ * defined only by the World Wide Web Consortium or its subgroups.
>+ * The names currently defined in this namespace are listed below.
>+ * They should not be used with conflicting semantics by any Working
>+ * Group, specification, or document instance.
>+ * 
>+ * 
>+ * See further below in this document for more information about <a href="#usage">how to refer to this schema document from your own
>+ * XSD schema documents</a> and about <a href="#nsversioning">the
>+ * namespace-versioning policy governing this schema document</a>.
>+ * 
>+ * </div>
>+ * </div>
>+ * 
> * 
>- * 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.
>+ * <div xmlns="http://www.w3.org/1999/xhtml">
>+ * 
>+ * <h3>Father (in any context at all)</h3> 
>+ * 
>+ * <div class="bodytext">
>+ * 
>+ * denotes Jon Bosak, the chair of 
>+ * the original XML Working Group. This name is reserved by 
>+ * the following decision of the W3C XML Plenary and 
>+ * XML Coordination groups:
>+ * 
>+ * <blockquote>
>+ * 
>+ * 	In appreciation for his vision, leadership and
>+ * 	dedication the W3C XML Plenary on this 10th day of
>+ * 	February, 2000, reserves for Jon Bosak in perpetuity
>+ * 	the XML name "xml:Father".
>+ * 
>+ * </blockquote>
>+ * </div>
>+ * </div>
> * 
>- * space (as an attribute name): denotes an attribute whose
>- * value is a keyword indicating what whitespace processing
>- * discipline is intended for the content of the element; its
>- * value is inherited. This name is reserved by virtue of its
>- * definition in the XML specification.
>- * 
>- * Father (in any context at all): denotes Jon Bosak, the chair of 
>- * the original XML Working Group. This name is reserved by 
>- * the following decision of the W3C XML Plenary and 
>- * XML Coordination groups:
>- * 
>- * In appreciation for his vision, leadership and dedication
>- * the W3C XML Plenary on this 10th day of February, 2000
>- * reserves for Jon Bosak in perpetuity the XML name
>- * xml:Father
>+ * 
>+ * <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml">
>+ * <h2>
>+ * <a name="usage">About this schema document</a>
>+ * </h2>
>+ * 
>+ * <div class="bodytext">
>+ * 
>+ * This schema defines attributes and an attribute group suitable
>+ * for use by schemas wishing to allow <code>xml:base</code>,
>+ * <code>xml:lang</code>, <code>xml:space</code> or
>+ * <code>xml:id</code> attributes on elements they define.
>+ * 
>+ * 
>+ * To enable this, such a schema must import this schema for
>+ * the XML namespace, e.g. as follows:
>+ * 
>+ * <pre>
>+ * &lt;schema . . .&gt;
>+ * . . .
>+ * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>+ * schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
>+ * </pre>
>+ * 
>+ * or
>+ * 
>+ * <pre>
>+ * &lt;import namespace="http://www.w3.org/XML/1998/namespace"
>+ * schemaLocation="http://www.w3.org/2009/01/xml.xsd"/&gt;
>+ * </pre>
>+ * 
>+ * Subsequently, qualified reference to any of the attributes or the
>+ * group defined below will have the desired effect, e.g.
>+ * 
>+ * <pre>
>+ * &lt;type . . .&gt;
>+ * . . .
>+ * &lt;attributeGroup ref="xml:specialAttrs"/&gt;
>+ * </pre>
>+ * 
>+ * will define a type which will schema-validate an instance element
>+ * with any of those attributes.
>+ * 
>+ * </div>
>+ * </div>
> * 
>- * 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.
>+ * 
>+ * <div id="nsversioning" xml:id="nsversioning" xmlns="http://www.w3.org/1999/xhtml">
>+ * <h2>
>+ * <a name="nsversioning">Versioning policy for this schema document</a>
>+ * </h2>
>+ * <div class="bodytext">
>+ * 
>+ * In keeping with the XML Schema WG's standard versioning
>+ * policy, this schema document will persist at
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * http://www.w3.org/2009/01/xml.xsd</a>.
>+ * 
>+ * 
>+ * At the date of issue it can also be found at
>+ * <a href="http://www.w3.org/2001/xml.xsd">
>+ * http://www.w3.org/2001/xml.xsd</a>.
>+ * 
>+ * 
>+ * The schema document at that URI may however change in the future,
>+ * in order to remain compatible with the latest version of XML
>+ * Schema itself, or with the XML namespace itself. In other words,
>+ * if the XML Schema or XML namespaces change, the version of this
>+ * document at <a href="http://www.w3.org/2001/xml.xsd">
>+ * http://www.w3.org/2001/xml.xsd 
>+ * </a> 
>+ * will change accordingly; the version at 
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * http://www.w3.org/2009/01/xml.xsd 
>+ * </a> 
>+ * will not change.
>+ * 
>+ * 
>+ * Previous dated (and unchanging) versions of this schema 
>+ * document are at:
>+ * 
>+ * <ul>
>+ * <li>
>+ * <a href="http://www.w3.org/2009/01/xml.xsd">
>+ * 	http://www.w3.org/2009/01/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2007/08/xml.xsd">
>+ * 	http://www.w3.org/2007/08/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2004/10/xml.xsd">
>+ * 	http://www.w3.org/2004/10/xml.xsd</a>
>+ * </li>
>+ * <li>
>+ * <a href="http://www.w3.org/2001/03/xml.xsd">
>+ * 	http://www.w3.org/2001/03/xml.xsd</a>
>+ * </li>
>+ * </ul>
>+ * </div>
>+ * </div>
> * 
> * 
> * @see org.eclipse.jst.javaee.applicationclient.ApplicationclientFactory
>@@ -338,13 +316,22 @@
> 	int APPLICATION_CLIENT = 0;
> 
> 	/**
>+	 * The feature id for the 'Module Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION_CLIENT__MODULE_NAME = 0;
>+
>+	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__DESCRIPTIONS = 0;
>+	int APPLICATION_CLIENT__DESCRIPTIONS = 1;
> 
> 	/**
> 	 * The feature id for the 'Display Names' containment reference list.
>@@ -353,7 +340,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__DISPLAY_NAMES = 1;
>+	int APPLICATION_CLIENT__DISPLAY_NAMES = 2;
> 
> 	/**
> 	 * The feature id for the 'Icons' containment reference list.
>@@ -362,7 +349,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__ICONS = 2;
>+	int APPLICATION_CLIENT__ICONS = 3;
> 
> 	/**
> 	 * The feature id for the 'Env Entries' containment reference list.
>@@ -371,7 +358,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__ENV_ENTRIES = 3;
>+	int APPLICATION_CLIENT__ENV_ENTRIES = 4;
> 
> 	/**
> 	 * The feature id for the 'Ejb Refs' containment reference list.
>@@ -380,7 +367,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__EJB_REFS = 4;
>+	int APPLICATION_CLIENT__EJB_REFS = 5;
> 
> 	/**
> 	 * The feature id for the 'Service Refs' containment reference list.
>@@ -389,7 +376,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__SERVICE_REFS = 5;
>+	int APPLICATION_CLIENT__SERVICE_REFS = 6;
> 
> 	/**
> 	 * The feature id for the 'Resource Refs' containment reference list.
>@@ -398,7 +385,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__RESOURCE_REFS = 6;
>+	int APPLICATION_CLIENT__RESOURCE_REFS = 7;
> 
> 	/**
> 	 * The feature id for the 'Resource Env Refs' containment reference list.
>@@ -407,7 +394,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__RESOURCE_ENV_REFS = 7;
>+	int APPLICATION_CLIENT__RESOURCE_ENV_REFS = 8;
> 
> 	/**
> 	 * The feature id for the 'Message Destination Refs' containment reference list.
>@@ -416,7 +403,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS = 8;
>+	int APPLICATION_CLIENT__MESSAGE_DESTINATION_REFS = 9;
> 
> 	/**
> 	 * The feature id for the 'Persistence Unit Refs' containment reference list.
>@@ -425,7 +412,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS = 9;
>+	int APPLICATION_CLIENT__PERSISTENCE_UNIT_REFS = 10;
> 
> 	/**
> 	 * The feature id for the 'Post Constructs' containment reference list.
>@@ -434,7 +421,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__POST_CONSTRUCTS = 10;
>+	int APPLICATION_CLIENT__POST_CONSTRUCTS = 11;
> 
> 	/**
> 	 * The feature id for the 'Pre Destroys' containment reference list.
>@@ -443,7 +430,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__PRE_DESTROYS = 11;
>+	int APPLICATION_CLIENT__PRE_DESTROYS = 12;
> 
> 	/**
> 	 * The feature id for the 'Callback Handler' attribute.
>@@ -452,7 +439,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__CALLBACK_HANDLER = 12;
>+	int APPLICATION_CLIENT__CALLBACK_HANDLER = 13;
> 
> 	/**
> 	 * The feature id for the 'Message Destinations' containment reference list.
>@@ -461,7 +448,16 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__MESSAGE_DESTINATIONS = 13;
>+	int APPLICATION_CLIENT__MESSAGE_DESTINATIONS = 14;
>+
>+	/**
>+	 * The feature id for the 'Data Source' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION_CLIENT__DATA_SOURCE = 15;
> 
> 	/**
> 	 * The feature id for the 'Id' attribute.
>@@ -470,7 +466,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__ID = 14;
>+	int APPLICATION_CLIENT__ID = 16;
> 
> 	/**
> 	 * The feature id for the 'Metadata Complete' attribute.
>@@ -479,7 +475,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__METADATA_COMPLETE = 15;
>+	int APPLICATION_CLIENT__METADATA_COMPLETE = 17;
> 
> 	/**
> 	 * The feature id for the 'Version' attribute.
>@@ -488,7 +484,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT__VERSION = 16;
>+	int APPLICATION_CLIENT__VERSION = 18;
> 
> 	/**
> 	 * The number of structural features of the 'Application Client' class.
>@@ -497,7 +493,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_CLIENT_FEATURE_COUNT = 17;
>+	int APPLICATION_CLIENT_FEATURE_COUNT = 19;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationClientDeploymentDescriptorImpl Application Client Deployment Descriptor}' class.
>@@ -566,6 +562,17 @@
> 	EClass getApplicationClient();
> 
> 	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getModuleName Module Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Module Name'.
>+	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getModuleName()
>+	 * @see #getApplicationClient()
>+	 * @generated
>+	 */
>+	EAttribute getApplicationClient_ModuleName();
>+
>+	/**
> 	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>@@ -720,6 +727,17 @@
> 	EReference getApplicationClient_MessageDestinations();
> 
> 	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDataSource Data Source}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Data Source'.
>+	 * @see org.eclipse.jst.javaee.applicationclient.ApplicationClient#getDataSource()
>+	 * @see #getApplicationClient()
>+	 * @generated
>+	 */
>+	EReference getApplicationClient_DataSource();
>+
>+	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.applicationclient.ApplicationClient#getId Id}'.
> 	 * 
> 	 * 
>@@ -839,6 +857,14 @@
> 		EClass APPLICATION_CLIENT = eINSTANCE.getApplicationClient();
> 
> 		/**
>+		 * The meta object literal for the 'Module Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute APPLICATION_CLIENT__MODULE_NAME = eINSTANCE.getApplicationClient_ModuleName();
>+
>+		/**
> 		 * The meta object literal for the 'Descriptions' containment reference list feature.
> 		 * 
> 		 * 
>@@ -951,6 +977,14 @@
> 		EReference APPLICATION_CLIENT__MESSAGE_DESTINATIONS = eINSTANCE.getApplicationClient_MessageDestinations();
> 
> 		/**
>+		 * The meta object literal for the 'Data Source' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference APPLICATION_CLIENT__DATA_SOURCE = eINSTANCE.getApplicationClient_DataSource();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/plugin.properties,v
>retrieving revision 1.7
>diff -u -r1.7 plugin.properties
>--- plugin.properties	12 Dec 2007 22:57:14 -0000	1.7
>+++ plugin.properties	14 Oct 2009 21:44:47 -0000
>@@ -15,4 +15,4 @@
> Bundle-Name.0 = J2EE Core Component
> Bundle-Vendor.0 = Eclipse.org
> # ====================================================================
>-
>\ No newline at end of file
>+
>Index: .classpath
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/.classpath,v
>retrieving revision 1.8
>diff -u -r1.8 .classpath
>--- .classpath	16 May 2007 06:42:41 -0000	1.8
>+++ .classpath	14 Oct 2009 21:44:47 -0000
>@@ -1,5 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <classpath>
>+	<classpathentry kind="src" path="jee-models"/>
> 	<classpathentry kind="src" path="mofj2ee"/>
> 	<classpathentry kind="src" path="webservices"/>
> 	<classpathentry kind="src" path="commonArchive"/>
>@@ -8,6 +9,5 @@
> 	<classpathentry kind="src" path="archive"/>
> 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
> 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
>-	<classpathentry kind="src" path="jee-models"/>
> 	<classpathentry kind="output" path="bin"/>
> </classpath>
>Index: jee-models/org/eclipse/jst/javaee/jca/InboundResourceAdapter.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/InboundResourceAdapter.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/InboundResourceAdapter.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/InboundResourceAdapter.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,91 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Inbound Resource Adapter'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The inbound-resourceadapterType specifies information
>+ * about an inbound resource adapter. This contains information
>+ * specific to the implementation of the resource adapter
>+ * library as specified through the messageadapter element.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.InboundResourceAdapter#getMessageadapter Messageadapter}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.InboundResourceAdapter#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getInboundResourceAdapter()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface InboundResourceAdapter extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Messageadapter' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Messageadapter' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Messageadapter' containment reference.
>+	 * @see #setMessageadapter(MessageAdapter)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getInboundResourceAdapter_Messageadapter()
>+	 * @generated
>+	 */
>+	MessageAdapter getMessageadapter();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.InboundResourceAdapter#getMessageadapter Messageadapter}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Messageadapter' containment reference.
>+	 * @see #getMessageadapter()
>+	 * @generated
>+	 */
>+	void setMessageadapter(MessageAdapter value);
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getInboundResourceAdapter_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.InboundResourceAdapter#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // InboundResourceAdapter
>Index: jee-models/org/eclipse/jst/javaee/core/AddressingResponsesType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/core/AddressingResponsesType.java
>diff -N jee-models/org/eclipse/jst/javaee/core/AddressingResponsesType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/core/AddressingResponsesType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,245 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.core;
>+
>+import java.util.Arrays;
>+import java.util.Collections;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.util.Enumerator;
>+
>+/**
>+ * 
>+ * A representation of the literals of the enumeration 'Addressing Responses Type',
>+ * and utility methods for working with them.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * If WS-Addressing is enabled, this type determines if an endpoint
>+ * requires the use of only anonymous responses, or only non-anonymous
>+ * responses, or all.
>+ * 
>+ * @since Java EE 6, Web Services Client 1.3
>+ * 
>+ * 
>+ * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getAddressingResponsesType()
>+ * @generated
>+ */
>+public enum AddressingResponsesType implements Enumerator {
>+	/**
>+	 * The 'ANONYMOUS' literal object.
>+	 * 
>+	 * 
>+	 * @see #ANONYMOUS_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	ANONYMOUS(0, "ANONYMOUS", "ANONYMOUS"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'NONANONYMOUS' literal object.
>+	 * 
>+	 * 
>+	 * @see #NONANONYMOUS_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	NONANONYMOUS(1, "NONANONYMOUS", "NON_ANONYMOUS"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'ALL' literal object.
>+	 * 
>+	 * 
>+	 * @see #ALL_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	ALL(2, "ALL", "ALL"); //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'ANONYMOUS' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'ANONYMOUS' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #ANONYMOUS
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int ANONYMOUS_VALUE = 0;
>+
>+	/**
>+	 * The 'NONANONYMOUS' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'NONANONYMOUS' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #NONANONYMOUS
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int NONANONYMOUS_VALUE = 1;
>+
>+	/**
>+	 * The 'ALL' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'ALL' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #ALL
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int ALL_VALUE = 2;
>+
>+	/**
>+	 * An array of all the 'Addressing Responses Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private static final AddressingResponsesType[] VALUES_ARRAY =
>+		new AddressingResponsesType[] {
>+			ANONYMOUS,
>+			NONANONYMOUS,
>+			ALL,
>+		};
>+
>+	/**
>+	 * A public read-only list of all the 'Addressing Responses Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final List<AddressingResponsesType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+
>+	/**
>+	 * Returns the 'Addressing Responses Type' literal with the specified literal value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static AddressingResponsesType get(String literal) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			AddressingResponsesType result = VALUES_ARRAY[i];
>+			if (result.toString().equals(literal)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Addressing Responses Type' literal with the specified name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static AddressingResponsesType getByName(String name) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			AddressingResponsesType result = VALUES_ARRAY[i];
>+			if (result.getName().equals(name)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Addressing Responses Type' literal with the specified integer value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static AddressingResponsesType get(int value) {
>+		switch (value) {
>+			case ANONYMOUS_VALUE: return ANONYMOUS;
>+			case NONANONYMOUS_VALUE: return NONANONYMOUS;
>+			case ALL_VALUE: return ALL;
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
>+	 * Only this class can construct instances.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private AddressingResponsesType(int value, String name, String literal) {
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+	
>+} //AddressingResponsesType
>Index: jee-models/org/eclipse/jst/javaee/core/DataSourceType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/core/DataSourceType.java
>diff -N jee-models/org/eclipse/jst/javaee/core/DataSourceType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/core/DataSourceType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,667 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.core;
>+
>+import java.math.BigInteger;
>+
>+import java.util.List;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Data Source Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * Configuration of a DataSource.
>+ * 
>+ * @since Java EE 6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getName Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getClassName Class Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getServerName Server Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getPortNumber Port Number}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getDatabaseName Database Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getUrl Url}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getUser User}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getPassword Password}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getProperty Property}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getLoginTimeout Login Timeout}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#isTransactional Transactional}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getIsolationLevel Isolation Level}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getInitialPoolSize Initial Pool Size}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getMaxPoolSize Max Pool Size}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getMinPoolSize Min Pool Size}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getMaxIdleTime Max Idle Time}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getMaxStatements Max Statements}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.DataSourceType#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface DataSourceType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Description' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Description of this DataSource.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Description' containment reference.
>+	 * @see #setDescription(Description)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_Description()
>+	 * @generated
>+	 */
>+	Description getDescription();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getDescription Description}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Description' containment reference.
>+	 * @see #getDescription()
>+	 * @generated
>+	 */
>+	void setDescription(Description value);
>+
>+	/**
>+	 * Returns the value of the 'Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The name element specifies the JNDI name of the
>+	 * data source being defined.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Name' attribute.
>+	 * @see #setName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_Name()
>+	 * @generated
>+	 */
>+	String getName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getName Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Name' attribute.
>+	 * @see #getName()
>+	 * @generated
>+	 */
>+	void setName(String value);
>+
>+	/**
>+	 * Returns the value of the 'Class Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * DataSource, XADataSource or ConnectionPoolDataSource
>+	 * implementation class.
>+	 * 
>+	 * @since Java EE 6 
>+	 * 
>+	 * 
>+	 * @return the value of the 'Class Name' attribute.
>+	 * @see #setClassName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_ClassName()
>+	 * @generated
>+	 */
>+	String getClassName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getClassName Class Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Class Name' attribute.
>+	 * @see #getClassName()
>+	 * @generated
>+	 */
>+	void setClassName(String value);
>+
>+	/**
>+	 * Returns the value of the 'Server Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Database server name.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Server Name' attribute.
>+	 * @see #setServerName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_ServerName()
>+	 * @generated
>+	 */
>+	String getServerName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getServerName Server Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Server Name' attribute.
>+	 * @see #getServerName()
>+	 * @generated
>+	 */
>+	void setServerName(String value);
>+
>+	/**
>+	 * Returns the value of the 'Port Number' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Port number where a server is listening for requests.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Port Number' attribute.
>+	 * @see #setPortNumber(BigInteger)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_PortNumber()
>+	 * @generated
>+	 */
>+	BigInteger getPortNumber();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getPortNumber Port Number}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Port Number' attribute.
>+	 * @see #getPortNumber()
>+	 * @generated
>+	 */
>+	void setPortNumber(BigInteger value);
>+
>+	/**
>+	 * Returns the value of the 'Database Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Name of a database on a server.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Database Name' attribute.
>+	 * @see #setDatabaseName(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_DatabaseName()
>+	 * @generated
>+	 */
>+	String getDatabaseName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getDatabaseName Database Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Database Name' attribute.
>+	 * @see #getDatabaseName()
>+	 * @generated
>+	 */
>+	void setDatabaseName(String value);
>+
>+	/**
>+	 * Returns the value of the 'Url' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * <![CDATA[[
>+	 * A JDBC URL. If the <code>url</code> property is specified
>+	 * along with other standard <code>DataSource</code> properties
>+	 * such as <code>serverName</code>, <code>databaseName</code>
>+	 * and <code>portNumber</code>, the more specific properties will
>+	 * take precedence and <code>url</code> will be ignored.
>+	 * 
>+	 * ]]>
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Url' attribute.
>+	 * @see #setUrl(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_Url()
>+	 * @generated
>+	 */
>+	String getUrl();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getUrl Url}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Url' attribute.
>+	 * @see #getUrl()
>+	 * @generated
>+	 */
>+	void setUrl(String value);
>+
>+	/**
>+	 * Returns the value of the 'User' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * User name to use for connection authentication.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'User' attribute.
>+	 * @see #setUser(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_User()
>+	 * @generated
>+	 */
>+	String getUser();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getUser User}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'User' attribute.
>+	 * @see #getUser()
>+	 * @generated
>+	 */
>+	void setUser(String value);
>+
>+	/**
>+	 * Returns the value of the 'Password' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Password to use for connection authentication.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Password' attribute.
>+	 * @see #setPassword(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_Password()
>+	 * @generated
>+	 */
>+	String getPassword();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getPassword Password}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Password' attribute.
>+	 * @see #getPassword()
>+	 * @generated
>+	 */
>+	void setPassword(String value);
>+
>+	/**
>+	 * Returns the value of the 'Property' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.PropertyType}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * JDBC DataSource Propertry. This may be a vendor-specific
>+	 * property or a less commonly used DataSource property.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Property' containment reference list.
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_Property()
>+	 * @generated
>+	 */
>+	List<PropertyType> getProperty();
>+
>+	/**
>+	 * Returns the value of the 'Login Timeout' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Sets the maximum time in seconds that this data source
>+	 * will wait while attempting to connect to a database.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Login Timeout' attribute.
>+	 * @see #setLoginTimeout(BigInteger)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_LoginTimeout()
>+	 * @generated
>+	 */
>+	BigInteger getLoginTimeout();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getLoginTimeout Login Timeout}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Login Timeout' attribute.
>+	 * @see #getLoginTimeout()
>+	 * @generated
>+	 */
>+	void setLoginTimeout(BigInteger value);
>+
>+	/**
>+	 * Returns the value of the 'Transactional' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Set to false if connections should not participate in
>+	 * transactions.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Transactional' attribute.
>+	 * @see #isSetTransactional()
>+	 * @see #unsetTransactional()
>+	 * @see #setTransactional(boolean)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_Transactional()
>+	 * @generated
>+	 */
>+	boolean isTransactional();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#isTransactional Transactional}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Transactional' attribute.
>+	 * @see #isSetTransactional()
>+	 * @see #unsetTransactional()
>+	 * @see #isTransactional()
>+	 * @generated
>+	 */
>+	void setTransactional(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#isTransactional Transactional}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetTransactional()
>+	 * @see #isTransactional()
>+	 * @see #setTransactional(boolean)
>+	 * @generated
>+	 */
>+	void unsetTransactional();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#isTransactional Transactional}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Transactional' attribute is set.
>+	 * @see #unsetTransactional()
>+	 * @see #isTransactional()
>+	 * @see #setTransactional(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetTransactional();
>+
>+	/**
>+	 * Returns the value of the 'Isolation Level' attribute.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.IsolationLevelType}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Isolation level for connections.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Isolation Level' attribute.
>+	 * @see org.eclipse.jst.javaee.core.IsolationLevelType
>+	 * @see #isSetIsolationLevel()
>+	 * @see #unsetIsolationLevel()
>+	 * @see #setIsolationLevel(IsolationLevelType)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_IsolationLevel()
>+	 * @generated
>+	 */
>+	IsolationLevelType getIsolationLevel();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getIsolationLevel Isolation Level}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Isolation Level' attribute.
>+	 * @see org.eclipse.jst.javaee.core.IsolationLevelType
>+	 * @see #isSetIsolationLevel()
>+	 * @see #unsetIsolationLevel()
>+	 * @see #getIsolationLevel()
>+	 * @generated
>+	 */
>+	void setIsolationLevel(IsolationLevelType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getIsolationLevel Isolation Level}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetIsolationLevel()
>+	 * @see #getIsolationLevel()
>+	 * @see #setIsolationLevel(IsolationLevelType)
>+	 * @generated
>+	 */
>+	void unsetIsolationLevel();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getIsolationLevel Isolation Level}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Isolation Level' attribute is set.
>+	 * @see #unsetIsolationLevel()
>+	 * @see #getIsolationLevel()
>+	 * @see #setIsolationLevel(IsolationLevelType)
>+	 * @generated
>+	 */
>+	boolean isSetIsolationLevel();
>+
>+	/**
>+	 * Returns the value of the 'Initial Pool Size' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Number of connections that should be created when a
>+	 * connection pool is initialized.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Initial Pool Size' attribute.
>+	 * @see #setInitialPoolSize(BigInteger)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_InitialPoolSize()
>+	 * @generated
>+	 */
>+	BigInteger getInitialPoolSize();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getInitialPoolSize Initial Pool Size}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Initial Pool Size' attribute.
>+	 * @see #getInitialPoolSize()
>+	 * @generated
>+	 */
>+	void setInitialPoolSize(BigInteger value);
>+
>+	/**
>+	 * Returns the value of the 'Max Pool Size' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Maximum number of connections that should be concurrently
>+	 * allocated for a connection pool.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Max Pool Size' attribute.
>+	 * @see #setMaxPoolSize(BigInteger)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_MaxPoolSize()
>+	 * @generated
>+	 */
>+	BigInteger getMaxPoolSize();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getMaxPoolSize Max Pool Size}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Max Pool Size' attribute.
>+	 * @see #getMaxPoolSize()
>+	 * @generated
>+	 */
>+	void setMaxPoolSize(BigInteger value);
>+
>+	/**
>+	 * Returns the value of the 'Min Pool Size' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Minimum number of connections that should be concurrently
>+	 * allocated for a connection pool.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Min Pool Size' attribute.
>+	 * @see #setMinPoolSize(BigInteger)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_MinPoolSize()
>+	 * @generated
>+	 */
>+	BigInteger getMinPoolSize();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getMinPoolSize Min Pool Size}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Min Pool Size' attribute.
>+	 * @see #getMinPoolSize()
>+	 * @generated
>+	 */
>+	void setMinPoolSize(BigInteger value);
>+
>+	/**
>+	 * Returns the value of the 'Max Idle Time' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The number of seconds that a physical connection should
>+	 * remain unused in the pool before the connection is
>+	 * closed for a connection pool.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Max Idle Time' attribute.
>+	 * @see #setMaxIdleTime(BigInteger)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_MaxIdleTime()
>+	 * @generated
>+	 */
>+	BigInteger getMaxIdleTime();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getMaxIdleTime Max Idle Time}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Max Idle Time' attribute.
>+	 * @see #getMaxIdleTime()
>+	 * @generated
>+	 */
>+	void setMaxIdleTime(BigInteger value);
>+
>+	/**
>+	 * Returns the value of the 'Max Statements' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The total number of statements that a connection pool
>+	 * should keep open.
>+	 * 
>+	 * @since Java EE 6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Max Statements' attribute.
>+	 * @see #setMaxStatements(BigInteger)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_MaxStatements()
>+	 * @generated
>+	 */
>+	BigInteger getMaxStatements();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getMaxStatements Max Statements}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Max Statements' attribute.
>+	 * @see #getMaxStatements()
>+	 * @generated
>+	 */
>+	void setMaxStatements(BigInteger value);
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getDataSourceType_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.DataSourceType#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // DataSourceType
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/MessageAdapterImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/MessageAdapterImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/MessageAdapterImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/MessageAdapterImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,228 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.MessageAdapter;
>+import org.eclipse.jst.javaee.jca.MessageListener;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Message Adapter'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.MessageAdapterImpl#getMessagelistener Messagelistener}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.MessageAdapterImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class MessageAdapterImpl extends EObjectImpl implements MessageAdapter {
>+	/**
>+	 * The cached value of the '{@link #getMessagelistener() Messagelistener}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getMessagelistener()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<MessageListener> messagelistener;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected MessageAdapterImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.MESSAGE_ADAPTER;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<MessageListener> getMessagelistener() {
>+		if (messagelistener == null) {
>+			messagelistener = new EObjectContainmentEList<MessageListener>(MessageListener.class, this, JcaPackage.MESSAGE_ADAPTER__MESSAGELISTENER);
>+		}
>+		return messagelistener;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.MESSAGE_ADAPTER__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.MESSAGE_ADAPTER__MESSAGELISTENER:
>+				return ((InternalEList<?>)getMessagelistener()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.MESSAGE_ADAPTER__MESSAGELISTENER:
>+				return getMessagelistener();
>+			case JcaPackage.MESSAGE_ADAPTER__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.MESSAGE_ADAPTER__MESSAGELISTENER:
>+				getMessagelistener().clear();
>+				getMessagelistener().addAll((Collection<? extends MessageListener>)newValue);
>+				return;
>+			case JcaPackage.MESSAGE_ADAPTER__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.MESSAGE_ADAPTER__MESSAGELISTENER:
>+				getMessagelistener().clear();
>+				return;
>+			case JcaPackage.MESSAGE_ADAPTER__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.MESSAGE_ADAPTER__MESSAGELISTENER:
>+				return messagelistener != null && !messagelistener.isEmpty();
>+			case JcaPackage.MESSAGE_ADAPTER__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //MessageAdapterImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/OutboundResourceAdapterImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/OutboundResourceAdapterImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/OutboundResourceAdapterImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/OutboundResourceAdapterImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,442 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.AuthenticationMechanism;
>+import org.eclipse.jst.javaee.jca.ConnectionDefinition;
>+import org.eclipse.jst.javaee.jca.OutboundResourceAdapter;
>+import org.eclipse.jst.javaee.jca.TransactionSupportType;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Outbound Resource Adapter'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.OutboundResourceAdapterImpl#getConnectionDefinition Connection Definition}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.OutboundResourceAdapterImpl#getTransactionSupport Transaction Support}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.OutboundResourceAdapterImpl#getAuthenticationMechanism Authentication Mechanism}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.OutboundResourceAdapterImpl#isReauthenticationSupport Reauthentication Support}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.OutboundResourceAdapterImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class OutboundResourceAdapterImpl extends EObjectImpl implements OutboundResourceAdapter {
>+	/**
>+	 * The cached value of the '{@link #getConnectionDefinition() Connection Definition}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getConnectionDefinition()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ConnectionDefinition> connectionDefinition;
>+
>+	/**
>+	 * The default value of the '{@link #getTransactionSupport() Transaction Support}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getTransactionSupport()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final TransactionSupportType TRANSACTION_SUPPORT_EDEFAULT = TransactionSupportType.NO_TRANSACTION;
>+
>+	/**
>+	 * The cached value of the '{@link #getTransactionSupport() Transaction Support}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getTransactionSupport()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected TransactionSupportType transactionSupport = TRANSACTION_SUPPORT_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Transaction Support attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean transactionSupportESet;
>+
>+	/**
>+	 * The cached value of the '{@link #getAuthenticationMechanism() Authentication Mechanism}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getAuthenticationMechanism()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<AuthenticationMechanism> authenticationMechanism;
>+
>+	/**
>+	 * The default value of the '{@link #isReauthenticationSupport() Reauthentication Support}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isReauthenticationSupport()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean REAUTHENTICATION_SUPPORT_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isReauthenticationSupport() Reauthentication Support}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isReauthenticationSupport()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean reauthenticationSupport = REAUTHENTICATION_SUPPORT_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Reauthentication Support attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean reauthenticationSupportESet;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected OutboundResourceAdapterImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.OUTBOUND_RESOURCE_ADAPTER;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ConnectionDefinition> getConnectionDefinition() {
>+		if (connectionDefinition == null) {
>+			connectionDefinition = new EObjectContainmentEList<ConnectionDefinition>(ConnectionDefinition.class, this, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITION);
>+		}
>+		return connectionDefinition;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public TransactionSupportType getTransactionSupport() {
>+		return transactionSupport;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setTransactionSupport(TransactionSupportType newTransactionSupport) {
>+		TransactionSupportType oldTransactionSupport = transactionSupport;
>+		transactionSupport = newTransactionSupport == null ? TRANSACTION_SUPPORT_EDEFAULT : newTransactionSupport;
>+		boolean oldTransactionSupportESet = transactionSupportESet;
>+		transactionSupportESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT, oldTransactionSupport, transactionSupport, !oldTransactionSupportESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetTransactionSupport() {
>+		TransactionSupportType oldTransactionSupport = transactionSupport;
>+		boolean oldTransactionSupportESet = transactionSupportESet;
>+		transactionSupport = TRANSACTION_SUPPORT_EDEFAULT;
>+		transactionSupportESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT, oldTransactionSupport, TRANSACTION_SUPPORT_EDEFAULT, oldTransactionSupportESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetTransactionSupport() {
>+		return transactionSupportESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<AuthenticationMechanism> getAuthenticationMechanism() {
>+		if (authenticationMechanism == null) {
>+			authenticationMechanism = new EObjectContainmentEList<AuthenticationMechanism>(AuthenticationMechanism.class, this, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISM);
>+		}
>+		return authenticationMechanism;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isReauthenticationSupport() {
>+		return reauthenticationSupport;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setReauthenticationSupport(boolean newReauthenticationSupport) {
>+		boolean oldReauthenticationSupport = reauthenticationSupport;
>+		reauthenticationSupport = newReauthenticationSupport;
>+		boolean oldReauthenticationSupportESet = reauthenticationSupportESet;
>+		reauthenticationSupportESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT, oldReauthenticationSupport, reauthenticationSupport, !oldReauthenticationSupportESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetReauthenticationSupport() {
>+		boolean oldReauthenticationSupport = reauthenticationSupport;
>+		boolean oldReauthenticationSupportESet = reauthenticationSupportESet;
>+		reauthenticationSupport = REAUTHENTICATION_SUPPORT_EDEFAULT;
>+		reauthenticationSupportESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT, oldReauthenticationSupport, REAUTHENTICATION_SUPPORT_EDEFAULT, oldReauthenticationSupportESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetReauthenticationSupport() {
>+		return reauthenticationSupportESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITION:
>+				return ((InternalEList<?>)getConnectionDefinition()).basicRemove(otherEnd, msgs);
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISM:
>+				return ((InternalEList<?>)getAuthenticationMechanism()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITION:
>+				return getConnectionDefinition();
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
>+				return getTransactionSupport();
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISM:
>+				return getAuthenticationMechanism();
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
>+				return isReauthenticationSupport();
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITION:
>+				getConnectionDefinition().clear();
>+				getConnectionDefinition().addAll((Collection<? extends ConnectionDefinition>)newValue);
>+				return;
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
>+				setTransactionSupport((TransactionSupportType)newValue);
>+				return;
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISM:
>+				getAuthenticationMechanism().clear();
>+				getAuthenticationMechanism().addAll((Collection<? extends AuthenticationMechanism>)newValue);
>+				return;
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
>+				setReauthenticationSupport((Boolean)newValue);
>+				return;
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITION:
>+				getConnectionDefinition().clear();
>+				return;
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
>+				unsetTransactionSupport();
>+				return;
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISM:
>+				getAuthenticationMechanism().clear();
>+				return;
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
>+				unsetReauthenticationSupport();
>+				return;
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITION:
>+				return connectionDefinition != null && !connectionDefinition.isEmpty();
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
>+				return isSetTransactionSupport();
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISM:
>+				return authenticationMechanism != null && !authenticationMechanism.isEmpty();
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
>+				return isSetReauthenticationSupport();
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (transactionSupport: "); //$NON-NLS-1$
>+		if (transactionSupportESet) result.append(transactionSupport); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", reauthenticationSupport: "); //$NON-NLS-1$
>+		if (reauthenticationSupportESet) result.append(reauthenticationSupport); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //OutboundResourceAdapterImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/AdminObjectImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/AdminObjectImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/AdminObjectImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/AdminObjectImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,336 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.AdminObject;
>+import org.eclipse.jst.javaee.jca.ConfigProperty;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Admin Object'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.AdminObjectImpl#getAdminobjectInterface Adminobject Interface}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.AdminObjectImpl#getAdminobjectClass Adminobject Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.AdminObjectImpl#getConfigProperty Config Property}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.AdminObjectImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class AdminObjectImpl extends EObjectImpl implements AdminObject {
>+	/**
>+	 * The default value of the '{@link #getAdminobjectInterface() Adminobject Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getAdminobjectInterface()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ADMINOBJECT_INTERFACE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getAdminobjectInterface() Adminobject Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getAdminobjectInterface()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String adminobjectInterface = ADMINOBJECT_INTERFACE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getAdminobjectClass() Adminobject Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getAdminobjectClass()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ADMINOBJECT_CLASS_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getAdminobjectClass() Adminobject Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getAdminobjectClass()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String adminobjectClass = ADMINOBJECT_CLASS_EDEFAULT;
>+
>+	/**
>+	 * The cached value of the '{@link #getConfigProperty() Config Property}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getConfigProperty()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ConfigProperty> configProperty;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected AdminObjectImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.ADMIN_OBJECT;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getAdminobjectInterface() {
>+		return adminobjectInterface;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setAdminobjectInterface(String newAdminobjectInterface) {
>+		String oldAdminobjectInterface = adminobjectInterface;
>+		adminobjectInterface = newAdminobjectInterface;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.ADMIN_OBJECT__ADMINOBJECT_INTERFACE, oldAdminobjectInterface, adminobjectInterface));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getAdminobjectClass() {
>+		return adminobjectClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setAdminobjectClass(String newAdminobjectClass) {
>+		String oldAdminobjectClass = adminobjectClass;
>+		adminobjectClass = newAdminobjectClass;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.ADMIN_OBJECT__ADMINOBJECT_CLASS, oldAdminobjectClass, adminobjectClass));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ConfigProperty> getConfigProperty() {
>+		if (configProperty == null) {
>+			configProperty = new EObjectContainmentEList<ConfigProperty>(ConfigProperty.class, this, JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTY);
>+		}
>+		return configProperty;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.ADMIN_OBJECT__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTY:
>+				return ((InternalEList<?>)getConfigProperty()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.ADMIN_OBJECT__ADMINOBJECT_INTERFACE:
>+				return getAdminobjectInterface();
>+			case JcaPackage.ADMIN_OBJECT__ADMINOBJECT_CLASS:
>+				return getAdminobjectClass();
>+			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTY:
>+				return getConfigProperty();
>+			case JcaPackage.ADMIN_OBJECT__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.ADMIN_OBJECT__ADMINOBJECT_INTERFACE:
>+				setAdminobjectInterface((String)newValue);
>+				return;
>+			case JcaPackage.ADMIN_OBJECT__ADMINOBJECT_CLASS:
>+				setAdminobjectClass((String)newValue);
>+				return;
>+			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTY:
>+				getConfigProperty().clear();
>+				getConfigProperty().addAll((Collection<? extends ConfigProperty>)newValue);
>+				return;
>+			case JcaPackage.ADMIN_OBJECT__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.ADMIN_OBJECT__ADMINOBJECT_INTERFACE:
>+				setAdminobjectInterface(ADMINOBJECT_INTERFACE_EDEFAULT);
>+				return;
>+			case JcaPackage.ADMIN_OBJECT__ADMINOBJECT_CLASS:
>+				setAdminobjectClass(ADMINOBJECT_CLASS_EDEFAULT);
>+				return;
>+			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTY:
>+				getConfigProperty().clear();
>+				return;
>+			case JcaPackage.ADMIN_OBJECT__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.ADMIN_OBJECT__ADMINOBJECT_INTERFACE:
>+				return ADMINOBJECT_INTERFACE_EDEFAULT == null ? adminobjectInterface != null : !ADMINOBJECT_INTERFACE_EDEFAULT.equals(adminobjectInterface);
>+			case JcaPackage.ADMIN_OBJECT__ADMINOBJECT_CLASS:
>+				return ADMINOBJECT_CLASS_EDEFAULT == null ? adminobjectClass != null : !ADMINOBJECT_CLASS_EDEFAULT.equals(adminobjectClass);
>+			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTY:
>+				return configProperty != null && !configProperty.isEmpty();
>+			case JcaPackage.ADMIN_OBJECT__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (adminobjectInterface: "); //$NON-NLS-1$
>+		result.append(adminobjectInterface);
>+		result.append(", adminobjectClass: "); //$NON-NLS-1$
>+		result.append(adminobjectClass);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //AdminObjectImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/OutboundResourceAdapter.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/OutboundResourceAdapter.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/OutboundResourceAdapter.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/OutboundResourceAdapter.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,227 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Outbound Resource Adapter'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The outbound-resourceadapterType specifies information about
>+ * an outbound resource adapter. The information includes fully
>+ * qualified names of classes/interfaces required as part of
>+ * the connector architecture specified contracts for
>+ * connection management, level of transaction support
>+ * provided, one or more authentication mechanisms supported
>+ * and additional required security permissions.
>+ * 
>+ * If there is no authentication-mechanism specified as part of
>+ * resource adapter element then the resource adapter does not
>+ * support any standard security authentication mechanisms as
>+ * part of security contract. The application server ignores
>+ * the security part of the system contracts in this case.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.OutboundResourceAdapter#getConnectionDefinition Connection Definition}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.OutboundResourceAdapter#getTransactionSupport Transaction Support}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.OutboundResourceAdapter#getAuthenticationMechanism Authentication Mechanism}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.OutboundResourceAdapter#isReauthenticationSupport Reauthentication Support}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.OutboundResourceAdapter#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getOutboundResourceAdapter()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface OutboundResourceAdapter extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Connection Definition' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.jca.ConnectionDefinition}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Connection Definition' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Connection Definition' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getOutboundResourceAdapter_ConnectionDefinition()
>+	 * @generated
>+	 */
>+	List<ConnectionDefinition> getConnectionDefinition();
>+
>+	/**
>+	 * Returns the value of the 'Transaction Support' attribute.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.jca.TransactionSupportType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Transaction Support' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Transaction Support' attribute.
>+	 * @see org.eclipse.jst.javaee.jca.TransactionSupportType
>+	 * @see #isSetTransactionSupport()
>+	 * @see #unsetTransactionSupport()
>+	 * @see #setTransactionSupport(TransactionSupportType)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getOutboundResourceAdapter_TransactionSupport()
>+	 * @generated
>+	 */
>+	TransactionSupportType getTransactionSupport();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.OutboundResourceAdapter#getTransactionSupport Transaction Support}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Transaction Support' attribute.
>+	 * @see org.eclipse.jst.javaee.jca.TransactionSupportType
>+	 * @see #isSetTransactionSupport()
>+	 * @see #unsetTransactionSupport()
>+	 * @see #getTransactionSupport()
>+	 * @generated
>+	 */
>+	void setTransactionSupport(TransactionSupportType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jca.OutboundResourceAdapter#getTransactionSupport Transaction Support}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetTransactionSupport()
>+	 * @see #getTransactionSupport()
>+	 * @see #setTransactionSupport(TransactionSupportType)
>+	 * @generated
>+	 */
>+	void unsetTransactionSupport();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jca.OutboundResourceAdapter#getTransactionSupport Transaction Support}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Transaction Support' attribute is set.
>+	 * @see #unsetTransactionSupport()
>+	 * @see #getTransactionSupport()
>+	 * @see #setTransactionSupport(TransactionSupportType)
>+	 * @generated
>+	 */
>+	boolean isSetTransactionSupport();
>+
>+	/**
>+	 * Returns the value of the 'Authentication Mechanism' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.jca.AuthenticationMechanism}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Authentication Mechanism' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Authentication Mechanism' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getOutboundResourceAdapter_AuthenticationMechanism()
>+	 * @generated
>+	 */
>+	List<AuthenticationMechanism> getAuthenticationMechanism();
>+
>+	/**
>+	 * Returns the value of the 'Reauthentication Support' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The element reauthentication-support specifies
>+	 * whether the resource adapter implementation supports
>+	 * re-authentication of existing Managed- Connection
>+	 * instance. Note that this information is for the
>+	 * resource adapter implementation and not for the
>+	 * underlying EIS instance. This element must have
>+	 * either a "true" or "false" value.
>+	 * 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Reauthentication Support' attribute.
>+	 * @see #isSetReauthenticationSupport()
>+	 * @see #unsetReauthenticationSupport()
>+	 * @see #setReauthenticationSupport(boolean)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getOutboundResourceAdapter_ReauthenticationSupport()
>+	 * @generated
>+	 */
>+	boolean isReauthenticationSupport();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.OutboundResourceAdapter#isReauthenticationSupport Reauthentication Support}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Reauthentication Support' attribute.
>+	 * @see #isSetReauthenticationSupport()
>+	 * @see #unsetReauthenticationSupport()
>+	 * @see #isReauthenticationSupport()
>+	 * @generated
>+	 */
>+	void setReauthenticationSupport(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jca.OutboundResourceAdapter#isReauthenticationSupport Reauthentication Support}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetReauthenticationSupport()
>+	 * @see #isReauthenticationSupport()
>+	 * @see #setReauthenticationSupport(boolean)
>+	 * @generated
>+	 */
>+	void unsetReauthenticationSupport();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jca.OutboundResourceAdapter#isReauthenticationSupport Reauthentication Support}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Reauthentication Support' attribute is set.
>+	 * @see #unsetReauthenticationSupport()
>+	 * @see #isReauthenticationSupport()
>+	 * @see #setReauthenticationSupport(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetReauthenticationSupport();
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getOutboundResourceAdapter_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.OutboundResourceAdapter#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // OutboundResourceAdapter
>Index: jee-models/org/eclipse/jst/javaee/core/RespectBindingType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/core/RespectBindingType.java
>diff -N jee-models/org/eclipse/jst/javaee/core/RespectBindingType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/core/RespectBindingType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,95 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.core;
>+
>+
>+/**
>+ * 
>+ * A representation of the model object 'Respect Binding Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * Corresponds to the javax.xml.ws.RespectBinding annotation
>+ * or its corresponding javax.xml.ws.RespectBindingFeature web
>+ * service feature. This is used to control whether a JAX-WS
>+ * implementation must respect/honor the contents of the
>+ * wsdl:binding in the WSDL that is associated with the service.
>+ * 
>+ * If the "enabled" element is "true", wsdl:binding in the
>+ * associated WSDL, if any, must be respected/honored.
>+ * 
>+ * @since Java EE 6, Web Services Client 1.3
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.core.RespectBindingType#isEnabled Enabled}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getRespectBindingType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface RespectBindingType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Enabled' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Enabled' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Enabled' attribute.
>+	 * @see #isSetEnabled()
>+	 * @see #unsetEnabled()
>+	 * @see #setEnabled(boolean)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getRespectBindingType_Enabled()
>+	 * @generated
>+	 */
>+	boolean isEnabled();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.RespectBindingType#isEnabled Enabled}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Enabled' attribute.
>+	 * @see #isSetEnabled()
>+	 * @see #unsetEnabled()
>+	 * @see #isEnabled()
>+	 * @generated
>+	 */
>+	void setEnabled(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.RespectBindingType#isEnabled Enabled}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetEnabled()
>+	 * @see #isEnabled()
>+	 * @see #setEnabled(boolean)
>+	 * @generated
>+	 */
>+	void unsetEnabled();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.RespectBindingType#isEnabled Enabled}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Enabled' attribute is set.
>+	 * @see #unsetEnabled()
>+	 * @see #isEnabled()
>+	 * @see #setEnabled(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetEnabled();
>+
>+} // RespectBindingType
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,812 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.Connector;
>+import org.eclipse.jst.javaee.jca.License;
>+import org.eclipse.jst.javaee.jca.ResourceAdapter;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Connector'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getDescriptions Descriptions}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getDisplayNames Display Names}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getIcons Icons}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getVendorName Vendor Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getEisType Eis Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getResourceadapterVersion Resourceadapter Version}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getLicense License}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getResourceadapter Resourceadapter}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getRequiredWorkContext Required Work Context}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getId Id}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#isMetadataComplete Metadata Complete}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getVersion Version}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ConnectorImpl extends EObjectImpl implements Connector {
>+	/**
>+	 * The cached value of the '{@link #getDescriptions() Descriptions}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDescriptions()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<Description> descriptions;
>+
>+	/**
>+	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDisplayNames()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<DisplayName> displayNames;
>+
>+	/**
>+	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getIcons()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<Icon> icons;
>+
>+	/**
>+	 * The default value of the '{@link #getVendorName() Vendor Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getVendorName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String VENDOR_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getVendorName() Vendor Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getVendorName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String vendorName = VENDOR_NAME_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getEisType() Eis Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getEisType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String EIS_TYPE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getEisType() Eis Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getEisType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String eisType = EIS_TYPE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getResourceadapterVersion() Resourceadapter Version}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getResourceadapterVersion()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String RESOURCEADAPTER_VERSION_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getResourceadapterVersion() Resourceadapter Version}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getResourceadapterVersion()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String resourceadapterVersion = RESOURCEADAPTER_VERSION_EDEFAULT;
>+
>+	/**
>+	 * The cached value of the '{@link #getLicense() License}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getLicense()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected License license;
>+
>+	/**
>+	 * The cached value of the '{@link #getResourceadapter() Resourceadapter}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getResourceadapter()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected ResourceAdapter resourceadapter;
>+
>+	/**
>+	 * The cached value of the '{@link #getRequiredWorkContext() Required Work Context}' attribute list.
>+	 * 
>+	 * 
>+	 * @see #getRequiredWorkContext()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<String> requiredWorkContext;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #isMetadataComplete() Metadata Complete}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isMetadataComplete()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean METADATA_COMPLETE_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isMetadataComplete() Metadata Complete}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isMetadataComplete()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean metadataComplete = METADATA_COMPLETE_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Metadata Complete attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean metadataCompleteESet;
>+
>+	/**
>+	 * The default value of the '{@link #getVersion() Version}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getVersion()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String VERSION_EDEFAULT = "1.6"; //$NON-NLS-1$
>+
>+	/**
>+	 * The cached value of the '{@link #getVersion() Version}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getVersion()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String version = VERSION_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Version attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean versionESet;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected ConnectorImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.CONNECTOR;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Description> getDescriptions() {
>+		if (descriptions == null) {
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JcaPackage.CONNECTOR__DESCRIPTIONS);
>+		}
>+		return descriptions;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<DisplayName> getDisplayNames() {
>+		if (displayNames == null) {
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, JcaPackage.CONNECTOR__DISPLAY_NAMES);
>+		}
>+		return displayNames;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Icon> getIcons() {
>+		if (icons == null) {
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, JcaPackage.CONNECTOR__ICONS);
>+		}
>+		return icons;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getVendorName() {
>+		return vendorName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setVendorName(String newVendorName) {
>+		String oldVendorName = vendorName;
>+		vendorName = newVendorName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__VENDOR_NAME, oldVendorName, vendorName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getEisType() {
>+		return eisType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setEisType(String newEisType) {
>+		String oldEisType = eisType;
>+		eisType = newEisType;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__EIS_TYPE, oldEisType, eisType));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getResourceadapterVersion() {
>+		return resourceadapterVersion;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setResourceadapterVersion(String newResourceadapterVersion) {
>+		String oldResourceadapterVersion = resourceadapterVersion;
>+		resourceadapterVersion = newResourceadapterVersion;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__RESOURCEADAPTER_VERSION, oldResourceadapterVersion, resourceadapterVersion));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public License getLicense() {
>+		return license;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetLicense(License newLicense, NotificationChain msgs) {
>+		License oldLicense = license;
>+		license = newLicense;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__LICENSE, oldLicense, newLicense);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLicense(License newLicense) {
>+		if (newLicense != license) {
>+			NotificationChain msgs = null;
>+			if (license != null)
>+				msgs = ((InternalEObject)license).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.CONNECTOR__LICENSE, null, msgs);
>+			if (newLicense != null)
>+				msgs = ((InternalEObject)newLicense).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.CONNECTOR__LICENSE, null, msgs);
>+			msgs = basicSetLicense(newLicense, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__LICENSE, newLicense, newLicense));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ResourceAdapter getResourceadapter() {
>+		return resourceadapter;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetResourceadapter(ResourceAdapter newResourceadapter, NotificationChain msgs) {
>+		ResourceAdapter oldResourceadapter = resourceadapter;
>+		resourceadapter = newResourceadapter;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__RESOURCEADAPTER, oldResourceadapter, newResourceadapter);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setResourceadapter(ResourceAdapter newResourceadapter) {
>+		if (newResourceadapter != resourceadapter) {
>+			NotificationChain msgs = null;
>+			if (resourceadapter != null)
>+				msgs = ((InternalEObject)resourceadapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.CONNECTOR__RESOURCEADAPTER, null, msgs);
>+			if (newResourceadapter != null)
>+				msgs = ((InternalEObject)newResourceadapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.CONNECTOR__RESOURCEADAPTER, null, msgs);
>+			msgs = basicSetResourceadapter(newResourceadapter, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__RESOURCEADAPTER, newResourceadapter, newResourceadapter));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<String> getRequiredWorkContext() {
>+		if (requiredWorkContext == null) {
>+			requiredWorkContext = new EDataTypeEList<String>(String.class, this, JcaPackage.CONNECTOR__REQUIRED_WORK_CONTEXT);
>+		}
>+		return requiredWorkContext;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isMetadataComplete() {
>+		return metadataComplete;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMetadataComplete(boolean newMetadataComplete) {
>+		boolean oldMetadataComplete = metadataComplete;
>+		metadataComplete = newMetadataComplete;
>+		boolean oldMetadataCompleteESet = metadataCompleteESet;
>+		metadataCompleteESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__METADATA_COMPLETE, oldMetadataComplete, metadataComplete, !oldMetadataCompleteESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetMetadataComplete() {
>+		boolean oldMetadataComplete = metadataComplete;
>+		boolean oldMetadataCompleteESet = metadataCompleteESet;
>+		metadataComplete = METADATA_COMPLETE_EDEFAULT;
>+		metadataCompleteESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.CONNECTOR__METADATA_COMPLETE, oldMetadataComplete, METADATA_COMPLETE_EDEFAULT, oldMetadataCompleteESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetMetadataComplete() {
>+		return metadataCompleteESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getVersion() {
>+		return version;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setVersion(String newVersion) {
>+		String oldVersion = version;
>+		version = newVersion;
>+		boolean oldVersionESet = versionESet;
>+		versionESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__VERSION, oldVersion, version, !oldVersionESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetVersion() {
>+		String oldVersion = version;
>+		boolean oldVersionESet = versionESet;
>+		version = VERSION_EDEFAULT;
>+		versionESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.CONNECTOR__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetVersion() {
>+		return versionESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTOR__DESCRIPTIONS:
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
>+			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
>+			case JcaPackage.CONNECTOR__ICONS:
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
>+			case JcaPackage.CONNECTOR__LICENSE:
>+				return basicSetLicense(null, msgs);
>+			case JcaPackage.CONNECTOR__RESOURCEADAPTER:
>+				return basicSetResourceadapter(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTOR__DESCRIPTIONS:
>+				return getDescriptions();
>+			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
>+				return getDisplayNames();
>+			case JcaPackage.CONNECTOR__ICONS:
>+				return getIcons();
>+			case JcaPackage.CONNECTOR__VENDOR_NAME:
>+				return getVendorName();
>+			case JcaPackage.CONNECTOR__EIS_TYPE:
>+				return getEisType();
>+			case JcaPackage.CONNECTOR__RESOURCEADAPTER_VERSION:
>+				return getResourceadapterVersion();
>+			case JcaPackage.CONNECTOR__LICENSE:
>+				return getLicense();
>+			case JcaPackage.CONNECTOR__RESOURCEADAPTER:
>+				return getResourceadapter();
>+			case JcaPackage.CONNECTOR__REQUIRED_WORK_CONTEXT:
>+				return getRequiredWorkContext();
>+			case JcaPackage.CONNECTOR__ID:
>+				return getId();
>+			case JcaPackage.CONNECTOR__METADATA_COMPLETE:
>+				return isMetadataComplete();
>+			case JcaPackage.CONNECTOR__VERSION:
>+				return getVersion();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTOR__DESCRIPTIONS:
>+				getDescriptions().clear();
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
>+				return;
>+			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
>+				getDisplayNames().clear();
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
>+				return;
>+			case JcaPackage.CONNECTOR__ICONS:
>+				getIcons().clear();
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
>+				return;
>+			case JcaPackage.CONNECTOR__VENDOR_NAME:
>+				setVendorName((String)newValue);
>+				return;
>+			case JcaPackage.CONNECTOR__EIS_TYPE:
>+				setEisType((String)newValue);
>+				return;
>+			case JcaPackage.CONNECTOR__RESOURCEADAPTER_VERSION:
>+				setResourceadapterVersion((String)newValue);
>+				return;
>+			case JcaPackage.CONNECTOR__LICENSE:
>+				setLicense((License)newValue);
>+				return;
>+			case JcaPackage.CONNECTOR__RESOURCEADAPTER:
>+				setResourceadapter((ResourceAdapter)newValue);
>+				return;
>+			case JcaPackage.CONNECTOR__REQUIRED_WORK_CONTEXT:
>+				getRequiredWorkContext().clear();
>+				getRequiredWorkContext().addAll((Collection<? extends String>)newValue);
>+				return;
>+			case JcaPackage.CONNECTOR__ID:
>+				setId((String)newValue);
>+				return;
>+			case JcaPackage.CONNECTOR__METADATA_COMPLETE:
>+				setMetadataComplete((Boolean)newValue);
>+				return;
>+			case JcaPackage.CONNECTOR__VERSION:
>+				setVersion((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTOR__DESCRIPTIONS:
>+				getDescriptions().clear();
>+				return;
>+			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
>+				getDisplayNames().clear();
>+				return;
>+			case JcaPackage.CONNECTOR__ICONS:
>+				getIcons().clear();
>+				return;
>+			case JcaPackage.CONNECTOR__VENDOR_NAME:
>+				setVendorName(VENDOR_NAME_EDEFAULT);
>+				return;
>+			case JcaPackage.CONNECTOR__EIS_TYPE:
>+				setEisType(EIS_TYPE_EDEFAULT);
>+				return;
>+			case JcaPackage.CONNECTOR__RESOURCEADAPTER_VERSION:
>+				setResourceadapterVersion(RESOURCEADAPTER_VERSION_EDEFAULT);
>+				return;
>+			case JcaPackage.CONNECTOR__LICENSE:
>+				setLicense((License)null);
>+				return;
>+			case JcaPackage.CONNECTOR__RESOURCEADAPTER:
>+				setResourceadapter((ResourceAdapter)null);
>+				return;
>+			case JcaPackage.CONNECTOR__REQUIRED_WORK_CONTEXT:
>+				getRequiredWorkContext().clear();
>+				return;
>+			case JcaPackage.CONNECTOR__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+			case JcaPackage.CONNECTOR__METADATA_COMPLETE:
>+				unsetMetadataComplete();
>+				return;
>+			case JcaPackage.CONNECTOR__VERSION:
>+				unsetVersion();
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTOR__DESCRIPTIONS:
>+				return descriptions != null && !descriptions.isEmpty();
>+			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
>+				return displayNames != null && !displayNames.isEmpty();
>+			case JcaPackage.CONNECTOR__ICONS:
>+				return icons != null && !icons.isEmpty();
>+			case JcaPackage.CONNECTOR__VENDOR_NAME:
>+				return VENDOR_NAME_EDEFAULT == null ? vendorName != null : !VENDOR_NAME_EDEFAULT.equals(vendorName);
>+			case JcaPackage.CONNECTOR__EIS_TYPE:
>+				return EIS_TYPE_EDEFAULT == null ? eisType != null : !EIS_TYPE_EDEFAULT.equals(eisType);
>+			case JcaPackage.CONNECTOR__RESOURCEADAPTER_VERSION:
>+				return RESOURCEADAPTER_VERSION_EDEFAULT == null ? resourceadapterVersion != null : !RESOURCEADAPTER_VERSION_EDEFAULT.equals(resourceadapterVersion);
>+			case JcaPackage.CONNECTOR__LICENSE:
>+				return license != null;
>+			case JcaPackage.CONNECTOR__RESOURCEADAPTER:
>+				return resourceadapter != null;
>+			case JcaPackage.CONNECTOR__REQUIRED_WORK_CONTEXT:
>+				return requiredWorkContext != null && !requiredWorkContext.isEmpty();
>+			case JcaPackage.CONNECTOR__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+			case JcaPackage.CONNECTOR__METADATA_COMPLETE:
>+				return isSetMetadataComplete();
>+			case JcaPackage.CONNECTOR__VERSION:
>+				return isSetVersion();
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (vendorName: "); //$NON-NLS-1$
>+		result.append(vendorName);
>+		result.append(", eisType: "); //$NON-NLS-1$
>+		result.append(eisType);
>+		result.append(", resourceadapterVersion: "); //$NON-NLS-1$
>+		result.append(resourceadapterVersion);
>+		result.append(", requiredWorkContext: "); //$NON-NLS-1$
>+		result.append(requiredWorkContext);
>+		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();
>+	}
>+
>+} //ConnectorImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/AdminObject.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/AdminObject.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/AdminObject.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/AdminObject.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,158 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Admin Object'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The adminobjectType specifies information about an
>+ * administered object. Administered objects are specific to a
>+ * messaging style or message provider. This contains
>+ * information on the Java type of the interface implemented by
>+ * an administered object, its Java class name and its
>+ * configuration properties.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.AdminObject#getAdminobjectInterface Adminobject Interface}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.AdminObject#getAdminobjectClass Adminobject Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.AdminObject#getConfigProperty Config Property}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.AdminObject#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getAdminObject()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface AdminObject extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Adminobject Interface' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * <![CDATA[[
>+	 * The element adminobject-interface specifies the
>+	 * fully qualified name of the Java type of the
>+	 * interface implemented by an administered object.
>+	 * 
>+	 * Example:
>+	 * 	<adminobject-interface>javax.jms.Destination
>+	 * 	</adminobject-interface>
>+	 * 
>+	 * ]]>
>+	 * 			@since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Adminobject Interface' attribute.
>+	 * @see #setAdminobjectInterface(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getAdminObject_AdminobjectInterface()
>+	 * @generated
>+	 */
>+	String getAdminobjectInterface();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.AdminObject#getAdminobjectInterface Adminobject Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Adminobject Interface' attribute.
>+	 * @see #getAdminobjectInterface()
>+	 * @generated
>+	 */
>+	void setAdminobjectInterface(String value);
>+
>+	/**
>+	 * Returns the value of the 'Adminobject Class' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * <![CDATA[[
>+	 * The element adminobject-class specifies the fully
>+	 * qualified Java class name of an administered object.
>+	 * 
>+	 * Example:
>+	 * 	 <adminobject-class>com.wombat.DestinationImpl
>+	 * 	 </adminobject-class>
>+	 * 
>+	 * ]]>
>+	 * 			@since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Adminobject Class' attribute.
>+	 * @see #setAdminobjectClass(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getAdminObject_AdminobjectClass()
>+	 * @generated
>+	 */
>+	String getAdminobjectClass();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.AdminObject#getAdminobjectClass Adminobject Class}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Adminobject Class' attribute.
>+	 * @see #getAdminobjectClass()
>+	 * @generated
>+	 */
>+	void setAdminobjectClass(String value);
>+
>+	/**
>+	 * Returns the value of the 'Config Property' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.jca.ConfigProperty}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Config Property' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Config Property' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getAdminObject_ConfigProperty()
>+	 * @generated
>+	 */
>+	List<ConfigProperty> getConfigProperty();
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getAdminObject_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.AdminObject#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // AdminObject
>Index: jee-models/org/eclipse/jst/javaee/jca/Connector.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/Connector.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/Connector.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/Connector.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,423 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.DisplayName;
>+import org.eclipse.jst.javaee.core.Icon;
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Connector'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The connectorType defines a resource adapter.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.Connector#getDescriptions Descriptions}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.Connector#getDisplayNames Display Names}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.Connector#getIcons Icons}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.Connector#getVendorName Vendor Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.Connector#getEisType Eis Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.Connector#getResourceadapterVersion Resourceadapter Version}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.Connector#getLicense License}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.Connector#getResourceadapter Resourceadapter}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.Connector#getRequiredWorkContext Required Work Context}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.Connector#getId Id}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.Connector#isMetadataComplete Metadata Complete}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.Connector#getVersion Version}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface Connector extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Descriptions' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Descriptions' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Descriptions' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_Descriptions()
>+	 * @generated
>+	 */
>+	List<Description> getDescriptions();
>+
>+	/**
>+	 * Returns the value of the 'Display Names' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DisplayName}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Display Names' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Display Names' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_DisplayNames()
>+	 * @generated
>+	 */
>+	List<DisplayName> getDisplayNames();
>+
>+	/**
>+	 * Returns the value of the 'Icons' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Icon}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Icons' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Icons' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_Icons()
>+	 * @generated
>+	 */
>+	List<Icon> getIcons();
>+
>+	/**
>+	 * Returns the value of the 'Vendor Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The element vendor-name specifies the name of
>+	 * resource adapter provider vendor.
>+	 * 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Vendor Name' attribute.
>+	 * @see #setVendorName(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_VendorName()
>+	 * @generated
>+	 */
>+	String getVendorName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.Connector#getVendorName Vendor Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Vendor Name' attribute.
>+	 * @see #getVendorName()
>+	 * @generated
>+	 */
>+	void setVendorName(String value);
>+
>+	/**
>+	 * Returns the value of the 'Eis Type' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The element eis-type contains information about the
>+	 * type of the EIS. For example, the type of an EIS can
>+	 * be product name of EIS independent of any version
>+	 * info.
>+	 * 
>+	 * This helps in identifying EIS instances that can be
>+	 * used with this resource adapter.
>+	 * 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Eis Type' attribute.
>+	 * @see #setEisType(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_EisType()
>+	 * @generated
>+	 */
>+	String getEisType();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.Connector#getEisType Eis Type}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Eis Type' attribute.
>+	 * @see #getEisType()
>+	 * @generated
>+	 */
>+	void setEisType(String value);
>+
>+	/**
>+	 * Returns the value of the 'Resourceadapter Version' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The element resourceadapter-version specifies a string-based version
>+	 * of the resource adapter from the resource adapter
>+	 * provider.
>+	 * 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Resourceadapter Version' attribute.
>+	 * @see #setResourceadapterVersion(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_ResourceadapterVersion()
>+	 * @generated
>+	 */
>+	String getResourceadapterVersion();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.Connector#getResourceadapterVersion Resourceadapter Version}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Resourceadapter Version' attribute.
>+	 * @see #getResourceadapterVersion()
>+	 * @generated
>+	 */
>+	void setResourceadapterVersion(String value);
>+
>+	/**
>+	 * Returns the value of the 'License' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'License' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'License' containment reference.
>+	 * @see #setLicense(License)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_License()
>+	 * @generated
>+	 */
>+	License getLicense();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.Connector#getLicense License}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'License' containment reference.
>+	 * @see #getLicense()
>+	 * @generated
>+	 */
>+	void setLicense(License value);
>+
>+	/**
>+	 * Returns the value of the 'Resourceadapter' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Resourceadapter' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Resourceadapter' containment reference.
>+	 * @see #setResourceadapter(ResourceAdapter)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_Resourceadapter()
>+	 * @generated
>+	 */
>+	ResourceAdapter getResourceadapter();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.Connector#getResourceadapter Resourceadapter}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Resourceadapter' containment reference.
>+	 * @see #getResourceadapter()
>+	 * @generated
>+	 */
>+	void setResourceadapter(ResourceAdapter value);
>+
>+	/**
>+	 * Returns the value of the 'Required Work Context' attribute list.
>+	 * The list contents are of type {@link java.lang.String}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The element required-work-context specifies a fully qualified class 
>+	 * name that implements WorkContext interface, that the resource adapter 
>+	 * requires the application server to support.
>+	 * 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Required Work Context' attribute list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_RequiredWorkContext()
>+	 * @generated
>+	 */
>+	List<String> getRequiredWorkContext();
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.Connector#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+	/**
>+	 * Returns the value of the 'Metadata Complete' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The metadata-complete attribute defines whether the deployment 
>+	 * descriptor for the resource adapter module is complete, or whether
>+	 * the class files available to the module and packaged with the resource 
>+	 * adapter should be examined for annotations that specify deployment 
>+	 * information.
>+	 * 
>+	 * If metadata-complete is set to "true", the deployment tool of the 
>+	 * application server 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 this specification. If the 
>+	 * deployment descriptor is not included or is included but not marked 
>+	 * metadata-complete, the deployment tool will process annotations.
>+	 * 
>+	 * Application servers must assume that metadata-complete is true for 
>+	 * resource adapter modules with deployment descriptor version 
>+	 * lower than 1.6.
>+	 * 		
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Metadata Complete' attribute.
>+	 * @see #isSetMetadataComplete()
>+	 * @see #unsetMetadataComplete()
>+	 * @see #setMetadataComplete(boolean)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_MetadataComplete()
>+	 * @generated
>+	 */
>+	boolean isMetadataComplete();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.Connector#isMetadataComplete Metadata Complete}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Metadata Complete' attribute.
>+	 * @see #isSetMetadataComplete()
>+	 * @see #unsetMetadataComplete()
>+	 * @see #isMetadataComplete()
>+	 * @generated
>+	 */
>+	void setMetadataComplete(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jca.Connector#isMetadataComplete Metadata Complete}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetMetadataComplete()
>+	 * @see #isMetadataComplete()
>+	 * @see #setMetadataComplete(boolean)
>+	 * @generated
>+	 */
>+	void unsetMetadataComplete();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jca.Connector#isMetadataComplete Metadata Complete}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Metadata Complete' attribute is set.
>+	 * @see #unsetMetadataComplete()
>+	 * @see #isMetadataComplete()
>+	 * @see #setMetadataComplete(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetMetadataComplete();
>+
>+	/**
>+	 * Returns the value of the 'Version' attribute.
>+	 * The default value is <code>"1.6"</code>.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The version indicates the version of the schema to be used by the
>+	 * deployment tool. This element doesn't have a default, and the resource adapter 
>+	 * developer/deployer is required to specify it. The element allows the deployment 
>+	 * tool to choose which schema to validate the descriptor against.
>+	 * 	 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Version' attribute.
>+	 * @see #isSetVersion()
>+	 * @see #unsetVersion()
>+	 * @see #setVersion(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_Version()
>+	 * @generated
>+	 */
>+	String getVersion();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.Connector#getVersion Version}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Version' attribute.
>+	 * @see #isSetVersion()
>+	 * @see #unsetVersion()
>+	 * @see #getVersion()
>+	 * @generated
>+	 */
>+	void setVersion(String value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jca.Connector#getVersion Version}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetVersion()
>+	 * @see #getVersion()
>+	 * @see #setVersion(String)
>+	 * @generated
>+	 */
>+	void unsetVersion();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jca.Connector#getVersion Version}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Version' attribute is set.
>+	 * @see #unsetVersion()
>+	 * @see #getVersion()
>+	 * @see #setVersion(String)
>+	 * @generated
>+	 */
>+	boolean isSetVersion();
>+
>+} // Connector
>Index: jee-models/org/eclipse/jst/javaee/jca/ConfigProperty.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/ConfigProperty.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/ConfigProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/ConfigProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,400 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Config Property'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The config-propertyType contains a declaration of a single
>+ * configuration property that may be used for providing
>+ * configuration information.
>+ * 
>+ * The declaration consists of an optional description, name,
>+ * type and an optional value of the configuration property. If
>+ * the resource adapter provider does not specify a value than
>+ * the deployer is responsible for providing a valid value for
>+ * a configuration property.
>+ * 
>+ * Any bounds or well-defined values of properties should be
>+ * described in the description element.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConfigProperty#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConfigProperty#getConfigPropertyName Config Property Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConfigProperty#getConfigPropertyType Config Property Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConfigProperty#getConfigPropertyValue Config Property Value}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConfigProperty#isConfigPropertyIgnore Config Property Ignore}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConfigProperty#isConfigPropertySupportsDynamicUpdates Config Property Supports Dynamic Updates}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConfigProperty#isConfigPropertyConfidential Config Property Confidential}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConfigProperty#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConfigProperty()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface ConfigProperty extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Description' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Description' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Description' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConfigProperty_Description()
>+	 * @generated
>+	 */
>+	List<Description> getDescription();
>+
>+	/**
>+	 * Returns the value of the 'Config Property Name' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Config Property Name' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Config Property Name' attribute.
>+	 * @see #setConfigPropertyName(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConfigProperty_ConfigPropertyName()
>+	 * @generated
>+	 */
>+	String getConfigPropertyName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#getConfigPropertyName Config Property Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Config Property Name' attribute.
>+	 * @see #getConfigPropertyName()
>+	 * @generated
>+	 */
>+	void setConfigPropertyName(String value);
>+
>+	/**
>+	 * Returns the value of the 'Config Property Type' attribute.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.jca.ConfigPropertyTypeType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Config Property Type' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Config Property Type' attribute.
>+	 * @see org.eclipse.jst.javaee.jca.ConfigPropertyTypeType
>+	 * @see #isSetConfigPropertyType()
>+	 * @see #unsetConfigPropertyType()
>+	 * @see #setConfigPropertyType(ConfigPropertyTypeType)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConfigProperty_ConfigPropertyType()
>+	 * @generated
>+	 */
>+	ConfigPropertyTypeType getConfigPropertyType();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#getConfigPropertyType Config Property Type}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Config Property Type' attribute.
>+	 * @see org.eclipse.jst.javaee.jca.ConfigPropertyTypeType
>+	 * @see #isSetConfigPropertyType()
>+	 * @see #unsetConfigPropertyType()
>+	 * @see #getConfigPropertyType()
>+	 * @generated
>+	 */
>+	void setConfigPropertyType(ConfigPropertyTypeType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#getConfigPropertyType Config Property Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetConfigPropertyType()
>+	 * @see #getConfigPropertyType()
>+	 * @see #setConfigPropertyType(ConfigPropertyTypeType)
>+	 * @generated
>+	 */
>+	void unsetConfigPropertyType();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#getConfigPropertyType Config Property Type}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Config Property Type' attribute is set.
>+	 * @see #unsetConfigPropertyType()
>+	 * @see #getConfigPropertyType()
>+	 * @see #setConfigPropertyType(ConfigPropertyTypeType)
>+	 * @generated
>+	 */
>+	boolean isSetConfigPropertyType();
>+
>+	/**
>+	 * Returns the value of the 'Config Property Value' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * <![CDATA[[
>+	 * The element config-property-value contains the value
>+	 * of a configuration entry. Note, it is possible for a
>+	 * resource adapter deployer to override this
>+	 * configuration information during deployment.
>+	 * 
>+	 * Example:
>+	 * <config-property-value>WombatServer</config-property-value>
>+	 * 
>+	 * ]]>
>+	 * 			@since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Config Property Value' attribute.
>+	 * @see #setConfigPropertyValue(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConfigProperty_ConfigPropertyValue()
>+	 * @generated
>+	 */
>+	String getConfigPropertyValue();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#getConfigPropertyValue Config Property Value}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Config Property Value' attribute.
>+	 * @see #getConfigPropertyValue()
>+	 * @generated
>+	 */
>+	void setConfigPropertyValue(String value);
>+
>+	/**
>+	 * Returns the value of the 'Config Property Ignore' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The element config-property-ignore is used to specify 
>+	 * whether the configuration tools must ignore considering the 
>+	 * configuration property during auto-discovery of
>+	 * Configuration properties. See the Connector specification for
>+	 * more details. If unspecified, the container must not ignore
>+	 * the configuration property during auto-discovery.
>+	 * This element must be one of the following, "true" or "false".
>+	 * 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Config Property Ignore' attribute.
>+	 * @see #isSetConfigPropertyIgnore()
>+	 * @see #unsetConfigPropertyIgnore()
>+	 * @see #setConfigPropertyIgnore(boolean)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConfigProperty_ConfigPropertyIgnore()
>+	 * @generated
>+	 */
>+	boolean isConfigPropertyIgnore();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#isConfigPropertyIgnore Config Property Ignore}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Config Property Ignore' attribute.
>+	 * @see #isSetConfigPropertyIgnore()
>+	 * @see #unsetConfigPropertyIgnore()
>+	 * @see #isConfigPropertyIgnore()
>+	 * @generated
>+	 */
>+	void setConfigPropertyIgnore(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#isConfigPropertyIgnore Config Property Ignore}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetConfigPropertyIgnore()
>+	 * @see #isConfigPropertyIgnore()
>+	 * @see #setConfigPropertyIgnore(boolean)
>+	 * @generated
>+	 */
>+	void unsetConfigPropertyIgnore();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#isConfigPropertyIgnore Config Property Ignore}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Config Property Ignore' attribute is set.
>+	 * @see #unsetConfigPropertyIgnore()
>+	 * @see #isConfigPropertyIgnore()
>+	 * @see #setConfigPropertyIgnore(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetConfigPropertyIgnore();
>+
>+	/**
>+	 * Returns the value of the 'Config Property Supports Dynamic Updates' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The element config-property-supports-dynamic-updates is used to specify 
>+	 * whether the configuration property allows its value to be updated, by
>+	 * application server's configuration tools, during the lifetime of
>+	 * the JavaBean instance. See the Connector specification for
>+	 * more details. If unspecified, the container must not dynamically
>+	 * reconfigure the property.
>+	 * This element must be one of the following, "true" or "false".
>+	 * 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Config Property Supports Dynamic Updates' attribute.
>+	 * @see #isSetConfigPropertySupportsDynamicUpdates()
>+	 * @see #unsetConfigPropertySupportsDynamicUpdates()
>+	 * @see #setConfigPropertySupportsDynamicUpdates(boolean)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConfigProperty_ConfigPropertySupportsDynamicUpdates()
>+	 * @generated
>+	 */
>+	boolean isConfigPropertySupportsDynamicUpdates();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#isConfigPropertySupportsDynamicUpdates Config Property Supports Dynamic Updates}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Config Property Supports Dynamic Updates' attribute.
>+	 * @see #isSetConfigPropertySupportsDynamicUpdates()
>+	 * @see #unsetConfigPropertySupportsDynamicUpdates()
>+	 * @see #isConfigPropertySupportsDynamicUpdates()
>+	 * @generated
>+	 */
>+	void setConfigPropertySupportsDynamicUpdates(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#isConfigPropertySupportsDynamicUpdates Config Property Supports Dynamic Updates}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetConfigPropertySupportsDynamicUpdates()
>+	 * @see #isConfigPropertySupportsDynamicUpdates()
>+	 * @see #setConfigPropertySupportsDynamicUpdates(boolean)
>+	 * @generated
>+	 */
>+	void unsetConfigPropertySupportsDynamicUpdates();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#isConfigPropertySupportsDynamicUpdates Config Property Supports Dynamic Updates}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Config Property Supports Dynamic Updates' attribute is set.
>+	 * @see #unsetConfigPropertySupportsDynamicUpdates()
>+	 * @see #isConfigPropertySupportsDynamicUpdates()
>+	 * @see #setConfigPropertySupportsDynamicUpdates(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetConfigPropertySupportsDynamicUpdates();
>+
>+	/**
>+	 * Returns the value of the 'Config Property Confidential' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The element config-property-confidential is used to specify 
>+	 * whether the configuration property is confidential and
>+	 * recommends application server's configuration tools to use special 
>+	 * visual aids for editing them. See the Connector specification for
>+	 * more details. If unspecified, the container must not treat the
>+	 * property as confidential.
>+	 * This element must be one of the following, "true" or "false".
>+	 * 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Config Property Confidential' attribute.
>+	 * @see #isSetConfigPropertyConfidential()
>+	 * @see #unsetConfigPropertyConfidential()
>+	 * @see #setConfigPropertyConfidential(boolean)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConfigProperty_ConfigPropertyConfidential()
>+	 * @generated
>+	 */
>+	boolean isConfigPropertyConfidential();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#isConfigPropertyConfidential Config Property Confidential}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Config Property Confidential' attribute.
>+	 * @see #isSetConfigPropertyConfidential()
>+	 * @see #unsetConfigPropertyConfidential()
>+	 * @see #isConfigPropertyConfidential()
>+	 * @generated
>+	 */
>+	void setConfigPropertyConfidential(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#isConfigPropertyConfidential Config Property Confidential}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetConfigPropertyConfidential()
>+	 * @see #isConfigPropertyConfidential()
>+	 * @see #setConfigPropertyConfidential(boolean)
>+	 * @generated
>+	 */
>+	void unsetConfigPropertyConfidential();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#isConfigPropertyConfidential Config Property Confidential}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Config Property Confidential' attribute is set.
>+	 * @see #unsetConfigPropertyConfidential()
>+	 * @see #isConfigPropertyConfidential()
>+	 * @see #setConfigPropertyConfidential(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetConfigPropertyConfidential();
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConfigProperty_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConfigProperty#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // ConfigProperty
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/LicenseImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/LicenseImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/LicenseImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/LicenseImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,317 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.License;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'License'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.LicenseImpl#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.LicenseImpl#isLicenseRequired License Required}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.LicenseImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class LicenseImpl extends EObjectImpl implements License {
>+	/**
>+	 * The cached value of the '{@link #getDescription() Description}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDescription()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<Description> description;
>+
>+	/**
>+	 * The default value of the '{@link #isLicenseRequired() License Required}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isLicenseRequired()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean LICENSE_REQUIRED_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isLicenseRequired() License Required}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isLicenseRequired()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean licenseRequired = LICENSE_REQUIRED_EDEFAULT;
>+
>+	/**
>+	 * This is true if the License Required attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean licenseRequiredESet;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected LicenseImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.LICENSE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Description> getDescription() {
>+		if (description == null) {
>+			description = new EObjectContainmentEList<Description>(Description.class, this, JcaPackage.LICENSE__DESCRIPTION);
>+		}
>+		return description;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isLicenseRequired() {
>+		return licenseRequired;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLicenseRequired(boolean newLicenseRequired) {
>+		boolean oldLicenseRequired = licenseRequired;
>+		licenseRequired = newLicenseRequired;
>+		boolean oldLicenseRequiredESet = licenseRequiredESet;
>+		licenseRequiredESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.LICENSE__LICENSE_REQUIRED, oldLicenseRequired, licenseRequired, !oldLicenseRequiredESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetLicenseRequired() {
>+		boolean oldLicenseRequired = licenseRequired;
>+		boolean oldLicenseRequiredESet = licenseRequiredESet;
>+		licenseRequired = LICENSE_REQUIRED_EDEFAULT;
>+		licenseRequiredESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.LICENSE__LICENSE_REQUIRED, oldLicenseRequired, LICENSE_REQUIRED_EDEFAULT, oldLicenseRequiredESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetLicenseRequired() {
>+		return licenseRequiredESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.LICENSE__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.LICENSE__DESCRIPTION:
>+				return ((InternalEList<?>)getDescription()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.LICENSE__DESCRIPTION:
>+				return getDescription();
>+			case JcaPackage.LICENSE__LICENSE_REQUIRED:
>+				return isLicenseRequired();
>+			case JcaPackage.LICENSE__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.LICENSE__DESCRIPTION:
>+				getDescription().clear();
>+				getDescription().addAll((Collection<? extends Description>)newValue);
>+				return;
>+			case JcaPackage.LICENSE__LICENSE_REQUIRED:
>+				setLicenseRequired((Boolean)newValue);
>+				return;
>+			case JcaPackage.LICENSE__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.LICENSE__DESCRIPTION:
>+				getDescription().clear();
>+				return;
>+			case JcaPackage.LICENSE__LICENSE_REQUIRED:
>+				unsetLicenseRequired();
>+				return;
>+			case JcaPackage.LICENSE__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.LICENSE__DESCRIPTION:
>+				return description != null && !description.isEmpty();
>+			case JcaPackage.LICENSE__LICENSE_REQUIRED:
>+				return isSetLicenseRequired();
>+			case JcaPackage.LICENSE__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (licenseRequired: "); //$NON-NLS-1$
>+		if (licenseRequiredESet) result.append(licenseRequired); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //LicenseImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorDeploymentDescriptorImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorDeploymentDescriptorImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorDeploymentDescriptorImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorDeploymentDescriptorImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,289 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.Connector;
>+import org.eclipse.jst.javaee.jca.ConnectorDeploymentDescriptor;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Connector Deployment Descriptor'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorDeploymentDescriptorImpl#getMixed Mixed}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorDeploymentDescriptorImpl#getXMLNSPrefixMap XMLNS Prefix Map}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorDeploymentDescriptorImpl#getXSISchemaLocation XSI Schema Location}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorDeploymentDescriptorImpl#getConnector Connector}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ConnectorDeploymentDescriptorImpl extends EObjectImpl implements ConnectorDeploymentDescriptor {
>+	/**
>+	 * The cached value of the '{@link #getMixed() Mixed}' attribute list.
>+	 * 
>+	 * 
>+	 * @see #getMixed()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected FeatureMap mixed;
>+
>+	/**
>+	 * The cached value of the '{@link #getXMLNSPrefixMap() XMLNS Prefix Map}' map.
>+	 * 
>+	 * 
>+	 * @see #getXMLNSPrefixMap()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EMap<String, String> xMLNSPrefixMap;
>+
>+	/**
>+	 * The cached value of the '{@link #getXSISchemaLocation() XSI Schema Location}' map.
>+	 * 
>+	 * 
>+	 * @see #getXSISchemaLocation()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EMap<String, String> xSISchemaLocation;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected ConnectorDeploymentDescriptorImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.CONNECTOR_DEPLOYMENT_DESCRIPTOR;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public FeatureMap getMixed() {
>+		if (mixed == null) {
>+			mixed = new BasicFeatureMap(this, JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__MIXED);
>+		}
>+		return mixed;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public Map<String, String> getXMLNSPrefixMap() {
>+		if (xMLNSPrefixMap == null) {
>+			xMLNSPrefixMap = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
>+		}
>+		return xMLNSPrefixMap.map();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public Map<String, String> getXSISchemaLocation() {
>+		if (xSISchemaLocation == null) {
>+			xSISchemaLocation = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
>+		}
>+		return xSISchemaLocation.map();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public Connector getConnector() {
>+		return (Connector)getMixed().get(JcaPackage.Literals.CONNECTOR_DEPLOYMENT_DESCRIPTOR__CONNECTOR, true);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetConnector(Connector newConnector, NotificationChain msgs) {
>+		return ((FeatureMap.Internal)getMixed()).basicAdd(JcaPackage.Literals.CONNECTOR_DEPLOYMENT_DESCRIPTOR__CONNECTOR, newConnector, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConnector(Connector newConnector) {
>+		((FeatureMap.Internal)getMixed()).set(JcaPackage.Literals.CONNECTOR_DEPLOYMENT_DESCRIPTOR__CONNECTOR, newConnector);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__MIXED:
>+				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap()).basicRemove(otherEnd, msgs);
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap()).basicRemove(otherEnd, msgs);
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__CONNECTOR:
>+				return basicSetConnector(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__MIXED:
>+				if (coreType) return getMixed();
>+				return ((FeatureMap.Internal)getMixed()).getWrapper();
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>+				if (coreType) return ((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap();
>+				else return getXMLNSPrefixMap();
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>+				if (coreType) return ((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap();
>+				else return getXSISchemaLocation();
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__CONNECTOR:
>+				return getConnector();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__MIXED:
>+				((FeatureMap.Internal)getMixed()).set(newValue);
>+				return;
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap()).set(newValue);
>+				return;
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getXSISchemaLocation()).eMap()).set(newValue);
>+				return;
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__CONNECTOR:
>+				setConnector((Connector)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__MIXED:
>+				getMixed().clear();
>+				return;
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>+				getXMLNSPrefixMap().clear();
>+				return;
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>+				getXSISchemaLocation().clear();
>+				return;
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__CONNECTOR:
>+				setConnector((Connector)null);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__MIXED:
>+				return mixed != null && !mixed.isEmpty();
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>+				return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION:
>+				return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR__CONNECTOR:
>+				return getConnector() != null;
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (mixed: "); //$NON-NLS-1$
>+		result.append(mixed);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //ConnectorDeploymentDescriptorImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/AuthenticationMechanismImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/AuthenticationMechanismImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/AuthenticationMechanismImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/AuthenticationMechanismImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,372 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.AuthenticationMechanism;
>+import org.eclipse.jst.javaee.jca.CredentialInterfaceType;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Authentication Mechanism'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.AuthenticationMechanismImpl#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.AuthenticationMechanismImpl#getAuthenticationMechanismType Authentication Mechanism Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.AuthenticationMechanismImpl#getCredentialInterface Credential Interface}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.AuthenticationMechanismImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class AuthenticationMechanismImpl extends EObjectImpl implements AuthenticationMechanism {
>+	/**
>+	 * The cached value of the '{@link #getDescription() Description}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDescription()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<Description> description;
>+
>+	/**
>+	 * The default value of the '{@link #getAuthenticationMechanismType() Authentication Mechanism Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getAuthenticationMechanismType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String AUTHENTICATION_MECHANISM_TYPE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getAuthenticationMechanismType() Authentication Mechanism Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getAuthenticationMechanismType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String authenticationMechanismType = AUTHENTICATION_MECHANISM_TYPE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getCredentialInterface() Credential Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getCredentialInterface()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final CredentialInterfaceType CREDENTIAL_INTERFACE_EDEFAULT = CredentialInterfaceType.JAVAX_RESOURCE_SPI_SECURITY_PASSWORD_CREDENTIAL;
>+
>+	/**
>+	 * The cached value of the '{@link #getCredentialInterface() Credential Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getCredentialInterface()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected CredentialInterfaceType credentialInterface = CREDENTIAL_INTERFACE_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Credential Interface attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean credentialInterfaceESet;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected AuthenticationMechanismImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.AUTHENTICATION_MECHANISM;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Description> getDescription() {
>+		if (description == null) {
>+			description = new EObjectContainmentEList<Description>(Description.class, this, JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION);
>+		}
>+		return description;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getAuthenticationMechanismType() {
>+		return authenticationMechanismType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setAuthenticationMechanismType(String newAuthenticationMechanismType) {
>+		String oldAuthenticationMechanismType = authenticationMechanismType;
>+		authenticationMechanismType = newAuthenticationMechanismType;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE, oldAuthenticationMechanismType, authenticationMechanismType));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CredentialInterfaceType getCredentialInterface() {
>+		return credentialInterface;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setCredentialInterface(CredentialInterfaceType newCredentialInterface) {
>+		CredentialInterfaceType oldCredentialInterface = credentialInterface;
>+		credentialInterface = newCredentialInterface == null ? CREDENTIAL_INTERFACE_EDEFAULT : newCredentialInterface;
>+		boolean oldCredentialInterfaceESet = credentialInterfaceESet;
>+		credentialInterfaceESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE, oldCredentialInterface, credentialInterface, !oldCredentialInterfaceESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetCredentialInterface() {
>+		CredentialInterfaceType oldCredentialInterface = credentialInterface;
>+		boolean oldCredentialInterfaceESet = credentialInterfaceESet;
>+		credentialInterface = CREDENTIAL_INTERFACE_EDEFAULT;
>+		credentialInterfaceESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE, oldCredentialInterface, CREDENTIAL_INTERFACE_EDEFAULT, oldCredentialInterfaceESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetCredentialInterface() {
>+		return credentialInterfaceESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
>+				return ((InternalEList<?>)getDescription()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
>+				return getDescription();
>+			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE:
>+				return getAuthenticationMechanismType();
>+			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE:
>+				return getCredentialInterface();
>+			case JcaPackage.AUTHENTICATION_MECHANISM__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
>+				getDescription().clear();
>+				getDescription().addAll((Collection<? extends Description>)newValue);
>+				return;
>+			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE:
>+				setAuthenticationMechanismType((String)newValue);
>+				return;
>+			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE:
>+				setCredentialInterface((CredentialInterfaceType)newValue);
>+				return;
>+			case JcaPackage.AUTHENTICATION_MECHANISM__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
>+				getDescription().clear();
>+				return;
>+			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE:
>+				setAuthenticationMechanismType(AUTHENTICATION_MECHANISM_TYPE_EDEFAULT);
>+				return;
>+			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE:
>+				unsetCredentialInterface();
>+				return;
>+			case JcaPackage.AUTHENTICATION_MECHANISM__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
>+				return description != null && !description.isEmpty();
>+			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE:
>+				return AUTHENTICATION_MECHANISM_TYPE_EDEFAULT == null ? authenticationMechanismType != null : !AUTHENTICATION_MECHANISM_TYPE_EDEFAULT.equals(authenticationMechanismType);
>+			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE:
>+				return isSetCredentialInterface();
>+			case JcaPackage.AUTHENTICATION_MECHANISM__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (authenticationMechanismType: "); //$NON-NLS-1$
>+		result.append(authenticationMechanismType);
>+		result.append(", credentialInterface: "); //$NON-NLS-1$
>+		if (credentialInterfaceESet) result.append(credentialInterface); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //AuthenticationMechanismImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/RequiredConfigPropertyImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/RequiredConfigPropertyImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/RequiredConfigPropertyImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/RequiredConfigPropertyImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,283 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.RequiredConfigProperty;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Required Config Property'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.RequiredConfigPropertyImpl#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.RequiredConfigPropertyImpl#getConfigPropertyName Config Property Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.RequiredConfigPropertyImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class RequiredConfigPropertyImpl extends EObjectImpl implements RequiredConfigProperty {
>+	/**
>+	 * The cached value of the '{@link #getDescription() Description}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDescription()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<Description> description;
>+
>+	/**
>+	 * The default value of the '{@link #getConfigPropertyName() Config Property Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConfigPropertyName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String CONFIG_PROPERTY_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getConfigPropertyName() Config Property Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConfigPropertyName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String configPropertyName = CONFIG_PROPERTY_NAME_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected RequiredConfigPropertyImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.REQUIRED_CONFIG_PROPERTY;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Description> getDescription() {
>+		if (description == null) {
>+			description = new EObjectContainmentEList<Description>(Description.class, this, JcaPackage.REQUIRED_CONFIG_PROPERTY__DESCRIPTION);
>+		}
>+		return description;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getConfigPropertyName() {
>+		return configPropertyName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConfigPropertyName(String newConfigPropertyName) {
>+		String oldConfigPropertyName = configPropertyName;
>+		configPropertyName = newConfigPropertyName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.REQUIRED_CONFIG_PROPERTY__CONFIG_PROPERTY_NAME, oldConfigPropertyName, configPropertyName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.REQUIRED_CONFIG_PROPERTY__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__DESCRIPTION:
>+				return ((InternalEList<?>)getDescription()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__DESCRIPTION:
>+				return getDescription();
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__CONFIG_PROPERTY_NAME:
>+				return getConfigPropertyName();
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__DESCRIPTION:
>+				getDescription().clear();
>+				getDescription().addAll((Collection<? extends Description>)newValue);
>+				return;
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__CONFIG_PROPERTY_NAME:
>+				setConfigPropertyName((String)newValue);
>+				return;
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__DESCRIPTION:
>+				getDescription().clear();
>+				return;
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__CONFIG_PROPERTY_NAME:
>+				setConfigPropertyName(CONFIG_PROPERTY_NAME_EDEFAULT);
>+				return;
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__DESCRIPTION:
>+				return description != null && !description.isEmpty();
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__CONFIG_PROPERTY_NAME:
>+				return CONFIG_PROPERTY_NAME_EDEFAULT == null ? configPropertyName != null : !CONFIG_PROPERTY_NAME_EDEFAULT.equals(configPropertyName);
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (configPropertyName: "); //$NON-NLS-1$
>+		result.append(configPropertyName);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //RequiredConfigPropertyImpl
>Index: jee-models/org/eclipse/jst/javaee/core/GenericBooleanType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/core/GenericBooleanType.java
>diff -N jee-models/org/eclipse/jst/javaee/core/GenericBooleanType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/core/GenericBooleanType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,271 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.core;
>+
>+import java.util.Arrays;
>+import java.util.Collections;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.util.Enumerator;
>+
>+/**
>+ * 
>+ * A representation of the literals of the enumeration 'Generic Boolean Type',
>+ * and utility methods for working with them.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * This type defines four different values which can designate
>+ * boolean values. This includes values yes and no which are 
>+ * not designated by xsd:boolean
>+ * 
>+ * @since Java EE 5
>+ * 
>+ * 
>+ * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getGenericBooleanType()
>+ * @generated
>+ */
>+public enum GenericBooleanType implements Enumerator {
>+	/**
>+	 * The 'True' literal object.
>+	 * 
>+	 * 
>+	 * @see #TRUE_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	TRUE(0, "true", "true"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'False' literal object.
>+	 * 
>+	 * 
>+	 * @see #FALSE_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	FALSE(1, "false", "false"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Yes' literal object.
>+	 * 
>+	 * 
>+	 * @see #YES_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	YES(2, "yes", "yes"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'No' literal object.
>+	 * 
>+	 * 
>+	 * @see #NO_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	NO(3, "no", "no"); //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'True' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'True' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #TRUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int TRUE_VALUE = 0;
>+
>+	/**
>+	 * The 'False' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'False' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #FALSE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int FALSE_VALUE = 1;
>+
>+	/**
>+	 * The 'Yes' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Yes' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #YES
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int YES_VALUE = 2;
>+
>+	/**
>+	 * The 'No' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'No' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #NO
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int NO_VALUE = 3;
>+
>+	/**
>+	 * An array of all the 'Generic Boolean Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private static final GenericBooleanType[] VALUES_ARRAY =
>+		new GenericBooleanType[] {
>+			TRUE,
>+			FALSE,
>+			YES,
>+			NO,
>+		};
>+
>+	/**
>+	 * A public read-only list of all the 'Generic Boolean Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final List<GenericBooleanType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+
>+	/**
>+	 * Returns the 'Generic Boolean Type' literal with the specified literal value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static GenericBooleanType get(String literal) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			GenericBooleanType result = VALUES_ARRAY[i];
>+			if (result.toString().equals(literal)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Generic Boolean Type' literal with the specified name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static GenericBooleanType getByName(String name) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			GenericBooleanType result = VALUES_ARRAY[i];
>+			if (result.getName().equals(name)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Generic Boolean Type' literal with the specified integer value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static GenericBooleanType get(int value) {
>+		switch (value) {
>+			case TRUE_VALUE: return TRUE;
>+			case FALSE_VALUE: return FALSE;
>+			case YES_VALUE: return YES;
>+			case NO_VALUE: return NO;
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
>+	 * Only this class can construct instances.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private GenericBooleanType(int value, String name, String literal) {
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+	
>+} //GenericBooleanType
>Index: jee-models/org/eclipse/jst/javaee/jca/License.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/License.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/License.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/License.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,146 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'License'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The licenseType specifies licensing requirements for the
>+ * resource adapter module. This type specifies whether a
>+ * license is required to deploy and use this resource adapter,
>+ * and an optional description of the licensing terms
>+ * (examples: duration of license, number of connection
>+ * restrictions). It is used by the license element.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.License#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.License#isLicenseRequired License Required}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.License#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getLicense()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface License extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Description' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Description' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Description' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getLicense_Description()
>+	 * @generated
>+	 */
>+	List<Description> getDescription();
>+
>+	/**
>+	 * Returns the value of the 'License Required' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The element license-required specifies whether a
>+	 * license is required to deploy and use the
>+	 * resource adapter. This element must be one of
>+	 * the following, "true" or "false".
>+	 * 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'License Required' attribute.
>+	 * @see #isSetLicenseRequired()
>+	 * @see #unsetLicenseRequired()
>+	 * @see #setLicenseRequired(boolean)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getLicense_LicenseRequired()
>+	 * @generated
>+	 */
>+	boolean isLicenseRequired();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.License#isLicenseRequired License Required}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'License Required' attribute.
>+	 * @see #isSetLicenseRequired()
>+	 * @see #unsetLicenseRequired()
>+	 * @see #isLicenseRequired()
>+	 * @generated
>+	 */
>+	void setLicenseRequired(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jca.License#isLicenseRequired License Required}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetLicenseRequired()
>+	 * @see #isLicenseRequired()
>+	 * @see #setLicenseRequired(boolean)
>+	 * @generated
>+	 */
>+	void unsetLicenseRequired();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jca.License#isLicenseRequired License Required}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'License Required' attribute is set.
>+	 * @see #unsetLicenseRequired()
>+	 * @see #isLicenseRequired()
>+	 * @see #setLicenseRequired(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetLicenseRequired();
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getLicense_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.License#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // License
>Index: jee-models/org/eclipse/jst/javaee/jca/AuthenticationMechanism.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/AuthenticationMechanism.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/AuthenticationMechanism.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/AuthenticationMechanism.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,191 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Authentication Mechanism'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The authentication-mechanismType specifies an authentication
>+ * mechanism supported by the resource adapter. Note that this
>+ * support is for the resource adapter and not for the
>+ * underlying EIS instance. The optional description specifies
>+ * any resource adapter specific requirement for the support of
>+ * security contract and authentication mechanism.
>+ * 
>+ * Note that BasicPassword mechanism type should support the
>+ * javax.resource.spi.security.PasswordCredential interface.
>+ * The Kerbv5 mechanism type should support the
>+ * org.ietf.jgss.GSSCredential interface or the deprecated
>+ * javax.resource.spi.security.GenericCredential interface.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.AuthenticationMechanism#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.AuthenticationMechanism#getAuthenticationMechanismType Authentication Mechanism Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.AuthenticationMechanism#getCredentialInterface Credential Interface}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.AuthenticationMechanism#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getAuthenticationMechanism()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface AuthenticationMechanism extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Description' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Description' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Description' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getAuthenticationMechanism_Description()
>+	 * @generated
>+	 */
>+	List<Description> getDescription();
>+
>+	/**
>+	 * Returns the value of the 'Authentication Mechanism Type' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * <![CDATA[[
>+	 * The element authentication-mechanism-type specifies
>+	 * type of an authentication mechanism.
>+	 * 
>+	 * The example values are:
>+	 * 
>+	 * <authentication-mechanism-type>BasicPassword
>+	 * </authentication-mechanism-type>
>+	 * 
>+	 * <authentication-mechanism-type>Kerbv5
>+	 * </authentication-mechanism-type>
>+	 * 
>+	 * Any additional security mechanisms are outside the
>+	 * scope of the Connector architecture specification.
>+	 * 
>+	 * ]]>
>+	 * 			@since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Authentication Mechanism Type' attribute.
>+	 * @see #setAuthenticationMechanismType(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getAuthenticationMechanism_AuthenticationMechanismType()
>+	 * @generated
>+	 */
>+	String getAuthenticationMechanismType();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.AuthenticationMechanism#getAuthenticationMechanismType Authentication Mechanism Type}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Authentication Mechanism Type' attribute.
>+	 * @see #getAuthenticationMechanismType()
>+	 * @generated
>+	 */
>+	void setAuthenticationMechanismType(String value);
>+
>+	/**
>+	 * Returns the value of the 'Credential Interface' attribute.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.jca.CredentialInterfaceType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Credential Interface' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Credential Interface' attribute.
>+	 * @see org.eclipse.jst.javaee.jca.CredentialInterfaceType
>+	 * @see #isSetCredentialInterface()
>+	 * @see #unsetCredentialInterface()
>+	 * @see #setCredentialInterface(CredentialInterfaceType)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getAuthenticationMechanism_CredentialInterface()
>+	 * @generated
>+	 */
>+	CredentialInterfaceType getCredentialInterface();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.AuthenticationMechanism#getCredentialInterface Credential Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Credential Interface' attribute.
>+	 * @see org.eclipse.jst.javaee.jca.CredentialInterfaceType
>+	 * @see #isSetCredentialInterface()
>+	 * @see #unsetCredentialInterface()
>+	 * @see #getCredentialInterface()
>+	 * @generated
>+	 */
>+	void setCredentialInterface(CredentialInterfaceType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.jca.AuthenticationMechanism#getCredentialInterface Credential Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetCredentialInterface()
>+	 * @see #getCredentialInterface()
>+	 * @see #setCredentialInterface(CredentialInterfaceType)
>+	 * @generated
>+	 */
>+	void unsetCredentialInterface();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.jca.AuthenticationMechanism#getCredentialInterface Credential Interface}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Credential Interface' attribute is set.
>+	 * @see #unsetCredentialInterface()
>+	 * @see #getCredentialInterface()
>+	 * @see #setCredentialInterface(CredentialInterfaceType)
>+	 * @generated
>+	 */
>+	boolean isSetCredentialInterface();
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getAuthenticationMechanism_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.AuthenticationMechanism#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // AuthenticationMechanism
>Index: jee-models/org/eclipse/jst/javaee/jca/ConnectorDeploymentDescriptor.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/ConnectorDeploymentDescriptor.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/ConnectorDeploymentDescriptor.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/ConnectorDeploymentDescriptor.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,117 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.Map;
>+
>+import org.eclipse.emf.ecore.util.FeatureMap;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Connector Deployment Descriptor'.
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConnectorDeploymentDescriptor#getMixed Mixed}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConnectorDeploymentDescriptor#getXMLNSPrefixMap XMLNS Prefix Map}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConnectorDeploymentDescriptor#getXSISchemaLocation XSI Schema Location}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConnectorDeploymentDescriptor#getConnector Connector}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectorDeploymentDescriptor()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface ConnectorDeploymentDescriptor extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Mixed' attribute list.
>+	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Mixed' attribute list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Mixed' attribute list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectorDeploymentDescriptor_Mixed()
>+	 * @generated
>+	 */
>+	FeatureMap getMixed();
>+
>+	/**
>+	 * Returns the value of the 'XMLNS Prefix Map' map.
>+	 * The key is of type {@link java.lang.String},
>+	 * and the value is of type {@link java.lang.String},
>+	 * 
>+	 * 
>+	 * If the meaning of the 'XMLNS Prefix Map' map isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'XMLNS Prefix Map' map.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectorDeploymentDescriptor_XMLNSPrefixMap()
>+	 * @generated
>+	 */
>+	Map<String, String> getXMLNSPrefixMap();
>+
>+	/**
>+	 * Returns the value of the 'XSI Schema Location' map.
>+	 * The key is of type {@link java.lang.String},
>+	 * and the value is of type {@link java.lang.String},
>+	 * 
>+	 * 
>+	 * If the meaning of the 'XSI Schema Location' map isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'XSI Schema Location' map.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectorDeploymentDescriptor_XSISchemaLocation()
>+	 * @generated
>+	 */
>+	Map<String, String> getXSISchemaLocation();
>+
>+	/**
>+	 * Returns the value of the 'Connector' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The connector element is the root element of the deployment
>+	 * descriptor for the resource adapter. This element includes
>+	 * general information - vendor name, resource adapter version,
>+	 * icon - about the resource adapter module. It also includes
>+	 * information specific to the implementation of the resource
>+	 * adapter library as specified through the element
>+	 * resourceadapter.
>+	 * 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Connector' containment reference.
>+	 * @see #setConnector(Connector)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectorDeploymentDescriptor_Connector()
>+	 * @generated
>+	 */
>+	Connector getConnector();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConnectorDeploymentDescriptor#getConnector Connector}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Connector' containment reference.
>+	 * @see #getConnector()
>+	 * @generated
>+	 */
>+	void setConnector(Connector value);
>+
>+} // ConnectorDeploymentDescriptor
>Index: jee-models/org/eclipse/jst/javaee/jca/ActivationSpec.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/ActivationSpec.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/ActivationSpec.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/ActivationSpec.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,149 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Activation Spec'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The activationspecType specifies an activation
>+ * specification. The information includes fully qualified
>+ * Java class name of an activation specification and a set of
>+ * required configuration property names.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ActivationSpec#getActivationspecClass Activationspec Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ActivationSpec#getRequiredConfigProperty Required Config Property}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ActivationSpec#getConfigProperty Config Property}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ActivationSpec#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getActivationSpec()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface ActivationSpec extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Activationspec Class' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * <![CDATA[[
>+	 * The element activationspec-class specifies the fully
>+	 * qualified Java class name of the activation
>+	 * specification class. This class must implement the
>+	 * javax.resource.spi.ActivationSpec interface. The
>+	 * implementation of this class is required to be a
>+	 * JavaBean.
>+	 * 
>+	 * Example:
>+	 * 	 <activationspec-class>com.wombat.ActivationSpecImpl
>+	 * 	 </activationspec-class>
>+	 * 
>+	 * ]]>
>+	 * 			@since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Activationspec Class' attribute.
>+	 * @see #setActivationspecClass(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getActivationSpec_ActivationspecClass()
>+	 * @generated
>+	 */
>+	String getActivationspecClass();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ActivationSpec#getActivationspecClass Activationspec Class}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Activationspec Class' attribute.
>+	 * @see #getActivationspecClass()
>+	 * @generated
>+	 */
>+	void setActivationspecClass(String value);
>+
>+	/**
>+	 * Returns the value of the 'Required Config Property' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.jca.RequiredConfigProperty}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The required-config-property element is deprecated since
>+	 * Connectors 1.6 specification. The resource adapter 
>+	 * implementation is recommended to use the @NotNull
>+	 * Bean Validation annotation or its XML validation
>+	 * descriptor equivalent to indicate that a configuration
>+	 * property is required to be specified by the deployer.
>+	 * See the Connectors specification for more information. 
>+	 * 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Required Config Property' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getActivationSpec_RequiredConfigProperty()
>+	 * @generated
>+	 */
>+	List<RequiredConfigProperty> getRequiredConfigProperty();
>+
>+	/**
>+	 * Returns the value of the 'Config Property' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.jca.ConfigProperty}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Config Property' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Config Property' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getActivationSpec_ConfigProperty()
>+	 * @generated
>+	 */
>+	List<ConfigProperty> getConfigProperty();
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getActivationSpec_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ActivationSpec#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // ActivationSpec
>Index: jee-models/org/eclipse/jst/javaee/core/AddressingType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/core/AddressingType.java
>diff -N jee-models/org/eclipse/jst/javaee/core/AddressingType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/core/AddressingType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,218 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.core;
>+
>+
>+/**
>+ * 
>+ * A representation of the model object 'Addressing Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * This specifies the WS-Addressing requirements for a JAX-WS web service.
>+ * It corresponds to javax.xml.ws.soap.Addressing annotation or its
>+ * feature javax.xml.ws.soap.AddressingFeature.
>+ * 
>+ * If the "enabled" element is "true", WS-Addressing is enabled.
>+ * It means that the endpoint supports WS-Addressing but does not require
>+ * its use. The default value for "enabled" is "true".
>+ * 
>+ * If the WS-Addressing is enabled and the "required" element is "true",
>+ * it means that the endpoint requires WS-Addressing. The default value
>+ * for "required" is "false".
>+ * 
>+ * If WS-Addressing is enabled, the "responses" element determines
>+ * if an endpoint requires the use of only anonymous responses,
>+ * or only non-anonymous responses, or all. The value of the "responses"
>+ * element must be one of the following:
>+ * 
>+ * ANONYMOUS
>+ * NON_ANONYMOUS
>+ * ALL
>+ * 
>+ * The default value for the "responses" is ALL.
>+ * 
>+ * @since Java EE 6, Web Services Client 1.3
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.core.AddressingType#isEnabled Enabled}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.AddressingType#isRequired Required}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.AddressingType#getResponses Responses}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getAddressingType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface AddressingType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Enabled' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Enabled' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Enabled' attribute.
>+	 * @see #isSetEnabled()
>+	 * @see #unsetEnabled()
>+	 * @see #setEnabled(boolean)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getAddressingType_Enabled()
>+	 * @generated
>+	 */
>+	boolean isEnabled();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.AddressingType#isEnabled Enabled}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Enabled' attribute.
>+	 * @see #isSetEnabled()
>+	 * @see #unsetEnabled()
>+	 * @see #isEnabled()
>+	 * @generated
>+	 */
>+	void setEnabled(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.AddressingType#isEnabled Enabled}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetEnabled()
>+	 * @see #isEnabled()
>+	 * @see #setEnabled(boolean)
>+	 * @generated
>+	 */
>+	void unsetEnabled();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.AddressingType#isEnabled Enabled}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Enabled' attribute is set.
>+	 * @see #unsetEnabled()
>+	 * @see #isEnabled()
>+	 * @see #setEnabled(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetEnabled();
>+
>+	/**
>+	 * Returns the value of the 'Required' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Required' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Required' attribute.
>+	 * @see #isSetRequired()
>+	 * @see #unsetRequired()
>+	 * @see #setRequired(boolean)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getAddressingType_Required()
>+	 * @generated
>+	 */
>+	boolean isRequired();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.AddressingType#isRequired Required}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Required' attribute.
>+	 * @see #isSetRequired()
>+	 * @see #unsetRequired()
>+	 * @see #isRequired()
>+	 * @generated
>+	 */
>+	void setRequired(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.AddressingType#isRequired Required}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetRequired()
>+	 * @see #isRequired()
>+	 * @see #setRequired(boolean)
>+	 * @generated
>+	 */
>+	void unsetRequired();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.AddressingType#isRequired Required}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Required' attribute is set.
>+	 * @see #unsetRequired()
>+	 * @see #isRequired()
>+	 * @see #setRequired(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetRequired();
>+
>+	/**
>+	 * Returns the value of the 'Responses' attribute.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.core.AddressingResponsesType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Responses' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Responses' attribute.
>+	 * @see org.eclipse.jst.javaee.core.AddressingResponsesType
>+	 * @see #isSetResponses()
>+	 * @see #unsetResponses()
>+	 * @see #setResponses(AddressingResponsesType)
>+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getAddressingType_Responses()
>+	 * @generated
>+	 */
>+	AddressingResponsesType getResponses();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.AddressingType#getResponses Responses}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Responses' attribute.
>+	 * @see org.eclipse.jst.javaee.core.AddressingResponsesType
>+	 * @see #isSetResponses()
>+	 * @see #unsetResponses()
>+	 * @see #getResponses()
>+	 * @generated
>+	 */
>+	void setResponses(AddressingResponsesType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.core.AddressingType#getResponses Responses}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetResponses()
>+	 * @see #getResponses()
>+	 * @see #setResponses(AddressingResponsesType)
>+	 * @generated
>+	 */
>+	void unsetResponses();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.core.AddressingType#getResponses Responses}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Responses' attribute is set.
>+	 * @see #unsetResponses()
>+	 * @see #getResponses()
>+	 * @see #setResponses(AddressingResponsesType)
>+	 * @generated
>+	 */
>+	boolean isSetResponses();
>+
>+} // AddressingType
>Index: jee-models/org/eclipse/jst/javaee/jca/SecurityPermission.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/SecurityPermission.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/SecurityPermission.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/SecurityPermission.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,125 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Security Permission'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The security-permissionType specifies a security
>+ * permission that is required by the resource adapter code.
>+ * 
>+ * The security permission listed in the deployment descriptor
>+ * are ones that are different from those required by the
>+ * default permission set as specified in the connector
>+ * specification. The optional description can mention specific
>+ * reason that resource adapter requires a given security
>+ * permission.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.SecurityPermission#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.SecurityPermission#getSecurityPermissionSpec Security Permission Spec}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.SecurityPermission#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getSecurityPermission()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface SecurityPermission extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Description' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Description' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Description' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getSecurityPermission_Description()
>+	 * @generated
>+	 */
>+	List<Description> getDescription();
>+
>+	/**
>+	 * Returns the value of the 'Security Permission Spec' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The element security-permission-spec specifies a security
>+	 * permission based on the Security policy file
>+	 * syntax. Refer to the following URL for Sun's
>+	 * implementation of the security permission
>+	 * specification:
>+	 * 
>+	 * http://java.sun.com/products/jdk/1.4/docs/guide/security/PolicyFiles.html#FileSyntax
>+	 * 
>+	 * @since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Security Permission Spec' attribute.
>+	 * @see #setSecurityPermissionSpec(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getSecurityPermission_SecurityPermissionSpec()
>+	 * @generated
>+	 */
>+	String getSecurityPermissionSpec();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.SecurityPermission#getSecurityPermissionSpec Security Permission Spec}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Security Permission Spec' attribute.
>+	 * @see #getSecurityPermissionSpec()
>+	 * @generated
>+	 */
>+	void setSecurityPermissionSpec(String value);
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getSecurityPermission_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.SecurityPermission#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // SecurityPermission
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectionDefinitionImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectionDefinitionImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectionDefinitionImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectionDefinitionImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,498 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.ConfigProperty;
>+import org.eclipse.jst.javaee.jca.ConnectionDefinition;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Connection Definition'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectionDefinitionImpl#getManagedconnectionfactoryClass Managedconnectionfactory Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectionDefinitionImpl#getConfigProperty Config Property}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectionDefinitionImpl#getConnectionfactoryInterface Connectionfactory Interface}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectionDefinitionImpl#getConnectionfactoryImplClass Connectionfactory Impl Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectionDefinitionImpl#getConnectionInterface Connection Interface}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectionDefinitionImpl#getConnectionImplClass Connection Impl Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectionDefinitionImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ConnectionDefinitionImpl extends EObjectImpl implements ConnectionDefinition {
>+	/**
>+	 * The default value of the '{@link #getManagedconnectionfactoryClass() Managedconnectionfactory Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getManagedconnectionfactoryClass()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String MANAGEDCONNECTIONFACTORY_CLASS_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getManagedconnectionfactoryClass() Managedconnectionfactory Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getManagedconnectionfactoryClass()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String managedconnectionfactoryClass = MANAGEDCONNECTIONFACTORY_CLASS_EDEFAULT;
>+
>+	/**
>+	 * The cached value of the '{@link #getConfigProperty() Config Property}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getConfigProperty()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ConfigProperty> configProperty;
>+
>+	/**
>+	 * The default value of the '{@link #getConnectionfactoryInterface() Connectionfactory Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConnectionfactoryInterface()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String CONNECTIONFACTORY_INTERFACE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getConnectionfactoryInterface() Connectionfactory Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConnectionfactoryInterface()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String connectionfactoryInterface = CONNECTIONFACTORY_INTERFACE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getConnectionfactoryImplClass() Connectionfactory Impl Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConnectionfactoryImplClass()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String CONNECTIONFACTORY_IMPL_CLASS_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getConnectionfactoryImplClass() Connectionfactory Impl Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConnectionfactoryImplClass()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String connectionfactoryImplClass = CONNECTIONFACTORY_IMPL_CLASS_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getConnectionInterface() Connection Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConnectionInterface()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String CONNECTION_INTERFACE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getConnectionInterface() Connection Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConnectionInterface()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String connectionInterface = CONNECTION_INTERFACE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getConnectionImplClass() Connection Impl Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConnectionImplClass()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String CONNECTION_IMPL_CLASS_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getConnectionImplClass() Connection Impl Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConnectionImplClass()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String connectionImplClass = CONNECTION_IMPL_CLASS_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected ConnectionDefinitionImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.CONNECTION_DEFINITION;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getManagedconnectionfactoryClass() {
>+		return managedconnectionfactoryClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setManagedconnectionfactoryClass(String newManagedconnectionfactoryClass) {
>+		String oldManagedconnectionfactoryClass = managedconnectionfactoryClass;
>+		managedconnectionfactoryClass = newManagedconnectionfactoryClass;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__MANAGEDCONNECTIONFACTORY_CLASS, oldManagedconnectionfactoryClass, managedconnectionfactoryClass));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ConfigProperty> getConfigProperty() {
>+		if (configProperty == null) {
>+			configProperty = new EObjectContainmentEList<ConfigProperty>(ConfigProperty.class, this, JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTY);
>+		}
>+		return configProperty;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getConnectionfactoryInterface() {
>+		return connectionfactoryInterface;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConnectionfactoryInterface(String newConnectionfactoryInterface) {
>+		String oldConnectionfactoryInterface = connectionfactoryInterface;
>+		connectionfactoryInterface = newConnectionfactoryInterface;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__CONNECTIONFACTORY_INTERFACE, oldConnectionfactoryInterface, connectionfactoryInterface));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getConnectionfactoryImplClass() {
>+		return connectionfactoryImplClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConnectionfactoryImplClass(String newConnectionfactoryImplClass) {
>+		String oldConnectionfactoryImplClass = connectionfactoryImplClass;
>+		connectionfactoryImplClass = newConnectionfactoryImplClass;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__CONNECTIONFACTORY_IMPL_CLASS, oldConnectionfactoryImplClass, connectionfactoryImplClass));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getConnectionInterface() {
>+		return connectionInterface;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConnectionInterface(String newConnectionInterface) {
>+		String oldConnectionInterface = connectionInterface;
>+		connectionInterface = newConnectionInterface;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE, oldConnectionInterface, connectionInterface));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getConnectionImplClass() {
>+		return connectionImplClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConnectionImplClass(String newConnectionImplClass) {
>+		String oldConnectionImplClass = connectionImplClass;
>+		connectionImplClass = newConnectionImplClass;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS, oldConnectionImplClass, connectionImplClass));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTY:
>+				return ((InternalEList<?>)getConfigProperty()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTION_DEFINITION__MANAGEDCONNECTIONFACTORY_CLASS:
>+				return getManagedconnectionfactoryClass();
>+			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTY:
>+				return getConfigProperty();
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTIONFACTORY_INTERFACE:
>+				return getConnectionfactoryInterface();
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTIONFACTORY_IMPL_CLASS:
>+				return getConnectionfactoryImplClass();
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE:
>+				return getConnectionInterface();
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS:
>+				return getConnectionImplClass();
>+			case JcaPackage.CONNECTION_DEFINITION__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTION_DEFINITION__MANAGEDCONNECTIONFACTORY_CLASS:
>+				setManagedconnectionfactoryClass((String)newValue);
>+				return;
>+			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTY:
>+				getConfigProperty().clear();
>+				getConfigProperty().addAll((Collection<? extends ConfigProperty>)newValue);
>+				return;
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTIONFACTORY_INTERFACE:
>+				setConnectionfactoryInterface((String)newValue);
>+				return;
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTIONFACTORY_IMPL_CLASS:
>+				setConnectionfactoryImplClass((String)newValue);
>+				return;
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE:
>+				setConnectionInterface((String)newValue);
>+				return;
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS:
>+				setConnectionImplClass((String)newValue);
>+				return;
>+			case JcaPackage.CONNECTION_DEFINITION__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTION_DEFINITION__MANAGEDCONNECTIONFACTORY_CLASS:
>+				setManagedconnectionfactoryClass(MANAGEDCONNECTIONFACTORY_CLASS_EDEFAULT);
>+				return;
>+			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTY:
>+				getConfigProperty().clear();
>+				return;
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTIONFACTORY_INTERFACE:
>+				setConnectionfactoryInterface(CONNECTIONFACTORY_INTERFACE_EDEFAULT);
>+				return;
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTIONFACTORY_IMPL_CLASS:
>+				setConnectionfactoryImplClass(CONNECTIONFACTORY_IMPL_CLASS_EDEFAULT);
>+				return;
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE:
>+				setConnectionInterface(CONNECTION_INTERFACE_EDEFAULT);
>+				return;
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS:
>+				setConnectionImplClass(CONNECTION_IMPL_CLASS_EDEFAULT);
>+				return;
>+			case JcaPackage.CONNECTION_DEFINITION__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.CONNECTION_DEFINITION__MANAGEDCONNECTIONFACTORY_CLASS:
>+				return MANAGEDCONNECTIONFACTORY_CLASS_EDEFAULT == null ? managedconnectionfactoryClass != null : !MANAGEDCONNECTIONFACTORY_CLASS_EDEFAULT.equals(managedconnectionfactoryClass);
>+			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTY:
>+				return configProperty != null && !configProperty.isEmpty();
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTIONFACTORY_INTERFACE:
>+				return CONNECTIONFACTORY_INTERFACE_EDEFAULT == null ? connectionfactoryInterface != null : !CONNECTIONFACTORY_INTERFACE_EDEFAULT.equals(connectionfactoryInterface);
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTIONFACTORY_IMPL_CLASS:
>+				return CONNECTIONFACTORY_IMPL_CLASS_EDEFAULT == null ? connectionfactoryImplClass != null : !CONNECTIONFACTORY_IMPL_CLASS_EDEFAULT.equals(connectionfactoryImplClass);
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE:
>+				return CONNECTION_INTERFACE_EDEFAULT == null ? connectionInterface != null : !CONNECTION_INTERFACE_EDEFAULT.equals(connectionInterface);
>+			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS:
>+				return CONNECTION_IMPL_CLASS_EDEFAULT == null ? connectionImplClass != null : !CONNECTION_IMPL_CLASS_EDEFAULT.equals(connectionImplClass);
>+			case JcaPackage.CONNECTION_DEFINITION__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (managedconnectionfactoryClass: "); //$NON-NLS-1$
>+		result.append(managedconnectionfactoryClass);
>+		result.append(", connectionfactoryInterface: "); //$NON-NLS-1$
>+		result.append(connectionfactoryInterface);
>+		result.append(", connectionfactoryImplClass: "); //$NON-NLS-1$
>+		result.append(connectionfactoryImplClass);
>+		result.append(", connectionInterface: "); //$NON-NLS-1$
>+		result.append(connectionInterface);
>+		result.append(", connectionImplClass: "); //$NON-NLS-1$
>+		result.append(connectionImplClass);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //ConnectionDefinitionImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/TransactionSupportType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/TransactionSupportType.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/TransactionSupportType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/TransactionSupportType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,251 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.Arrays;
>+import java.util.Collections;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.util.Enumerator;
>+
>+/**
>+ * 
>+ * A representation of the literals of the enumeration 'Transaction Support Type',
>+ * and utility methods for working with them.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * The transaction-supportType specifies the level of
>+ * transaction support provided by the resource adapter. It is
>+ * used by transaction-support elements.
>+ * 
>+ * The value must be one of the following:
>+ * 
>+ * NoTransaction
>+ * LocalTransaction
>+ * XATransaction
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getTransactionSupportType()
>+ * @generated
>+ */
>+public enum TransactionSupportType implements Enumerator {
>+	/**
>+	 * The 'No Transaction' literal object.
>+	 * 
>+	 * 
>+	 * @see #NO_TRANSACTION_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	NO_TRANSACTION(0, "NoTransaction", "NoTransaction"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Local Transaction' literal object.
>+	 * 
>+	 * 
>+	 * @see #LOCAL_TRANSACTION_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	LOCAL_TRANSACTION(1, "LocalTransaction", "LocalTransaction"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'XA Transaction' literal object.
>+	 * 
>+	 * 
>+	 * @see #XA_TRANSACTION_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	XA_TRANSACTION(2, "XATransaction", "XATransaction"); //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'No Transaction' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'No Transaction' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #NO_TRANSACTION
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int NO_TRANSACTION_VALUE = 0;
>+
>+	/**
>+	 * The 'Local Transaction' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Local Transaction' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #LOCAL_TRANSACTION
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int LOCAL_TRANSACTION_VALUE = 1;
>+
>+	/**
>+	 * The 'XA Transaction' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'XA Transaction' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #XA_TRANSACTION
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int XA_TRANSACTION_VALUE = 2;
>+
>+	/**
>+	 * An array of all the 'Transaction Support Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private static final TransactionSupportType[] VALUES_ARRAY =
>+		new TransactionSupportType[] {
>+			NO_TRANSACTION,
>+			LOCAL_TRANSACTION,
>+			XA_TRANSACTION,
>+		};
>+
>+	/**
>+	 * A public read-only list of all the 'Transaction Support Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final List<TransactionSupportType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+
>+	/**
>+	 * Returns the 'Transaction Support Type' literal with the specified literal value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static TransactionSupportType get(String literal) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			TransactionSupportType result = VALUES_ARRAY[i];
>+			if (result.toString().equals(literal)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Transaction Support Type' literal with the specified name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static TransactionSupportType getByName(String name) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			TransactionSupportType result = VALUES_ARRAY[i];
>+			if (result.getName().equals(name)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Transaction Support Type' literal with the specified integer value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static TransactionSupportType get(int value) {
>+		switch (value) {
>+			case NO_TRANSACTION_VALUE: return NO_TRANSACTION;
>+			case LOCAL_TRANSACTION_VALUE: return LOCAL_TRANSACTION;
>+			case XA_TRANSACTION_VALUE: return XA_TRANSACTION;
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
>+	 * Only this class can construct instances.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private TransactionSupportType(int value, String name, String literal) {
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+	
>+} //TransactionSupportType
>Index: jee-models/org/eclipse/jst/javaee/jca/ConfigPropertyTypeType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/ConfigPropertyTypeType.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/ConfigPropertyTypeType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/ConfigPropertyTypeType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,411 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.Arrays;
>+import java.util.Collections;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.util.Enumerator;
>+
>+/**
>+ * 
>+ * A representation of the literals of the enumeration 'Config Property Type Type',
>+ * and utility methods for working with them.
>+ * 
>+ * 
>+ * 
>+ * <![CDATA[[
>+ * The config-property-typeType contains the fully
>+ * qualified Java type of a configuration property.
>+ * 
>+ * The following are the legal values:
>+ * java.lang.Boolean, java.lang.String, java.lang.Integer,
>+ * java.lang.Double, java.lang.Byte, java.lang.Short,
>+ * java.lang.Long, java.lang.Float, java.lang.Character
>+ * 
>+ * Used in: config-property
>+ * 
>+ * Example:
>+ * <config-property-type>java.lang.String</config-property-type>
>+ * 
>+ * ]]>
>+ * 		@since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConfigPropertyTypeType()
>+ * @generated
>+ */
>+public enum ConfigPropertyTypeType implements Enumerator {
>+	/**
>+	 * The 'Java Lang Boolean' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_BOOLEAN_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVA_LANG_BOOLEAN(0, "javaLangBoolean", "java.lang.Boolean"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Java Lang String' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_STRING_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVA_LANG_STRING(1, "javaLangString", "java.lang.String"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Java Lang Integer' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_INTEGER_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVA_LANG_INTEGER(2, "javaLangInteger", "java.lang.Integer"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Java Lang Double' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_DOUBLE_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVA_LANG_DOUBLE(3, "javaLangDouble", "java.lang.Double"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Java Lang Byte' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_BYTE_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVA_LANG_BYTE(4, "javaLangByte", "java.lang.Byte"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Java Lang Short' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_SHORT_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVA_LANG_SHORT(5, "javaLangShort", "java.lang.Short"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Java Lang Long' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_LONG_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVA_LANG_LONG(6, "javaLangLong", "java.lang.Long"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Java Lang Float' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_FLOAT_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVA_LANG_FLOAT(7, "javaLangFloat", "java.lang.Float"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Java Lang Character' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_CHARACTER_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVA_LANG_CHARACTER(8, "javaLangCharacter", "java.lang.Character"); //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Java Lang Boolean' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Java Lang Boolean' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_BOOLEAN
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int JAVA_LANG_BOOLEAN_VALUE = 0;
>+
>+	/**
>+	 * The 'Java Lang String' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Java Lang String' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_STRING
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int JAVA_LANG_STRING_VALUE = 1;
>+
>+	/**
>+	 * The 'Java Lang Integer' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Java Lang Integer' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_INTEGER
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int JAVA_LANG_INTEGER_VALUE = 2;
>+
>+	/**
>+	 * The 'Java Lang Double' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Java Lang Double' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_DOUBLE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int JAVA_LANG_DOUBLE_VALUE = 3;
>+
>+	/**
>+	 * The 'Java Lang Byte' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Java Lang Byte' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_BYTE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int JAVA_LANG_BYTE_VALUE = 4;
>+
>+	/**
>+	 * The 'Java Lang Short' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Java Lang Short' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_SHORT
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int JAVA_LANG_SHORT_VALUE = 5;
>+
>+	/**
>+	 * The 'Java Lang Long' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Java Lang Long' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_LONG
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int JAVA_LANG_LONG_VALUE = 6;
>+
>+	/**
>+	 * The 'Java Lang Float' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Java Lang Float' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_FLOAT
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int JAVA_LANG_FLOAT_VALUE = 7;
>+
>+	/**
>+	 * The 'Java Lang Character' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Java Lang Character' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #JAVA_LANG_CHARACTER
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int JAVA_LANG_CHARACTER_VALUE = 8;
>+
>+	/**
>+	 * An array of all the 'Config Property Type Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private static final ConfigPropertyTypeType[] VALUES_ARRAY =
>+		new ConfigPropertyTypeType[] {
>+			JAVA_LANG_BOOLEAN,
>+			JAVA_LANG_STRING,
>+			JAVA_LANG_INTEGER,
>+			JAVA_LANG_DOUBLE,
>+			JAVA_LANG_BYTE,
>+			JAVA_LANG_SHORT,
>+			JAVA_LANG_LONG,
>+			JAVA_LANG_FLOAT,
>+			JAVA_LANG_CHARACTER,
>+		};
>+
>+	/**
>+	 * A public read-only list of all the 'Config Property Type Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final List<ConfigPropertyTypeType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+
>+	/**
>+	 * Returns the 'Config Property Type Type' literal with the specified literal value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static ConfigPropertyTypeType get(String literal) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			ConfigPropertyTypeType result = VALUES_ARRAY[i];
>+			if (result.toString().equals(literal)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Config Property Type Type' literal with the specified name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static ConfigPropertyTypeType getByName(String name) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			ConfigPropertyTypeType result = VALUES_ARRAY[i];
>+			if (result.getName().equals(name)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Config Property Type Type' literal with the specified integer value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static ConfigPropertyTypeType get(int value) {
>+		switch (value) {
>+			case JAVA_LANG_BOOLEAN_VALUE: return JAVA_LANG_BOOLEAN;
>+			case JAVA_LANG_STRING_VALUE: return JAVA_LANG_STRING;
>+			case JAVA_LANG_INTEGER_VALUE: return JAVA_LANG_INTEGER;
>+			case JAVA_LANG_DOUBLE_VALUE: return JAVA_LANG_DOUBLE;
>+			case JAVA_LANG_BYTE_VALUE: return JAVA_LANG_BYTE;
>+			case JAVA_LANG_SHORT_VALUE: return JAVA_LANG_SHORT;
>+			case JAVA_LANG_LONG_VALUE: return JAVA_LANG_LONG;
>+			case JAVA_LANG_FLOAT_VALUE: return JAVA_LANG_FLOAT;
>+			case JAVA_LANG_CHARACTER_VALUE: return JAVA_LANG_CHARACTER;
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
>+	 * Only this class can construct instances.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private ConfigPropertyTypeType(int value, String name, String literal) {
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+	
>+} //ConfigPropertyTypeType
>Index: jee-models/org/eclipse/jst/javaee/jca/MessageAdapter.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/MessageAdapter.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/MessageAdapter.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/MessageAdapter.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,84 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Message Adapter'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The messageadapterType specifies information about the
>+ * messaging capabilities of the resource adapter. This
>+ * contains information specific to the implementation of the
>+ * resource adapter library as specified through the
>+ * messagelistener element.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.MessageAdapter#getMessagelistener Messagelistener}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.MessageAdapter#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getMessageAdapter()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface MessageAdapter extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Messagelistener' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.jca.MessageListener}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Messagelistener' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Messagelistener' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getMessageAdapter_Messagelistener()
>+	 * @generated
>+	 */
>+	List<MessageListener> getMessagelistener();
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getMessageAdapter_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.MessageAdapter#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // MessageAdapter
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/InboundResourceAdapterImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/InboundResourceAdapterImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/InboundResourceAdapterImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/InboundResourceAdapterImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,249 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.InboundResourceAdapter;
>+import org.eclipse.jst.javaee.jca.MessageAdapter;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Inbound Resource Adapter'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.InboundResourceAdapterImpl#getMessageadapter Messageadapter}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.InboundResourceAdapterImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class InboundResourceAdapterImpl extends EObjectImpl implements InboundResourceAdapter {
>+	/**
>+	 * The cached value of the '{@link #getMessageadapter() Messageadapter}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getMessageadapter()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected MessageAdapter messageadapter;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected InboundResourceAdapterImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.INBOUND_RESOURCE_ADAPTER;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public MessageAdapter getMessageadapter() {
>+		return messageadapter;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetMessageadapter(MessageAdapter newMessageadapter, NotificationChain msgs) {
>+		MessageAdapter oldMessageadapter = messageadapter;
>+		messageadapter = newMessageadapter;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGEADAPTER, oldMessageadapter, newMessageadapter);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMessageadapter(MessageAdapter newMessageadapter) {
>+		if (newMessageadapter != messageadapter) {
>+			NotificationChain msgs = null;
>+			if (messageadapter != null)
>+				msgs = ((InternalEObject)messageadapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGEADAPTER, null, msgs);
>+			if (newMessageadapter != null)
>+				msgs = ((InternalEObject)newMessageadapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGEADAPTER, null, msgs);
>+			msgs = basicSetMessageadapter(newMessageadapter, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGEADAPTER, newMessageadapter, newMessageadapter));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.INBOUND_RESOURCE_ADAPTER__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGEADAPTER:
>+				return basicSetMessageadapter(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGEADAPTER:
>+				return getMessageadapter();
>+			case JcaPackage.INBOUND_RESOURCE_ADAPTER__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGEADAPTER:
>+				setMessageadapter((MessageAdapter)newValue);
>+				return;
>+			case JcaPackage.INBOUND_RESOURCE_ADAPTER__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGEADAPTER:
>+				setMessageadapter((MessageAdapter)null);
>+				return;
>+			case JcaPackage.INBOUND_RESOURCE_ADAPTER__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGEADAPTER:
>+				return messageadapter != null;
>+			case JcaPackage.INBOUND_RESOURCE_ADAPTER__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //InboundResourceAdapterImpl
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/DataSourceTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/core/internal/impl/DataSourceTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/core/internal/impl/DataSourceTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/DataSourceTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,1230 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.core.internal.impl;
>+
>+import java.math.BigInteger;
>+
>+import java.util.Collection;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+
>+import org.eclipse.emf.common.util.EList;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
>+import org.eclipse.emf.ecore.util.InternalEList;
>+
>+import org.eclipse.jst.javaee.core.DataSourceType;
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.IsolationLevelType;
>+import org.eclipse.jst.javaee.core.PropertyType;
>+
>+import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Data Source Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getClassName Class Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getServerName Server Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getPortNumber Port Number}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getDatabaseName Database Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getUrl Url}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getUser User}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getPassword Password}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getProperty Property}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getLoginTimeout Login Timeout}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#isTransactional Transactional}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getIsolationLevel Isolation Level}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getInitialPoolSize Initial Pool Size}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getMaxPoolSize Max Pool Size}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getMinPoolSize Min Pool Size}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getMaxIdleTime Max Idle Time}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getMaxStatements Max Statements}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.DataSourceTypeImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class DataSourceTypeImpl extends EObjectImpl implements DataSourceType {
>+	/**
>+	 * The cached value of the '{@link #getDescription() Description}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getDescription()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected Description description;
>+
>+	/**
>+	 * The default value of the '{@link #getName() Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getName() Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String name = NAME_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getClassName() Class Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getClassName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String CLASS_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getClassName() Class Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getClassName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String className = CLASS_NAME_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getServerName() Server Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getServerName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String SERVER_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getServerName() Server Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getServerName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String serverName = SERVER_NAME_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getPortNumber() Port Number}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getPortNumber()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final BigInteger PORT_NUMBER_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getPortNumber() Port Number}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getPortNumber()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected BigInteger portNumber = PORT_NUMBER_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getDatabaseName() Database Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getDatabaseName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String DATABASE_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getDatabaseName() Database Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getDatabaseName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String databaseName = DATABASE_NAME_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getUrl() Url}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getUrl()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String URL_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getUrl() Url}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getUrl()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String url = URL_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getUser() User}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getUser()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String USER_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getUser() User}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getUser()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String user = USER_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getPassword() Password}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getPassword()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String PASSWORD_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getPassword() Password}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getPassword()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String password = PASSWORD_EDEFAULT;
>+
>+	/**
>+	 * The cached value of the '{@link #getProperty() Property}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getProperty()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<PropertyType> property;
>+
>+	/**
>+	 * The default value of the '{@link #getLoginTimeout() Login Timeout}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLoginTimeout()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final BigInteger LOGIN_TIMEOUT_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getLoginTimeout() Login Timeout}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLoginTimeout()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected BigInteger loginTimeout = LOGIN_TIMEOUT_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #isTransactional() Transactional}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isTransactional()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean TRANSACTIONAL_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isTransactional() Transactional}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isTransactional()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean transactional = TRANSACTIONAL_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Transactional attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean transactionalESet;
>+
>+	/**
>+	 * The default value of the '{@link #getIsolationLevel() Isolation Level}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getIsolationLevel()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final IsolationLevelType ISOLATION_LEVEL_EDEFAULT = IsolationLevelType.TRANSACTIONNONE;
>+
>+	/**
>+	 * The cached value of the '{@link #getIsolationLevel() Isolation Level}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getIsolationLevel()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected IsolationLevelType isolationLevel = ISOLATION_LEVEL_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Isolation Level attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean isolationLevelESet;
>+
>+	/**
>+	 * The default value of the '{@link #getInitialPoolSize() Initial Pool Size}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getInitialPoolSize()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final BigInteger INITIAL_POOL_SIZE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getInitialPoolSize() Initial Pool Size}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getInitialPoolSize()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected BigInteger initialPoolSize = INITIAL_POOL_SIZE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getMaxPoolSize() Max Pool Size}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMaxPoolSize()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final BigInteger MAX_POOL_SIZE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getMaxPoolSize() Max Pool Size}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMaxPoolSize()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected BigInteger maxPoolSize = MAX_POOL_SIZE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getMinPoolSize() Min Pool Size}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMinPoolSize()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final BigInteger MIN_POOL_SIZE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getMinPoolSize() Min Pool Size}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMinPoolSize()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected BigInteger minPoolSize = MIN_POOL_SIZE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getMaxIdleTime() Max Idle Time}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMaxIdleTime()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final BigInteger MAX_IDLE_TIME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getMaxIdleTime() Max Idle Time}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMaxIdleTime()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected BigInteger maxIdleTime = MAX_IDLE_TIME_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getMaxStatements() Max Statements}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMaxStatements()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final BigInteger MAX_STATEMENTS_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getMaxStatements() Max Statements}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMaxStatements()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected BigInteger maxStatements = MAX_STATEMENTS_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected DataSourceTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JavaeePackage.Literals.DATA_SOURCE_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public Description getDescription() {
>+		return description;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetDescription(Description newDescription, NotificationChain msgs) {
>+		Description oldDescription = description;
>+		description = newDescription;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__DESCRIPTION, oldDescription, newDescription);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setDescription(Description newDescription) {
>+		if (newDescription != description) {
>+			NotificationChain msgs = null;
>+			if (description != null)
>+				msgs = ((InternalEObject)description).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JavaeePackage.DATA_SOURCE_TYPE__DESCRIPTION, null, msgs);
>+			if (newDescription != null)
>+				msgs = ((InternalEObject)newDescription).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JavaeePackage.DATA_SOURCE_TYPE__DESCRIPTION, null, msgs);
>+			msgs = basicSetDescription(newDescription, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__DESCRIPTION, newDescription, newDescription));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+		return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setName(String newName) {
>+		String oldName = name;
>+		name = newName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__NAME, oldName, name));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getClassName() {
>+		return className;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setClassName(String newClassName) {
>+		String oldClassName = className;
>+		className = newClassName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__CLASS_NAME, oldClassName, className));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getServerName() {
>+		return serverName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setServerName(String newServerName) {
>+		String oldServerName = serverName;
>+		serverName = newServerName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__SERVER_NAME, oldServerName, serverName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public BigInteger getPortNumber() {
>+		return portNumber;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setPortNumber(BigInteger newPortNumber) {
>+		BigInteger oldPortNumber = portNumber;
>+		portNumber = newPortNumber;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__PORT_NUMBER, oldPortNumber, portNumber));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getDatabaseName() {
>+		return databaseName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setDatabaseName(String newDatabaseName) {
>+		String oldDatabaseName = databaseName;
>+		databaseName = newDatabaseName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__DATABASE_NAME, oldDatabaseName, databaseName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getUrl() {
>+		return url;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setUrl(String newUrl) {
>+		String oldUrl = url;
>+		url = newUrl;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__URL, oldUrl, url));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getUser() {
>+		return user;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setUser(String newUser) {
>+		String oldUser = user;
>+		user = newUser;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__USER, oldUser, user));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getPassword() {
>+		return password;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setPassword(String newPassword) {
>+		String oldPassword = password;
>+		password = newPassword;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__PASSWORD, oldPassword, password));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<PropertyType> getProperty() {
>+		if (property == null) {
>+			property = new EObjectContainmentEList<PropertyType>(PropertyType.class, this, JavaeePackage.DATA_SOURCE_TYPE__PROPERTY);
>+		}
>+		return property;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public BigInteger getLoginTimeout() {
>+		return loginTimeout;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLoginTimeout(BigInteger newLoginTimeout) {
>+		BigInteger oldLoginTimeout = loginTimeout;
>+		loginTimeout = newLoginTimeout;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__LOGIN_TIMEOUT, oldLoginTimeout, loginTimeout));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isTransactional() {
>+		return transactional;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setTransactional(boolean newTransactional) {
>+		boolean oldTransactional = transactional;
>+		transactional = newTransactional;
>+		boolean oldTransactionalESet = transactionalESet;
>+		transactionalESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__TRANSACTIONAL, oldTransactional, transactional, !oldTransactionalESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetTransactional() {
>+		boolean oldTransactional = transactional;
>+		boolean oldTransactionalESet = transactionalESet;
>+		transactional = TRANSACTIONAL_EDEFAULT;
>+		transactionalESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.DATA_SOURCE_TYPE__TRANSACTIONAL, oldTransactional, TRANSACTIONAL_EDEFAULT, oldTransactionalESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetTransactional() {
>+		return transactionalESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public IsolationLevelType getIsolationLevel() {
>+		return isolationLevel;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setIsolationLevel(IsolationLevelType newIsolationLevel) {
>+		IsolationLevelType oldIsolationLevel = isolationLevel;
>+		isolationLevel = newIsolationLevel == null ? ISOLATION_LEVEL_EDEFAULT : newIsolationLevel;
>+		boolean oldIsolationLevelESet = isolationLevelESet;
>+		isolationLevelESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__ISOLATION_LEVEL, oldIsolationLevel, isolationLevel, !oldIsolationLevelESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetIsolationLevel() {
>+		IsolationLevelType oldIsolationLevel = isolationLevel;
>+		boolean oldIsolationLevelESet = isolationLevelESet;
>+		isolationLevel = ISOLATION_LEVEL_EDEFAULT;
>+		isolationLevelESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.DATA_SOURCE_TYPE__ISOLATION_LEVEL, oldIsolationLevel, ISOLATION_LEVEL_EDEFAULT, oldIsolationLevelESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetIsolationLevel() {
>+		return isolationLevelESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public BigInteger getInitialPoolSize() {
>+		return initialPoolSize;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setInitialPoolSize(BigInteger newInitialPoolSize) {
>+		BigInteger oldInitialPoolSize = initialPoolSize;
>+		initialPoolSize = newInitialPoolSize;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__INITIAL_POOL_SIZE, oldInitialPoolSize, initialPoolSize));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public BigInteger getMaxPoolSize() {
>+		return maxPoolSize;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMaxPoolSize(BigInteger newMaxPoolSize) {
>+		BigInteger oldMaxPoolSize = maxPoolSize;
>+		maxPoolSize = newMaxPoolSize;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__MAX_POOL_SIZE, oldMaxPoolSize, maxPoolSize));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public BigInteger getMinPoolSize() {
>+		return minPoolSize;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMinPoolSize(BigInteger newMinPoolSize) {
>+		BigInteger oldMinPoolSize = minPoolSize;
>+		minPoolSize = newMinPoolSize;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__MIN_POOL_SIZE, oldMinPoolSize, minPoolSize));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public BigInteger getMaxIdleTime() {
>+		return maxIdleTime;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMaxIdleTime(BigInteger newMaxIdleTime) {
>+		BigInteger oldMaxIdleTime = maxIdleTime;
>+		maxIdleTime = newMaxIdleTime;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__MAX_IDLE_TIME, oldMaxIdleTime, maxIdleTime));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public BigInteger getMaxStatements() {
>+		return maxStatements;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMaxStatements(BigInteger newMaxStatements) {
>+		BigInteger oldMaxStatements = maxStatements;
>+		maxStatements = newMaxStatements;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__MAX_STATEMENTS, oldMaxStatements, maxStatements));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.DATA_SOURCE_TYPE__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JavaeePackage.DATA_SOURCE_TYPE__DESCRIPTION:
>+				return basicSetDescription(null, msgs);
>+			case JavaeePackage.DATA_SOURCE_TYPE__PROPERTY:
>+				return ((InternalEList<?>)getProperty()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JavaeePackage.DATA_SOURCE_TYPE__DESCRIPTION:
>+				return getDescription();
>+			case JavaeePackage.DATA_SOURCE_TYPE__NAME:
>+				return getName();
>+			case JavaeePackage.DATA_SOURCE_TYPE__CLASS_NAME:
>+				return getClassName();
>+			case JavaeePackage.DATA_SOURCE_TYPE__SERVER_NAME:
>+				return getServerName();
>+			case JavaeePackage.DATA_SOURCE_TYPE__PORT_NUMBER:
>+				return getPortNumber();
>+			case JavaeePackage.DATA_SOURCE_TYPE__DATABASE_NAME:
>+				return getDatabaseName();
>+			case JavaeePackage.DATA_SOURCE_TYPE__URL:
>+				return getUrl();
>+			case JavaeePackage.DATA_SOURCE_TYPE__USER:
>+				return getUser();
>+			case JavaeePackage.DATA_SOURCE_TYPE__PASSWORD:
>+				return getPassword();
>+			case JavaeePackage.DATA_SOURCE_TYPE__PROPERTY:
>+				return getProperty();
>+			case JavaeePackage.DATA_SOURCE_TYPE__LOGIN_TIMEOUT:
>+				return getLoginTimeout();
>+			case JavaeePackage.DATA_SOURCE_TYPE__TRANSACTIONAL:
>+				return isTransactional();
>+			case JavaeePackage.DATA_SOURCE_TYPE__ISOLATION_LEVEL:
>+				return getIsolationLevel();
>+			case JavaeePackage.DATA_SOURCE_TYPE__INITIAL_POOL_SIZE:
>+				return getInitialPoolSize();
>+			case JavaeePackage.DATA_SOURCE_TYPE__MAX_POOL_SIZE:
>+				return getMaxPoolSize();
>+			case JavaeePackage.DATA_SOURCE_TYPE__MIN_POOL_SIZE:
>+				return getMinPoolSize();
>+			case JavaeePackage.DATA_SOURCE_TYPE__MAX_IDLE_TIME:
>+				return getMaxIdleTime();
>+			case JavaeePackage.DATA_SOURCE_TYPE__MAX_STATEMENTS:
>+				return getMaxStatements();
>+			case JavaeePackage.DATA_SOURCE_TYPE__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JavaeePackage.DATA_SOURCE_TYPE__DESCRIPTION:
>+				setDescription((Description)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__NAME:
>+				setName((String)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__CLASS_NAME:
>+				setClassName((String)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__SERVER_NAME:
>+				setServerName((String)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__PORT_NUMBER:
>+				setPortNumber((BigInteger)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__DATABASE_NAME:
>+				setDatabaseName((String)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__URL:
>+				setUrl((String)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__USER:
>+				setUser((String)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__PASSWORD:
>+				setPassword((String)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__PROPERTY:
>+				getProperty().clear();
>+				getProperty().addAll((Collection<? extends PropertyType>)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__LOGIN_TIMEOUT:
>+				setLoginTimeout((BigInteger)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__TRANSACTIONAL:
>+				setTransactional((Boolean)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__ISOLATION_LEVEL:
>+				setIsolationLevel((IsolationLevelType)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__INITIAL_POOL_SIZE:
>+				setInitialPoolSize((BigInteger)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__MAX_POOL_SIZE:
>+				setMaxPoolSize((BigInteger)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__MIN_POOL_SIZE:
>+				setMinPoolSize((BigInteger)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__MAX_IDLE_TIME:
>+				setMaxIdleTime((BigInteger)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__MAX_STATEMENTS:
>+				setMaxStatements((BigInteger)newValue);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JavaeePackage.DATA_SOURCE_TYPE__DESCRIPTION:
>+				setDescription((Description)null);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__NAME:
>+				setName(NAME_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__CLASS_NAME:
>+				setClassName(CLASS_NAME_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__SERVER_NAME:
>+				setServerName(SERVER_NAME_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__PORT_NUMBER:
>+				setPortNumber(PORT_NUMBER_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__DATABASE_NAME:
>+				setDatabaseName(DATABASE_NAME_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__URL:
>+				setUrl(URL_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__USER:
>+				setUser(USER_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__PASSWORD:
>+				setPassword(PASSWORD_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__PROPERTY:
>+				getProperty().clear();
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__LOGIN_TIMEOUT:
>+				setLoginTimeout(LOGIN_TIMEOUT_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__TRANSACTIONAL:
>+				unsetTransactional();
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__ISOLATION_LEVEL:
>+				unsetIsolationLevel();
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__INITIAL_POOL_SIZE:
>+				setInitialPoolSize(INITIAL_POOL_SIZE_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__MAX_POOL_SIZE:
>+				setMaxPoolSize(MAX_POOL_SIZE_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__MIN_POOL_SIZE:
>+				setMinPoolSize(MIN_POOL_SIZE_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__MAX_IDLE_TIME:
>+				setMaxIdleTime(MAX_IDLE_TIME_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__MAX_STATEMENTS:
>+				setMaxStatements(MAX_STATEMENTS_EDEFAULT);
>+				return;
>+			case JavaeePackage.DATA_SOURCE_TYPE__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JavaeePackage.DATA_SOURCE_TYPE__DESCRIPTION:
>+				return description != null;
>+			case JavaeePackage.DATA_SOURCE_TYPE__NAME:
>+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
>+			case JavaeePackage.DATA_SOURCE_TYPE__CLASS_NAME:
>+				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
>+			case JavaeePackage.DATA_SOURCE_TYPE__SERVER_NAME:
>+				return SERVER_NAME_EDEFAULT == null ? serverName != null : !SERVER_NAME_EDEFAULT.equals(serverName);
>+			case JavaeePackage.DATA_SOURCE_TYPE__PORT_NUMBER:
>+				return PORT_NUMBER_EDEFAULT == null ? portNumber != null : !PORT_NUMBER_EDEFAULT.equals(portNumber);
>+			case JavaeePackage.DATA_SOURCE_TYPE__DATABASE_NAME:
>+				return DATABASE_NAME_EDEFAULT == null ? databaseName != null : !DATABASE_NAME_EDEFAULT.equals(databaseName);
>+			case JavaeePackage.DATA_SOURCE_TYPE__URL:
>+				return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);
>+			case JavaeePackage.DATA_SOURCE_TYPE__USER:
>+				return USER_EDEFAULT == null ? user != null : !USER_EDEFAULT.equals(user);
>+			case JavaeePackage.DATA_SOURCE_TYPE__PASSWORD:
>+				return PASSWORD_EDEFAULT == null ? password != null : !PASSWORD_EDEFAULT.equals(password);
>+			case JavaeePackage.DATA_SOURCE_TYPE__PROPERTY:
>+				return property != null && !property.isEmpty();
>+			case JavaeePackage.DATA_SOURCE_TYPE__LOGIN_TIMEOUT:
>+				return LOGIN_TIMEOUT_EDEFAULT == null ? loginTimeout != null : !LOGIN_TIMEOUT_EDEFAULT.equals(loginTimeout);
>+			case JavaeePackage.DATA_SOURCE_TYPE__TRANSACTIONAL:
>+				return isSetTransactional();
>+			case JavaeePackage.DATA_SOURCE_TYPE__ISOLATION_LEVEL:
>+				return isSetIsolationLevel();
>+			case JavaeePackage.DATA_SOURCE_TYPE__INITIAL_POOL_SIZE:
>+				return INITIAL_POOL_SIZE_EDEFAULT == null ? initialPoolSize != null : !INITIAL_POOL_SIZE_EDEFAULT.equals(initialPoolSize);
>+			case JavaeePackage.DATA_SOURCE_TYPE__MAX_POOL_SIZE:
>+				return MAX_POOL_SIZE_EDEFAULT == null ? maxPoolSize != null : !MAX_POOL_SIZE_EDEFAULT.equals(maxPoolSize);
>+			case JavaeePackage.DATA_SOURCE_TYPE__MIN_POOL_SIZE:
>+				return MIN_POOL_SIZE_EDEFAULT == null ? minPoolSize != null : !MIN_POOL_SIZE_EDEFAULT.equals(minPoolSize);
>+			case JavaeePackage.DATA_SOURCE_TYPE__MAX_IDLE_TIME:
>+				return MAX_IDLE_TIME_EDEFAULT == null ? maxIdleTime != null : !MAX_IDLE_TIME_EDEFAULT.equals(maxIdleTime);
>+			case JavaeePackage.DATA_SOURCE_TYPE__MAX_STATEMENTS:
>+				return MAX_STATEMENTS_EDEFAULT == null ? maxStatements != null : !MAX_STATEMENTS_EDEFAULT.equals(maxStatements);
>+			case JavaeePackage.DATA_SOURCE_TYPE__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (name: "); //$NON-NLS-1$
>+		result.append(name);
>+		result.append(", className: "); //$NON-NLS-1$
>+		result.append(className);
>+		result.append(", serverName: "); //$NON-NLS-1$
>+		result.append(serverName);
>+		result.append(", portNumber: "); //$NON-NLS-1$
>+		result.append(portNumber);
>+		result.append(", databaseName: "); //$NON-NLS-1$
>+		result.append(databaseName);
>+		result.append(", url: "); //$NON-NLS-1$
>+		result.append(url);
>+		result.append(", user: "); //$NON-NLS-1$
>+		result.append(user);
>+		result.append(", password: "); //$NON-NLS-1$
>+		result.append(password);
>+		result.append(", loginTimeout: "); //$NON-NLS-1$
>+		result.append(loginTimeout);
>+		result.append(", transactional: "); //$NON-NLS-1$
>+		if (transactionalESet) result.append(transactional); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", isolationLevel: "); //$NON-NLS-1$
>+		if (isolationLevelESet) result.append(isolationLevel); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", initialPoolSize: "); //$NON-NLS-1$
>+		result.append(initialPoolSize);
>+		result.append(", maxPoolSize: "); //$NON-NLS-1$
>+		result.append(maxPoolSize);
>+		result.append(", minPoolSize: "); //$NON-NLS-1$
>+		result.append(minPoolSize);
>+		result.append(", maxIdleTime: "); //$NON-NLS-1$
>+		result.append(maxIdleTime);
>+		result.append(", maxStatements: "); //$NON-NLS-1$
>+		result.append(maxStatements);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //DataSourceTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaFactoryImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaFactoryImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaFactoryImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaFactoryImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,446 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.*;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaFactory;
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model Factory.
>+ * 
>+ * @generated
>+ */
>+public class JcaFactoryImpl extends EFactoryImpl implements JcaFactory {
>+	/**
>+	 * Creates the default factory implementation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static JcaFactory init() {
>+		try {
>+			JcaFactory theJcaFactory = (JcaFactory)EPackage.Registry.INSTANCE.getEFactory("http://java.sun.com/xml/ns/javaee/jca"); //$NON-NLS-1$ 
>+			if (theJcaFactory != null) {
>+				return theJcaFactory;
>+			}
>+		}
>+		catch (Exception exception) {
>+			EcorePlugin.INSTANCE.log(exception);
>+		}
>+		return new JcaFactoryImpl();
>+	}
>+
>+	/**
>+	 * Creates an instance of the factory.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public JcaFactoryImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public EObject create(EClass eClass) {
>+		switch (eClass.getClassifierID()) {
>+			case JcaPackage.ACTIVATION_SPEC: return (EObject)createActivationSpec();
>+			case JcaPackage.ADMIN_OBJECT: return (EObject)createAdminObject();
>+			case JcaPackage.AUTHENTICATION_MECHANISM: return (EObject)createAuthenticationMechanism();
>+			case JcaPackage.CONFIG_PROPERTY: return (EObject)createConfigProperty();
>+			case JcaPackage.CONNECTION_DEFINITION: return (EObject)createConnectionDefinition();
>+			case JcaPackage.CONNECTOR: return (EObject)createConnector();
>+			case JcaPackage.CONNECTOR_DEPLOYMENT_DESCRIPTOR: return (EObject)createConnectorDeploymentDescriptor();
>+			case JcaPackage.INBOUND_RESOURCE_ADAPTER: return (EObject)createInboundResourceAdapter();
>+			case JcaPackage.LICENSE: return (EObject)createLicense();
>+			case JcaPackage.MESSAGE_ADAPTER: return (EObject)createMessageAdapter();
>+			case JcaPackage.MESSAGE_LISTENER: return (EObject)createMessageListener();
>+			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER: return (EObject)createOutboundResourceAdapter();
>+			case JcaPackage.REQUIRED_CONFIG_PROPERTY: return (EObject)createRequiredConfigProperty();
>+			case JcaPackage.RESOURCE_ADAPTER: return (EObject)createResourceAdapter();
>+			case JcaPackage.SECURITY_PERMISSION: return (EObject)createSecurityPermission();
>+			default:
>+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
>+		}
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object createFromString(EDataType eDataType, String initialValue) {
>+		switch (eDataType.getClassifierID()) {
>+			case JcaPackage.CONFIG_PROPERTY_TYPE_TYPE:
>+				return createConfigPropertyTypeTypeFromString(eDataType, initialValue);
>+			case JcaPackage.CREDENTIAL_INTERFACE_TYPE:
>+				return createCredentialInterfaceTypeFromString(eDataType, initialValue);
>+			case JcaPackage.TRANSACTION_SUPPORT_TYPE:
>+				return createTransactionSupportTypeFromString(eDataType, initialValue);
>+			case JcaPackage.CONFIG_PROPERTY_NAME_TYPE:
>+				return createConfigPropertyNameTypeFromString(eDataType, initialValue);
>+			case JcaPackage.CONFIG_PROPERTY_TYPE_TYPE_OBJECT:
>+				return createConfigPropertyTypeTypeObjectFromString(eDataType, initialValue);
>+			case JcaPackage.CREDENTIAL_INTERFACE_TYPE_OBJECT:
>+				return createCredentialInterfaceTypeObjectFromString(eDataType, initialValue);
>+			case JcaPackage.TRANSACTION_SUPPORT_TYPE_OBJECT:
>+				return createTransactionSupportTypeObjectFromString(eDataType, initialValue);
>+			default:
>+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
>+		}
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String convertToString(EDataType eDataType, Object instanceValue) {
>+		switch (eDataType.getClassifierID()) {
>+			case JcaPackage.CONFIG_PROPERTY_TYPE_TYPE:
>+				return convertConfigPropertyTypeTypeToString(eDataType, instanceValue);
>+			case JcaPackage.CREDENTIAL_INTERFACE_TYPE:
>+				return convertCredentialInterfaceTypeToString(eDataType, instanceValue);
>+			case JcaPackage.TRANSACTION_SUPPORT_TYPE:
>+				return convertTransactionSupportTypeToString(eDataType, instanceValue);
>+			case JcaPackage.CONFIG_PROPERTY_NAME_TYPE:
>+				return convertConfigPropertyNameTypeToString(eDataType, instanceValue);
>+			case JcaPackage.CONFIG_PROPERTY_TYPE_TYPE_OBJECT:
>+				return convertConfigPropertyTypeTypeObjectToString(eDataType, instanceValue);
>+			case JcaPackage.CREDENTIAL_INTERFACE_TYPE_OBJECT:
>+				return convertCredentialInterfaceTypeObjectToString(eDataType, instanceValue);
>+			case JcaPackage.TRANSACTION_SUPPORT_TYPE_OBJECT:
>+				return convertTransactionSupportTypeObjectToString(eDataType, instanceValue);
>+			default:
>+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
>+		}
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ActivationSpec createActivationSpec() {
>+		ActivationSpecImpl activationSpec = new ActivationSpecImpl();
>+		return activationSpec;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public AdminObject createAdminObject() {
>+		AdminObjectImpl adminObject = new AdminObjectImpl();
>+		return adminObject;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public AuthenticationMechanism createAuthenticationMechanism() {
>+		AuthenticationMechanismImpl authenticationMechanism = new AuthenticationMechanismImpl();
>+		return authenticationMechanism;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ConfigProperty createConfigProperty() {
>+		ConfigPropertyImpl configProperty = new ConfigPropertyImpl();
>+		return configProperty;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ConnectionDefinition createConnectionDefinition() {
>+		ConnectionDefinitionImpl connectionDefinition = new ConnectionDefinitionImpl();
>+		return connectionDefinition;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public Connector createConnector() {
>+		ConnectorImpl connector = new ConnectorImpl();
>+		return connector;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ConnectorDeploymentDescriptor createConnectorDeploymentDescriptor() {
>+		ConnectorDeploymentDescriptorImpl connectorDeploymentDescriptor = new ConnectorDeploymentDescriptorImpl();
>+		return connectorDeploymentDescriptor;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public InboundResourceAdapter createInboundResourceAdapter() {
>+		InboundResourceAdapterImpl inboundResourceAdapter = new InboundResourceAdapterImpl();
>+		return inboundResourceAdapter;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public License createLicense() {
>+		LicenseImpl license = new LicenseImpl();
>+		return license;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public MessageAdapter createMessageAdapter() {
>+		MessageAdapterImpl messageAdapter = new MessageAdapterImpl();
>+		return messageAdapter;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public MessageListener createMessageListener() {
>+		MessageListenerImpl messageListener = new MessageListenerImpl();
>+		return messageListener;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OutboundResourceAdapter createOutboundResourceAdapter() {
>+		OutboundResourceAdapterImpl outboundResourceAdapter = new OutboundResourceAdapterImpl();
>+		return outboundResourceAdapter;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public RequiredConfigProperty createRequiredConfigProperty() {
>+		RequiredConfigPropertyImpl requiredConfigProperty = new RequiredConfigPropertyImpl();
>+		return requiredConfigProperty;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ResourceAdapter createResourceAdapter() {
>+		ResourceAdapterImpl resourceAdapter = new ResourceAdapterImpl();
>+		return resourceAdapter;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public SecurityPermission createSecurityPermission() {
>+		SecurityPermissionImpl securityPermission = new SecurityPermissionImpl();
>+		return securityPermission;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ConfigPropertyTypeType createConfigPropertyTypeTypeFromString(EDataType eDataType, String initialValue) {
>+		ConfigPropertyTypeType result = ConfigPropertyTypeType.get(initialValue);
>+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>+		return result;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertConfigPropertyTypeTypeToString(EDataType eDataType, Object instanceValue) {
>+		return instanceValue == null ? null : instanceValue.toString();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CredentialInterfaceType createCredentialInterfaceTypeFromString(EDataType eDataType, String initialValue) {
>+		CredentialInterfaceType result = CredentialInterfaceType.get(initialValue);
>+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>+		return result;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertCredentialInterfaceTypeToString(EDataType eDataType, Object instanceValue) {
>+		return instanceValue == null ? null : instanceValue.toString();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public TransactionSupportType createTransactionSupportTypeFromString(EDataType eDataType, String initialValue) {
>+		TransactionSupportType result = TransactionSupportType.get(initialValue);
>+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>+		return result;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertTransactionSupportTypeToString(EDataType eDataType, Object instanceValue) {
>+		return instanceValue == null ? null : instanceValue.toString();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String createConfigPropertyNameTypeFromString(EDataType eDataType, String initialValue) {
>+		return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertConfigPropertyNameTypeToString(EDataType eDataType, Object instanceValue) {
>+		return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.STRING, instanceValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ConfigPropertyTypeType createConfigPropertyTypeTypeObjectFromString(EDataType eDataType, String initialValue) {
>+		return createConfigPropertyTypeTypeFromString(JcaPackage.Literals.CONFIG_PROPERTY_TYPE_TYPE, initialValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertConfigPropertyTypeTypeObjectToString(EDataType eDataType, Object instanceValue) {
>+		return convertConfigPropertyTypeTypeToString(JcaPackage.Literals.CONFIG_PROPERTY_TYPE_TYPE, instanceValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CredentialInterfaceType createCredentialInterfaceTypeObjectFromString(EDataType eDataType, String initialValue) {
>+		return createCredentialInterfaceTypeFromString(JcaPackage.Literals.CREDENTIAL_INTERFACE_TYPE, initialValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertCredentialInterfaceTypeObjectToString(EDataType eDataType, Object instanceValue) {
>+		return convertCredentialInterfaceTypeToString(JcaPackage.Literals.CREDENTIAL_INTERFACE_TYPE, instanceValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public TransactionSupportType createTransactionSupportTypeObjectFromString(EDataType eDataType, String initialValue) {
>+		return createTransactionSupportTypeFromString(JcaPackage.Literals.TRANSACTION_SUPPORT_TYPE, initialValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertTransactionSupportTypeObjectToString(EDataType eDataType, Object instanceValue) {
>+		return convertTransactionSupportTypeToString(JcaPackage.Literals.TRANSACTION_SUPPORT_TYPE, instanceValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public JcaPackage getJcaPackage() {
>+		return (JcaPackage)getEPackage();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @deprecated
>+	 * @generated
>+	 */
>+	@Deprecated
>+	public static JcaPackage getPackage() {
>+		return JcaPackage.eINSTANCE;
>+	}
>+
>+} //JcaFactoryImpl
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/RespectBindingTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/core/internal/impl/RespectBindingTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/core/internal/impl/RespectBindingTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/RespectBindingTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,202 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+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.RespectBindingType;
>+
>+import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Respect Binding Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.RespectBindingTypeImpl#isEnabled Enabled}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class RespectBindingTypeImpl extends EObjectImpl implements RespectBindingType {
>+	/**
>+	 * The default value of the '{@link #isEnabled() Enabled}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isEnabled()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean ENABLED_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isEnabled() Enabled}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isEnabled()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean enabled = ENABLED_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Enabled attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean enabledESet;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected RespectBindingTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JavaeePackage.Literals.RESPECT_BINDING_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isEnabled() {
>+		return enabled;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setEnabled(boolean newEnabled) {
>+		boolean oldEnabled = enabled;
>+		enabled = newEnabled;
>+		boolean oldEnabledESet = enabledESet;
>+		enabledESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.RESPECT_BINDING_TYPE__ENABLED, oldEnabled, enabled, !oldEnabledESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetEnabled() {
>+		boolean oldEnabled = enabled;
>+		boolean oldEnabledESet = enabledESet;
>+		enabled = ENABLED_EDEFAULT;
>+		enabledESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.RESPECT_BINDING_TYPE__ENABLED, oldEnabled, ENABLED_EDEFAULT, oldEnabledESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetEnabled() {
>+		return enabledESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JavaeePackage.RESPECT_BINDING_TYPE__ENABLED:
>+				return isEnabled();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JavaeePackage.RESPECT_BINDING_TYPE__ENABLED:
>+				setEnabled((Boolean)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JavaeePackage.RESPECT_BINDING_TYPE__ENABLED:
>+				unsetEnabled();
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JavaeePackage.RESPECT_BINDING_TYPE__ENABLED:
>+				return isSetEnabled();
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (enabled: "); //$NON-NLS-1$
>+		if (enabledESet) result.append(enabled); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //RespectBindingTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,2187 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.internal.impl.EjbPackageImpl;
>+
>+import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>+
>+import org.eclipse.jst.javaee.jca.ActivationSpec;
>+import org.eclipse.jst.javaee.jca.AdminObject;
>+import org.eclipse.jst.javaee.jca.AuthenticationMechanism;
>+import org.eclipse.jst.javaee.jca.ConfigProperty;
>+import org.eclipse.jst.javaee.jca.ConfigPropertyTypeType;
>+import org.eclipse.jst.javaee.jca.ConnectionDefinition;
>+import org.eclipse.jst.javaee.jca.Connector;
>+import org.eclipse.jst.javaee.jca.ConnectorDeploymentDescriptor;
>+import org.eclipse.jst.javaee.jca.CredentialInterfaceType;
>+import org.eclipse.jst.javaee.jca.InboundResourceAdapter;
>+import org.eclipse.jst.javaee.jca.License;
>+import org.eclipse.jst.javaee.jca.MessageAdapter;
>+import org.eclipse.jst.javaee.jca.MessageListener;
>+import org.eclipse.jst.javaee.jca.OutboundResourceAdapter;
>+import org.eclipse.jst.javaee.jca.RequiredConfigProperty;
>+import org.eclipse.jst.javaee.jca.ResourceAdapter;
>+import org.eclipse.jst.javaee.jca.SecurityPermission;
>+import org.eclipse.jst.javaee.jca.TransactionSupportType;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaFactory;
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
>+
>+import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
>+
>+import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
>+
>+import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+
>+import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
>+
>+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
>+
>+import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
>+
>+import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model Package.
>+ * 
>+ * @generated
>+ */
>+public class JcaPackageImpl extends EPackageImpl implements JcaPackage {
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass activationSpecEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass adminObjectEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass authenticationMechanismEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass configPropertyEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass connectionDefinitionEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass connectorEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass connectorDeploymentDescriptorEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass inboundResourceAdapterEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass licenseEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass messageAdapterEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass messageListenerEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass outboundResourceAdapterEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass requiredConfigPropertyEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass resourceAdapterEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass securityPermissionEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EEnum configPropertyTypeTypeEEnum = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EEnum credentialInterfaceTypeEEnum = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EEnum transactionSupportTypeEEnum = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EDataType configPropertyNameTypeEDataType = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EDataType configPropertyTypeTypeObjectEDataType = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EDataType credentialInterfaceTypeObjectEDataType = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EDataType transactionSupportTypeObjectEDataType = null;
>+
>+	/**
>+	 * Creates an instance of the model Package, registered with
>+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
>+	 * package URI value.
>+	 * Note: the correct way to create the package is via the static
>+	 * factory method {@link #init init()}, which also performs
>+	 * initialization of the package, or returns the registered package,
>+	 * if one already exists.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.emf.ecore.EPackage.Registry
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#eNS_URI
>+	 * @see #init()
>+	 * @generated
>+	 */
>+	private JcaPackageImpl() {
>+		super(eNS_URI, JcaFactory.eINSTANCE);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private static boolean isInited = false;
>+
>+	/**
>+	 * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>+	 * 
>+	 * This method is used to initialize {@link JcaPackage#eINSTANCE} when that field is accessed.
>+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
>+	 * 
>+	 * 
>+	 * @see #eNS_URI
>+	 * @see #createPackageContents()
>+	 * @see #initializePackageContents()
>+	 * @generated
>+	 */
>+	public static JcaPackage init() {
>+		if (isInited) return (JcaPackage)EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI);
>+
>+		// Obtain or create and register package
>+		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new JcaPackageImpl());
>+
>+		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);
>+		ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) : ApplicationclientPackage.eINSTANCE);
>+		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
>+		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
>+		WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
>+		WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
>+		WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
>+
>+		// Create package meta-data objects
>+		theJcaPackage.createPackageContents();
>+		theApplicationPackage.createPackageContents();
>+		theJavaeePackage.createPackageContents();
>+		theApplicationclientPackage.createPackageContents();
>+		theEjbPackage.createPackageContents();
>+		theJspPackage.createPackageContents();
>+		theWebPackage.createPackageContents();
>+		theWebappPackage.createPackageContents();
>+		theWebfragmentPackage.createPackageContents();
>+
>+		// Initialize created meta-data
>+		theJcaPackage.initializePackageContents();
>+		theApplicationPackage.initializePackageContents();
>+		theJavaeePackage.initializePackageContents();
>+		theApplicationclientPackage.initializePackageContents();
>+		theEjbPackage.initializePackageContents();
>+		theJspPackage.initializePackageContents();
>+		theWebPackage.initializePackageContents();
>+		theWebappPackage.initializePackageContents();
>+		theWebfragmentPackage.initializePackageContents();
>+
>+		// Mark meta-data to indicate it can't be changed
>+		theJcaPackage.freeze();
>+
>+ 
>+		// Update the registry and return the package
>+		EPackage.Registry.INSTANCE.put(JcaPackage.eNS_URI, theJcaPackage);
>+		return theJcaPackage;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getActivationSpec() {
>+		return activationSpecEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getActivationSpec_ActivationspecClass() {
>+		return (EAttribute)activationSpecEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getActivationSpec_RequiredConfigProperty() {
>+		return (EReference)activationSpecEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getActivationSpec_ConfigProperty() {
>+		return (EReference)activationSpecEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getActivationSpec_Id() {
>+		return (EAttribute)activationSpecEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getAdminObject() {
>+		return adminObjectEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAdminObject_AdminobjectInterface() {
>+		return (EAttribute)adminObjectEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAdminObject_AdminobjectClass() {
>+		return (EAttribute)adminObjectEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getAdminObject_ConfigProperty() {
>+		return (EReference)adminObjectEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAdminObject_Id() {
>+		return (EAttribute)adminObjectEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getAuthenticationMechanism() {
>+		return authenticationMechanismEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getAuthenticationMechanism_Description() {
>+		return (EReference)authenticationMechanismEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAuthenticationMechanism_AuthenticationMechanismType() {
>+		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAuthenticationMechanism_CredentialInterface() {
>+		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAuthenticationMechanism_Id() {
>+		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getConfigProperty() {
>+		return configPropertyEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getConfigProperty_Description() {
>+		return (EReference)configPropertyEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConfigProperty_ConfigPropertyName() {
>+		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConfigProperty_ConfigPropertyType() {
>+		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConfigProperty_ConfigPropertyValue() {
>+		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConfigProperty_ConfigPropertyIgnore() {
>+		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(4);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConfigProperty_ConfigPropertySupportsDynamicUpdates() {
>+		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(5);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConfigProperty_ConfigPropertyConfidential() {
>+		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(6);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConfigProperty_Id() {
>+		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(7);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getConnectionDefinition() {
>+		return connectionDefinitionEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnectionDefinition_ManagedconnectionfactoryClass() {
>+		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getConnectionDefinition_ConfigProperty() {
>+		return (EReference)connectionDefinitionEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnectionDefinition_ConnectionfactoryInterface() {
>+		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnectionDefinition_ConnectionfactoryImplClass() {
>+		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnectionDefinition_ConnectionInterface() {
>+		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(4);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnectionDefinition_ConnectionImplClass() {
>+		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(5);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnectionDefinition_Id() {
>+		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(6);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getConnector() {
>+		return connectorEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getConnector_Descriptions() {
>+		return (EReference)connectorEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getConnector_DisplayNames() {
>+		return (EReference)connectorEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getConnector_Icons() {
>+		return (EReference)connectorEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnector_VendorName() {
>+		return (EAttribute)connectorEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnector_EisType() {
>+		return (EAttribute)connectorEClass.getEStructuralFeatures().get(4);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnector_ResourceadapterVersion() {
>+		return (EAttribute)connectorEClass.getEStructuralFeatures().get(5);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getConnector_License() {
>+		return (EReference)connectorEClass.getEStructuralFeatures().get(6);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getConnector_Resourceadapter() {
>+		return (EReference)connectorEClass.getEStructuralFeatures().get(7);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnector_RequiredWorkContext() {
>+		return (EAttribute)connectorEClass.getEStructuralFeatures().get(8);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnector_Id() {
>+		return (EAttribute)connectorEClass.getEStructuralFeatures().get(9);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnector_MetadataComplete() {
>+		return (EAttribute)connectorEClass.getEStructuralFeatures().get(10);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnector_Version() {
>+		return (EAttribute)connectorEClass.getEStructuralFeatures().get(11);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getConnectorDeploymentDescriptor() {
>+		return connectorDeploymentDescriptorEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getConnectorDeploymentDescriptor_Mixed() {
>+		return (EAttribute)connectorDeploymentDescriptorEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getConnectorDeploymentDescriptor_XMLNSPrefixMap() {
>+		return (EReference)connectorDeploymentDescriptorEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getConnectorDeploymentDescriptor_XSISchemaLocation() {
>+		return (EReference)connectorDeploymentDescriptorEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getConnectorDeploymentDescriptor_Connector() {
>+		return (EReference)connectorDeploymentDescriptorEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getInboundResourceAdapter() {
>+		return inboundResourceAdapterEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getInboundResourceAdapter_Messageadapter() {
>+		return (EReference)inboundResourceAdapterEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getInboundResourceAdapter_Id() {
>+		return (EAttribute)inboundResourceAdapterEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getLicense() {
>+		return licenseEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getLicense_Description() {
>+		return (EReference)licenseEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getLicense_LicenseRequired() {
>+		return (EAttribute)licenseEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getLicense_Id() {
>+		return (EAttribute)licenseEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getMessageAdapter() {
>+		return messageAdapterEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getMessageAdapter_Messagelistener() {
>+		return (EReference)messageAdapterEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getMessageAdapter_Id() {
>+		return (EAttribute)messageAdapterEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getMessageListener() {
>+		return messageListenerEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getMessageListener_MessagelistenerType() {
>+		return (EAttribute)messageListenerEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getMessageListener_Activationspec() {
>+		return (EReference)messageListenerEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getMessageListener_Id() {
>+		return (EAttribute)messageListenerEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getOutboundResourceAdapter() {
>+		return outboundResourceAdapterEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getOutboundResourceAdapter_ConnectionDefinition() {
>+		return (EReference)outboundResourceAdapterEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getOutboundResourceAdapter_TransactionSupport() {
>+		return (EAttribute)outboundResourceAdapterEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getOutboundResourceAdapter_AuthenticationMechanism() {
>+		return (EReference)outboundResourceAdapterEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getOutboundResourceAdapter_ReauthenticationSupport() {
>+		return (EAttribute)outboundResourceAdapterEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getOutboundResourceAdapter_Id() {
>+		return (EAttribute)outboundResourceAdapterEClass.getEStructuralFeatures().get(4);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getRequiredConfigProperty() {
>+		return requiredConfigPropertyEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getRequiredConfigProperty_Description() {
>+		return (EReference)requiredConfigPropertyEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getRequiredConfigProperty_ConfigPropertyName() {
>+		return (EAttribute)requiredConfigPropertyEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getRequiredConfigProperty_Id() {
>+		return (EAttribute)requiredConfigPropertyEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getResourceAdapter() {
>+		return resourceAdapterEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getResourceAdapter_ResourceadapterClass() {
>+		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getResourceAdapter_ConfigProperty() {
>+		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getResourceAdapter_OutboundResourceadapter() {
>+		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getResourceAdapter_InboundResourceadapter() {
>+		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getResourceAdapter_Adminobject() {
>+		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(4);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getResourceAdapter_SecurityPermission() {
>+		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(5);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getResourceAdapter_Id() {
>+		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(6);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getSecurityPermission() {
>+		return securityPermissionEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSecurityPermission_Description() {
>+		return (EReference)securityPermissionEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getSecurityPermission_SecurityPermissionSpec() {
>+		return (EAttribute)securityPermissionEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getSecurityPermission_Id() {
>+		return (EAttribute)securityPermissionEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EEnum getConfigPropertyTypeType() {
>+		return configPropertyTypeTypeEEnum;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EEnum getCredentialInterfaceType() {
>+		return credentialInterfaceTypeEEnum;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EEnum getTransactionSupportType() {
>+		return transactionSupportTypeEEnum;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getConfigPropertyNameType() {
>+		return configPropertyNameTypeEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getConfigPropertyTypeTypeObject() {
>+		return configPropertyTypeTypeObjectEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getCredentialInterfaceTypeObject() {
>+		return credentialInterfaceTypeObjectEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getTransactionSupportTypeObject() {
>+		return transactionSupportTypeObjectEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public JcaFactory getJcaFactory() {
>+		return (JcaFactory)getEFactoryInstance();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private boolean isCreated = false;
>+
>+	/**
>+	 * Creates the meta-model objects for the package. This method is
>+	 * guarded to have no affect on any invocation but its first.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void createPackageContents() {
>+		if (isCreated) return;
>+		isCreated = true;
>+
>+		// Create classes and their features
>+		activationSpecEClass = createEClass(ACTIVATION_SPEC);
>+		createEAttribute(activationSpecEClass, ACTIVATION_SPEC__ACTIVATIONSPEC_CLASS);
>+		createEReference(activationSpecEClass, ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTY);
>+		createEReference(activationSpecEClass, ACTIVATION_SPEC__CONFIG_PROPERTY);
>+		createEAttribute(activationSpecEClass, ACTIVATION_SPEC__ID);
>+
>+		adminObjectEClass = createEClass(ADMIN_OBJECT);
>+		createEAttribute(adminObjectEClass, ADMIN_OBJECT__ADMINOBJECT_INTERFACE);
>+		createEAttribute(adminObjectEClass, ADMIN_OBJECT__ADMINOBJECT_CLASS);
>+		createEReference(adminObjectEClass, ADMIN_OBJECT__CONFIG_PROPERTY);
>+		createEAttribute(adminObjectEClass, ADMIN_OBJECT__ID);
>+
>+		authenticationMechanismEClass = createEClass(AUTHENTICATION_MECHANISM);
>+		createEReference(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__DESCRIPTION);
>+		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE);
>+		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE);
>+		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__ID);
>+
>+		configPropertyEClass = createEClass(CONFIG_PROPERTY);
>+		createEReference(configPropertyEClass, CONFIG_PROPERTY__DESCRIPTION);
>+		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__CONFIG_PROPERTY_NAME);
>+		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__CONFIG_PROPERTY_TYPE);
>+		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__CONFIG_PROPERTY_VALUE);
>+		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__CONFIG_PROPERTY_IGNORE);
>+		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__CONFIG_PROPERTY_SUPPORTS_DYNAMIC_UPDATES);
>+		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__CONFIG_PROPERTY_CONFIDENTIAL);
>+		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__ID);
>+
>+		connectionDefinitionEClass = createEClass(CONNECTION_DEFINITION);
>+		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__MANAGEDCONNECTIONFACTORY_CLASS);
>+		createEReference(connectionDefinitionEClass, CONNECTION_DEFINITION__CONFIG_PROPERTY);
>+		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__CONNECTIONFACTORY_INTERFACE);
>+		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__CONNECTIONFACTORY_IMPL_CLASS);
>+		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__CONNECTION_INTERFACE);
>+		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS);
>+		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__ID);
>+
>+		connectorEClass = createEClass(CONNECTOR);
>+		createEReference(connectorEClass, CONNECTOR__DESCRIPTIONS);
>+		createEReference(connectorEClass, CONNECTOR__DISPLAY_NAMES);
>+		createEReference(connectorEClass, CONNECTOR__ICONS);
>+		createEAttribute(connectorEClass, CONNECTOR__VENDOR_NAME);
>+		createEAttribute(connectorEClass, CONNECTOR__EIS_TYPE);
>+		createEAttribute(connectorEClass, CONNECTOR__RESOURCEADAPTER_VERSION);
>+		createEReference(connectorEClass, CONNECTOR__LICENSE);
>+		createEReference(connectorEClass, CONNECTOR__RESOURCEADAPTER);
>+		createEAttribute(connectorEClass, CONNECTOR__REQUIRED_WORK_CONTEXT);
>+		createEAttribute(connectorEClass, CONNECTOR__ID);
>+		createEAttribute(connectorEClass, CONNECTOR__METADATA_COMPLETE);
>+		createEAttribute(connectorEClass, CONNECTOR__VERSION);
>+
>+		connectorDeploymentDescriptorEClass = createEClass(CONNECTOR_DEPLOYMENT_DESCRIPTOR);
>+		createEAttribute(connectorDeploymentDescriptorEClass, CONNECTOR_DEPLOYMENT_DESCRIPTOR__MIXED);
>+		createEReference(connectorDeploymentDescriptorEClass, CONNECTOR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
>+		createEReference(connectorDeploymentDescriptorEClass, CONNECTOR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
>+		createEReference(connectorDeploymentDescriptorEClass, CONNECTOR_DEPLOYMENT_DESCRIPTOR__CONNECTOR);
>+
>+		inboundResourceAdapterEClass = createEClass(INBOUND_RESOURCE_ADAPTER);
>+		createEReference(inboundResourceAdapterEClass, INBOUND_RESOURCE_ADAPTER__MESSAGEADAPTER);
>+		createEAttribute(inboundResourceAdapterEClass, INBOUND_RESOURCE_ADAPTER__ID);
>+
>+		licenseEClass = createEClass(LICENSE);
>+		createEReference(licenseEClass, LICENSE__DESCRIPTION);
>+		createEAttribute(licenseEClass, LICENSE__LICENSE_REQUIRED);
>+		createEAttribute(licenseEClass, LICENSE__ID);
>+
>+		messageAdapterEClass = createEClass(MESSAGE_ADAPTER);
>+		createEReference(messageAdapterEClass, MESSAGE_ADAPTER__MESSAGELISTENER);
>+		createEAttribute(messageAdapterEClass, MESSAGE_ADAPTER__ID);
>+
>+		messageListenerEClass = createEClass(MESSAGE_LISTENER);
>+		createEAttribute(messageListenerEClass, MESSAGE_LISTENER__MESSAGELISTENER_TYPE);
>+		createEReference(messageListenerEClass, MESSAGE_LISTENER__ACTIVATIONSPEC);
>+		createEAttribute(messageListenerEClass, MESSAGE_LISTENER__ID);
>+
>+		outboundResourceAdapterEClass = createEClass(OUTBOUND_RESOURCE_ADAPTER);
>+		createEReference(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITION);
>+		createEAttribute(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT);
>+		createEReference(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISM);
>+		createEAttribute(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT);
>+		createEAttribute(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__ID);
>+
>+		requiredConfigPropertyEClass = createEClass(REQUIRED_CONFIG_PROPERTY);
>+		createEReference(requiredConfigPropertyEClass, REQUIRED_CONFIG_PROPERTY__DESCRIPTION);
>+		createEAttribute(requiredConfigPropertyEClass, REQUIRED_CONFIG_PROPERTY__CONFIG_PROPERTY_NAME);
>+		createEAttribute(requiredConfigPropertyEClass, REQUIRED_CONFIG_PROPERTY__ID);
>+
>+		resourceAdapterEClass = createEClass(RESOURCE_ADAPTER);
>+		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__RESOURCEADAPTER_CLASS);
>+		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__CONFIG_PROPERTY);
>+		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__OUTBOUND_RESOURCEADAPTER);
>+		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__INBOUND_RESOURCEADAPTER);
>+		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__ADMINOBJECT);
>+		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__SECURITY_PERMISSION);
>+		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__ID);
>+
>+		securityPermissionEClass = createEClass(SECURITY_PERMISSION);
>+		createEReference(securityPermissionEClass, SECURITY_PERMISSION__DESCRIPTION);
>+		createEAttribute(securityPermissionEClass, SECURITY_PERMISSION__SECURITY_PERMISSION_SPEC);
>+		createEAttribute(securityPermissionEClass, SECURITY_PERMISSION__ID);
>+
>+		// Create enums
>+		configPropertyTypeTypeEEnum = createEEnum(CONFIG_PROPERTY_TYPE_TYPE);
>+		credentialInterfaceTypeEEnum = createEEnum(CREDENTIAL_INTERFACE_TYPE);
>+		transactionSupportTypeEEnum = createEEnum(TRANSACTION_SUPPORT_TYPE);
>+
>+		// Create data types
>+		configPropertyNameTypeEDataType = createEDataType(CONFIG_PROPERTY_NAME_TYPE);
>+		configPropertyTypeTypeObjectEDataType = createEDataType(CONFIG_PROPERTY_TYPE_TYPE_OBJECT);
>+		credentialInterfaceTypeObjectEDataType = createEDataType(CREDENTIAL_INTERFACE_TYPE_OBJECT);
>+		transactionSupportTypeObjectEDataType = createEDataType(TRANSACTION_SUPPORT_TYPE_OBJECT);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private boolean isInitialized = false;
>+
>+	/**
>+	 * Complete the initialization of the package and its meta-model. This
>+	 * method is guarded to have no affect on any invocation but its first.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void initializePackageContents() {
>+		if (isInitialized) return;
>+		isInitialized = true;
>+
>+		// Initialize package
>+		setName(eNAME);
>+		setNsPrefix(eNS_PREFIX);
>+		setNsURI(eNS_URI);
>+
>+		// Obtain other dependent packages
>+		JavaeePackage theJavaeePackage = (JavaeePackage)EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI);
>+		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
>+
>+		// Create type parameters
>+
>+		// Set bounds for type parameters
>+
>+		// Add supertypes to classes
>+
>+		// Initialize classes and features; add operations and parameters
>+		initEClass(activationSpecEClass, ActivationSpec.class, "ActivationSpec", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getActivationSpec_ActivationspecClass(), theJavaeePackage.getFullyQualifiedClassType(), "activationspecClass", null, 1, 1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getActivationSpec_RequiredConfigProperty(), this.getRequiredConfigProperty(), null, "requiredConfigProperty", null, 0, -1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getActivationSpec_ConfigProperty(), this.getConfigProperty(), null, "configProperty", null, 0, -1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getActivationSpec_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(adminObjectEClass, AdminObject.class, "AdminObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getAdminObject_AdminobjectInterface(), theJavaeePackage.getFullyQualifiedClassType(), "adminobjectInterface", null, 1, 1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAdminObject_AdminobjectClass(), theJavaeePackage.getFullyQualifiedClassType(), "adminobjectClass", null, 1, 1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getAdminObject_ConfigProperty(), this.getConfigProperty(), null, "configProperty", null, 0, -1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAdminObject_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(authenticationMechanismEClass, AuthenticationMechanism.class, "AuthenticationMechanism", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getAuthenticationMechanism_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAuthenticationMechanism_AuthenticationMechanismType(), theXMLTypePackage.getString(), "authenticationMechanismType", null, 1, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAuthenticationMechanism_CredentialInterface(), this.getCredentialInterfaceType(), "credentialInterface", null, 1, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAuthenticationMechanism_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(configPropertyEClass, ConfigProperty.class, "ConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getConfigProperty_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConfigProperty_ConfigPropertyName(), this.getConfigPropertyNameType(), "configPropertyName", null, 1, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConfigProperty_ConfigPropertyType(), this.getConfigPropertyTypeType(), "configPropertyType", null, 1, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConfigProperty_ConfigPropertyValue(), theXMLTypePackage.getString(), "configPropertyValue", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConfigProperty_ConfigPropertyIgnore(), theJavaeePackage.getTrueFalseType(), "configPropertyIgnore", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConfigProperty_ConfigPropertySupportsDynamicUpdates(), theJavaeePackage.getTrueFalseType(), "configPropertySupportsDynamicUpdates", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConfigProperty_ConfigPropertyConfidential(), theJavaeePackage.getTrueFalseType(), "configPropertyConfidential", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConfigProperty_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(connectionDefinitionEClass, ConnectionDefinition.class, "ConnectionDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getConnectionDefinition_ManagedconnectionfactoryClass(), theJavaeePackage.getFullyQualifiedClassType(), "managedconnectionfactoryClass", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getConnectionDefinition_ConfigProperty(), this.getConfigProperty(), null, "configProperty", null, 0, -1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConnectionDefinition_ConnectionfactoryInterface(), theJavaeePackage.getFullyQualifiedClassType(), "connectionfactoryInterface", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConnectionDefinition_ConnectionfactoryImplClass(), theJavaeePackage.getFullyQualifiedClassType(), "connectionfactoryImplClass", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConnectionDefinition_ConnectionInterface(), theJavaeePackage.getFullyQualifiedClassType(), "connectionInterface", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConnectionDefinition_ConnectionImplClass(), theJavaeePackage.getFullyQualifiedClassType(), "connectionImplClass", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConnectionDefinition_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(connectorEClass, Connector.class, "Connector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getConnector_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getConnector_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getConnector_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConnector_VendorName(), theXMLTypePackage.getString(), "vendorName", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConnector_EisType(), theXMLTypePackage.getString(), "eisType", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConnector_ResourceadapterVersion(), theXMLTypePackage.getString(), "resourceadapterVersion", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getConnector_License(), this.getLicense(), null, "license", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getConnector_Resourceadapter(), this.getResourceAdapter(), null, "resourceadapter", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConnector_RequiredWorkContext(), theJavaeePackage.getFullyQualifiedClassType(), "requiredWorkContext", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConnector_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConnector_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConnector_Version(), theJavaeePackage.getDeweyVersionType(), "version", "1.6", 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>+
>+		initEClass(connectorDeploymentDescriptorEClass, ConnectorDeploymentDescriptor.class, "ConnectorDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getConnectorDeploymentDescriptor_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(getConnectorDeploymentDescriptor_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(getConnectorDeploymentDescriptor_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(getConnectorDeploymentDescriptor_Connector(), this.getConnector(), null, "connector", 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(inboundResourceAdapterEClass, InboundResourceAdapter.class, "InboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getInboundResourceAdapter_Messageadapter(), this.getMessageAdapter(), null, "messageadapter", null, 0, 1, InboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getInboundResourceAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(licenseEClass, License.class, "License", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getLicense_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, License.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getLicense_LicenseRequired(), theJavaeePackage.getTrueFalseType(), "licenseRequired", null, 1, 1, License.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getLicense_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, License.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(messageAdapterEClass, MessageAdapter.class, "MessageAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getMessageAdapter_Messagelistener(), this.getMessageListener(), null, "messagelistener", null, 1, -1, MessageAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMessageAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(messageListenerEClass, MessageListener.class, "MessageListener", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getMessageListener_MessagelistenerType(), theJavaeePackage.getFullyQualifiedClassType(), "messagelistenerType", null, 1, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getMessageListener_Activationspec(), this.getActivationSpec(), null, "activationspec", null, 1, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMessageListener_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(outboundResourceAdapterEClass, OutboundResourceAdapter.class, "OutboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getOutboundResourceAdapter_ConnectionDefinition(), this.getConnectionDefinition(), null, "connectionDefinition", null, 1, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getOutboundResourceAdapter_TransactionSupport(), this.getTransactionSupportType(), "transactionSupport", null, 1, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getOutboundResourceAdapter_AuthenticationMechanism(), this.getAuthenticationMechanism(), null, "authenticationMechanism", null, 0, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getOutboundResourceAdapter_ReauthenticationSupport(), theJavaeePackage.getTrueFalseType(), "reauthenticationSupport", null, 1, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getOutboundResourceAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(requiredConfigPropertyEClass, RequiredConfigProperty.class, "RequiredConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getRequiredConfigProperty_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, RequiredConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getRequiredConfigProperty_ConfigPropertyName(), this.getConfigPropertyNameType(), "configPropertyName", null, 1, 1, RequiredConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getRequiredConfigProperty_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RequiredConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(resourceAdapterEClass, ResourceAdapter.class, "ResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getResourceAdapter_ResourceadapterClass(), theJavaeePackage.getFullyQualifiedClassType(), "resourceadapterClass", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getResourceAdapter_ConfigProperty(), this.getConfigProperty(), null, "configProperty", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getResourceAdapter_OutboundResourceadapter(), this.getOutboundResourceAdapter(), null, "outboundResourceadapter", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getResourceAdapter_InboundResourceadapter(), this.getInboundResourceAdapter(), null, "inboundResourceadapter", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getResourceAdapter_Adminobject(), this.getAdminObject(), null, "adminobject", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getResourceAdapter_SecurityPermission(), this.getSecurityPermission(), null, "securityPermission", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getResourceAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(securityPermissionEClass, SecurityPermission.class, "SecurityPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getSecurityPermission_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, SecurityPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSecurityPermission_SecurityPermissionSpec(), theXMLTypePackage.getString(), "securityPermissionSpec", null, 1, 1, SecurityPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSecurityPermission_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityPermission.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(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.class, "ConfigPropertyTypeType"); //$NON-NLS-1$
>+		addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_BOOLEAN);
>+		addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_STRING);
>+		addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_INTEGER);
>+		addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_DOUBLE);
>+		addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_BYTE);
>+		addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_SHORT);
>+		addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_LONG);
>+		addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_FLOAT);
>+		addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_CHARACTER);
>+
>+		initEEnum(credentialInterfaceTypeEEnum, CredentialInterfaceType.class, "CredentialInterfaceType"); //$NON-NLS-1$
>+		addEEnumLiteral(credentialInterfaceTypeEEnum, CredentialInterfaceType.JAVAX_RESOURCE_SPI_SECURITY_PASSWORD_CREDENTIAL);
>+		addEEnumLiteral(credentialInterfaceTypeEEnum, CredentialInterfaceType.ORG_IETF_JGSS_GSS_CREDENTIAL);
>+		addEEnumLiteral(credentialInterfaceTypeEEnum, CredentialInterfaceType.JAVAX_RESOURCE_SPI_SECURITY_GENERIC_CREDENTIAL);
>+
>+		initEEnum(transactionSupportTypeEEnum, TransactionSupportType.class, "TransactionSupportType"); //$NON-NLS-1$
>+		addEEnumLiteral(transactionSupportTypeEEnum, TransactionSupportType.NO_TRANSACTION);
>+		addEEnumLiteral(transactionSupportTypeEEnum, TransactionSupportType.LOCAL_TRANSACTION);
>+		addEEnumLiteral(transactionSupportTypeEEnum, TransactionSupportType.XA_TRANSACTION);
>+
>+		// Initialize data types
>+		initEDataType(configPropertyNameTypeEDataType, String.class, "ConfigPropertyNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(configPropertyTypeTypeObjectEDataType, ConfigPropertyTypeType.class, "ConfigPropertyTypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(credentialInterfaceTypeObjectEDataType, CredentialInterfaceType.class, "CredentialInterfaceTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(transactionSupportTypeObjectEDataType, TransactionSupportType.class, "TransactionSupportTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+
>+		// Create resource
>+		createResource(eNS_URI);
>+
>+		// Create annotations
>+		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
>+		createExtendedMetaDataAnnotations();
>+	}
>+
>+	/**
>+	 * Initializes the annotations for http:///org/eclipse/emf/ecore/util/ExtendedMetaData.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected void createExtendedMetaDataAnnotations() {
>+		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$				
>+		addAnnotation
>+		 (activationSpecEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "activationspecType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getActivationSpec_ActivationspecClass(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "activationspec-class", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getActivationSpec_RequiredConfigProperty(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "required-config-property", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getActivationSpec_ConfigProperty(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "config-property", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getActivationSpec_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (adminObjectEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "adminobjectType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getAdminObject_AdminobjectInterface(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "adminobject-interface", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getAdminObject_AdminobjectClass(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "adminobject-class", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAdminObject_ConfigProperty(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "config-property", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAdminObject_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (authenticationMechanismEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "authentication-mechanismType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAuthenticationMechanism_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
>+		 (getAuthenticationMechanism_AuthenticationMechanismType(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "authentication-mechanism-type", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAuthenticationMechanism_CredentialInterface(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "credential-interface", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAuthenticationMechanism_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (configPropertyEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "config-propertyType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConfigProperty_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
>+		 (getConfigProperty_ConfigPropertyName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "config-property-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConfigProperty_ConfigPropertyType(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "config-property-type", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConfigProperty_ConfigPropertyValue(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "config-property-value", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConfigProperty_ConfigPropertyIgnore(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "config-property-ignore", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConfigProperty_ConfigPropertySupportsDynamicUpdates(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "config-property-supports-dynamic-updates", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConfigProperty_ConfigPropertyConfidential(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "config-property-confidential", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConfigProperty_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (configPropertyNameTypeEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "config-property-nameType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "http://www.eclipse.org/emf/2003/XMLType#string" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (configPropertyTypeTypeEEnum, 
>+		 source, 
>+		 new String[] {
>+			 "name", "config-property-typeType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (configPropertyTypeTypeObjectEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "config-property-typeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "config-property-typeType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (connectionDefinitionEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "connection-definitionType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConnectionDefinition_ManagedconnectionfactoryClass(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "managedconnectionfactory-class", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConnectionDefinition_ConfigProperty(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "config-property", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConnectionDefinition_ConnectionfactoryInterface(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "connectionfactory-interface", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConnectionDefinition_ConnectionfactoryImplClass(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "connectionfactory-impl-class", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConnectionDefinition_ConnectionInterface(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "connection-interface", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConnectionDefinition_ConnectionImplClass(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "connection-impl-class", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConnectionDefinition_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (connectorEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "connectorType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConnector_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
>+		 (getConnector_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
>+		 (getConnector_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
>+		 (getConnector_VendorName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "vendor-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConnector_EisType(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "eis-type", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConnector_ResourceadapterVersion(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "resourceadapter-version", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConnector_License(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "license", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConnector_Resourceadapter(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "resourceadapter", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConnector_RequiredWorkContext(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "required-work-context", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConnector_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConnector_MetadataComplete(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "metadata-complete" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConnector_Version(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "version" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (connectorDeploymentDescriptorEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "mixed" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConnectorDeploymentDescriptor_Mixed(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", ":mixed" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConnectorDeploymentDescriptor_XMLNSPrefixMap(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "xmlns:prefix" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConnectorDeploymentDescriptor_XSISchemaLocation(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "xsi:schemaLocation" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getConnectorDeploymentDescriptor_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
>+		 (credentialInterfaceTypeEEnum, 
>+		 source, 
>+		 new String[] {
>+			 "name", "credential-interfaceType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (credentialInterfaceTypeObjectEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "credential-interfaceType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "credential-interfaceType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (inboundResourceAdapterEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "inbound-resourceadapterType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getInboundResourceAdapter_Messageadapter(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "messageadapter", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getInboundResourceAdapter_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (licenseEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "licenseType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getLicense_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
>+		 (getLicense_LicenseRequired(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "license-required", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getLicense_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (messageAdapterEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "messageadapterType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getMessageAdapter_Messagelistener(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "messagelistener", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getMessageAdapter_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (messageListenerEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "messagelistenerType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getMessageListener_MessagelistenerType(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "messagelistener-type", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getMessageListener_Activationspec(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "activationspec", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getMessageListener_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (outboundResourceAdapterEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "outbound-resourceadapterType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getOutboundResourceAdapter_ConnectionDefinition(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "connection-definition", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getOutboundResourceAdapter_TransactionSupport(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "transaction-support", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getOutboundResourceAdapter_AuthenticationMechanism(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "authentication-mechanism", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getOutboundResourceAdapter_ReauthenticationSupport(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "reauthentication-support", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getOutboundResourceAdapter_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (requiredConfigPropertyEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "required-config-propertyType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getRequiredConfigProperty_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
>+		 (getRequiredConfigProperty_ConfigPropertyName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "config-property-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getRequiredConfigProperty_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (resourceAdapterEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "resourceadapterType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getResourceAdapter_ResourceadapterClass(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "resourceadapter-class", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getResourceAdapter_ConfigProperty(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "config-property", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getResourceAdapter_OutboundResourceadapter(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "outbound-resourceadapter", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getResourceAdapter_InboundResourceadapter(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "inbound-resourceadapter", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getResourceAdapter_Adminobject(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "adminobject", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getResourceAdapter_SecurityPermission(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "security-permission", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getResourceAdapter_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (securityPermissionEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "security-permissionType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getSecurityPermission_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
>+		 (getSecurityPermission_SecurityPermissionSpec(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "security-permission-spec", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getSecurityPermission_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (transactionSupportTypeEEnum, 
>+		 source, 
>+		 new String[] {
>+			 "name", "transaction-supportType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (transactionSupportTypeObjectEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "transaction-supportType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "transaction-supportType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });
>+	}
>+
>+} //JcaPackageImpl
>Index: jee-models/org/eclipse/jst/javaee/core/IsolationLevelType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/core/IsolationLevelType.java
>diff -N jee-models/org/eclipse/jst/javaee/core/IsolationLevelType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/core/IsolationLevelType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,297 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.core;
>+
>+import java.util.Arrays;
>+import java.util.Collections;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.util.Enumerator;
>+
>+/**
>+ * 
>+ * A representation of the literals of the enumeration 'Isolation Level Type',
>+ * and utility methods for working with them.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * public enum isolation-level-type { TRANSACTION_NONE,
>+ * TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED,
>+ * TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE };
>+ * 
>+ * @since Java EE 6
>+ * 
>+ * 
>+ * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getIsolationLevelType()
>+ * @generated
>+ */
>+public enum IsolationLevelType implements Enumerator {
>+	/**
>+	 * The 'TRANSACTIONNONE' literal object.
>+	 * 
>+	 * 
>+	 * @see #TRANSACTIONNONE_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	TRANSACTIONNONE(0, "TRANSACTIONNONE", "TRANSACTION_NONE"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'TRANSACTIONREADUNCOMMITTED' literal object.
>+	 * 
>+	 * 
>+	 * @see #TRANSACTIONREADUNCOMMITTED_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	TRANSACTIONREADUNCOMMITTED(1, "TRANSACTIONREADUNCOMMITTED", "TRANSACTION_READ_UNCOMMITTED"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'TRANSACTIONREADCOMMITTED' literal object.
>+	 * 
>+	 * 
>+	 * @see #TRANSACTIONREADCOMMITTED_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	TRANSACTIONREADCOMMITTED(2, "TRANSACTIONREADCOMMITTED", "TRANSACTION_READ_COMMITTED"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'TRANSACTIONREPEATABLEREAD' literal object.
>+	 * 
>+	 * 
>+	 * @see #TRANSACTIONREPEATABLEREAD_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	TRANSACTIONREPEATABLEREAD(3, "TRANSACTIONREPEATABLEREAD", "TRANSACTION_REPEATABLE_READ"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'TRANSACTIONSERIALIZABLE' literal object.
>+	 * 
>+	 * 
>+	 * @see #TRANSACTIONSERIALIZABLE_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	TRANSACTIONSERIALIZABLE(4, "TRANSACTIONSERIALIZABLE", "TRANSACTION_SERIALIZABLE"); //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'TRANSACTIONNONE' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'TRANSACTIONNONE' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #TRANSACTIONNONE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int TRANSACTIONNONE_VALUE = 0;
>+
>+	/**
>+	 * The 'TRANSACTIONREADUNCOMMITTED' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'TRANSACTIONREADUNCOMMITTED' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #TRANSACTIONREADUNCOMMITTED
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int TRANSACTIONREADUNCOMMITTED_VALUE = 1;
>+
>+	/**
>+	 * The 'TRANSACTIONREADCOMMITTED' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'TRANSACTIONREADCOMMITTED' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #TRANSACTIONREADCOMMITTED
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int TRANSACTIONREADCOMMITTED_VALUE = 2;
>+
>+	/**
>+	 * The 'TRANSACTIONREPEATABLEREAD' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'TRANSACTIONREPEATABLEREAD' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #TRANSACTIONREPEATABLEREAD
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int TRANSACTIONREPEATABLEREAD_VALUE = 3;
>+
>+	/**
>+	 * The 'TRANSACTIONSERIALIZABLE' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'TRANSACTIONSERIALIZABLE' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #TRANSACTIONSERIALIZABLE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int TRANSACTIONSERIALIZABLE_VALUE = 4;
>+
>+	/**
>+	 * An array of all the 'Isolation Level Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private static final IsolationLevelType[] VALUES_ARRAY =
>+		new IsolationLevelType[] {
>+			TRANSACTIONNONE,
>+			TRANSACTIONREADUNCOMMITTED,
>+			TRANSACTIONREADCOMMITTED,
>+			TRANSACTIONREPEATABLEREAD,
>+			TRANSACTIONSERIALIZABLE,
>+		};
>+
>+	/**
>+	 * A public read-only list of all the 'Isolation Level Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final List<IsolationLevelType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+
>+	/**
>+	 * Returns the 'Isolation Level Type' literal with the specified literal value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static IsolationLevelType get(String literal) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			IsolationLevelType result = VALUES_ARRAY[i];
>+			if (result.toString().equals(literal)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Isolation Level Type' literal with the specified name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static IsolationLevelType getByName(String name) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			IsolationLevelType result = VALUES_ARRAY[i];
>+			if (result.getName().equals(name)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Isolation Level Type' literal with the specified integer value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static IsolationLevelType get(int value) {
>+		switch (value) {
>+			case TRANSACTIONNONE_VALUE: return TRANSACTIONNONE;
>+			case TRANSACTIONREADUNCOMMITTED_VALUE: return TRANSACTIONREADUNCOMMITTED;
>+			case TRANSACTIONREADCOMMITTED_VALUE: return TRANSACTIONREADCOMMITTED;
>+			case TRANSACTIONREPEATABLEREAD_VALUE: return TRANSACTIONREPEATABLEREAD;
>+			case TRANSACTIONSERIALIZABLE_VALUE: return TRANSACTIONSERIALIZABLE;
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
>+	 * Only this class can construct instances.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private IsolationLevelType(int value, String name, String literal) {
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+	
>+} //IsolationLevelType
>Index: jee-models/org/eclipse/jst/javaee/jca/RequiredConfigProperty.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/RequiredConfigProperty.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/RequiredConfigProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/RequiredConfigProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,120 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Required Config Property'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * <![CDATA[[
>+ * The required-config-propertyType contains a declaration
>+ * of a single configuration property used for specifying a
>+ * required configuration property name. It is used
>+ * by required-config-property elements.
>+ * 
>+ * Usage of this type is deprecated from Connectors 1.6 specification. 
>+ * Refer to required-config-property element for more information.
>+ * 
>+ * Example:
>+ * 
>+ * <required-config-property>
>+ * <config-property-name>Destination</config-property-name>
>+ * </required-config-property>
>+ * 
>+ * ]]>
>+ * 		@since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.RequiredConfigProperty#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.RequiredConfigProperty#getConfigPropertyName Config Property Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.RequiredConfigProperty#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getRequiredConfigProperty()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface RequiredConfigProperty extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Description' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Description' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Description' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getRequiredConfigProperty_Description()
>+	 * @generated
>+	 */
>+	List<Description> getDescription();
>+
>+	/**
>+	 * Returns the value of the 'Config Property Name' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Config Property Name' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Config Property Name' attribute.
>+	 * @see #setConfigPropertyName(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getRequiredConfigProperty_ConfigPropertyName()
>+	 * @generated
>+	 */
>+	String getConfigPropertyName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.RequiredConfigProperty#getConfigPropertyName Config Property Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Config Property Name' attribute.
>+	 * @see #getConfigPropertyName()
>+	 * @generated
>+	 */
>+	void setConfigPropertyName(String value);
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getRequiredConfigProperty_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.RequiredConfigProperty#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // RequiredConfigProperty
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConfigPropertyImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConfigPropertyImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConfigPropertyImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConfigPropertyImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,690 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.ConfigProperty;
>+import org.eclipse.jst.javaee.jca.ConfigPropertyTypeType;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Config Property'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConfigPropertyImpl#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConfigPropertyImpl#getConfigPropertyName Config Property Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConfigPropertyImpl#getConfigPropertyType Config Property Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConfigPropertyImpl#getConfigPropertyValue Config Property Value}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConfigPropertyImpl#isConfigPropertyIgnore Config Property Ignore}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConfigPropertyImpl#isConfigPropertySupportsDynamicUpdates Config Property Supports Dynamic Updates}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConfigPropertyImpl#isConfigPropertyConfidential Config Property Confidential}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConfigPropertyImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ConfigPropertyImpl extends EObjectImpl implements ConfigProperty {
>+	/**
>+	 * The cached value of the '{@link #getDescription() Description}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDescription()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<Description> description;
>+
>+	/**
>+	 * The default value of the '{@link #getConfigPropertyName() Config Property Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConfigPropertyName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String CONFIG_PROPERTY_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getConfigPropertyName() Config Property Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConfigPropertyName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String configPropertyName = CONFIG_PROPERTY_NAME_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getConfigPropertyType() Config Property Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConfigPropertyType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final ConfigPropertyTypeType CONFIG_PROPERTY_TYPE_EDEFAULT = ConfigPropertyTypeType.JAVA_LANG_BOOLEAN;
>+
>+	/**
>+	 * The cached value of the '{@link #getConfigPropertyType() Config Property Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConfigPropertyType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected ConfigPropertyTypeType configPropertyType = CONFIG_PROPERTY_TYPE_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Config Property Type attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean configPropertyTypeESet;
>+
>+	/**
>+	 * The default value of the '{@link #getConfigPropertyValue() Config Property Value}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConfigPropertyValue()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String CONFIG_PROPERTY_VALUE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getConfigPropertyValue() Config Property Value}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConfigPropertyValue()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String configPropertyValue = CONFIG_PROPERTY_VALUE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #isConfigPropertyIgnore() Config Property Ignore}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isConfigPropertyIgnore()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean CONFIG_PROPERTY_IGNORE_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isConfigPropertyIgnore() Config Property Ignore}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isConfigPropertyIgnore()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean configPropertyIgnore = CONFIG_PROPERTY_IGNORE_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Config Property Ignore attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean configPropertyIgnoreESet;
>+
>+	/**
>+	 * The default value of the '{@link #isConfigPropertySupportsDynamicUpdates() Config Property Supports Dynamic Updates}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isConfigPropertySupportsDynamicUpdates()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean CONFIG_PROPERTY_SUPPORTS_DYNAMIC_UPDATES_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isConfigPropertySupportsDynamicUpdates() Config Property Supports Dynamic Updates}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isConfigPropertySupportsDynamicUpdates()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean configPropertySupportsDynamicUpdates = CONFIG_PROPERTY_SUPPORTS_DYNAMIC_UPDATES_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Config Property Supports Dynamic Updates attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean configPropertySupportsDynamicUpdatesESet;
>+
>+	/**
>+	 * The default value of the '{@link #isConfigPropertyConfidential() Config Property Confidential}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isConfigPropertyConfidential()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean CONFIG_PROPERTY_CONFIDENTIAL_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isConfigPropertyConfidential() Config Property Confidential}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isConfigPropertyConfidential()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean configPropertyConfidential = CONFIG_PROPERTY_CONFIDENTIAL_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Config Property Confidential attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean configPropertyConfidentialESet;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected ConfigPropertyImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.CONFIG_PROPERTY;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Description> getDescription() {
>+		if (description == null) {
>+			description = new EObjectContainmentEList<Description>(Description.class, this, JcaPackage.CONFIG_PROPERTY__DESCRIPTION);
>+		}
>+		return description;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getConfigPropertyName() {
>+		return configPropertyName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConfigPropertyName(String newConfigPropertyName) {
>+		String oldConfigPropertyName = configPropertyName;
>+		configPropertyName = newConfigPropertyName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_NAME, oldConfigPropertyName, configPropertyName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ConfigPropertyTypeType getConfigPropertyType() {
>+		return configPropertyType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConfigPropertyType(ConfigPropertyTypeType newConfigPropertyType) {
>+		ConfigPropertyTypeType oldConfigPropertyType = configPropertyType;
>+		configPropertyType = newConfigPropertyType == null ? CONFIG_PROPERTY_TYPE_EDEFAULT : newConfigPropertyType;
>+		boolean oldConfigPropertyTypeESet = configPropertyTypeESet;
>+		configPropertyTypeESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_TYPE, oldConfigPropertyType, configPropertyType, !oldConfigPropertyTypeESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetConfigPropertyType() {
>+		ConfigPropertyTypeType oldConfigPropertyType = configPropertyType;
>+		boolean oldConfigPropertyTypeESet = configPropertyTypeESet;
>+		configPropertyType = CONFIG_PROPERTY_TYPE_EDEFAULT;
>+		configPropertyTypeESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_TYPE, oldConfigPropertyType, CONFIG_PROPERTY_TYPE_EDEFAULT, oldConfigPropertyTypeESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetConfigPropertyType() {
>+		return configPropertyTypeESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getConfigPropertyValue() {
>+		return configPropertyValue;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConfigPropertyValue(String newConfigPropertyValue) {
>+		String oldConfigPropertyValue = configPropertyValue;
>+		configPropertyValue = newConfigPropertyValue;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_VALUE, oldConfigPropertyValue, configPropertyValue));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isConfigPropertyIgnore() {
>+		return configPropertyIgnore;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConfigPropertyIgnore(boolean newConfigPropertyIgnore) {
>+		boolean oldConfigPropertyIgnore = configPropertyIgnore;
>+		configPropertyIgnore = newConfigPropertyIgnore;
>+		boolean oldConfigPropertyIgnoreESet = configPropertyIgnoreESet;
>+		configPropertyIgnoreESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_IGNORE, oldConfigPropertyIgnore, configPropertyIgnore, !oldConfigPropertyIgnoreESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetConfigPropertyIgnore() {
>+		boolean oldConfigPropertyIgnore = configPropertyIgnore;
>+		boolean oldConfigPropertyIgnoreESet = configPropertyIgnoreESet;
>+		configPropertyIgnore = CONFIG_PROPERTY_IGNORE_EDEFAULT;
>+		configPropertyIgnoreESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_IGNORE, oldConfigPropertyIgnore, CONFIG_PROPERTY_IGNORE_EDEFAULT, oldConfigPropertyIgnoreESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetConfigPropertyIgnore() {
>+		return configPropertyIgnoreESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isConfigPropertySupportsDynamicUpdates() {
>+		return configPropertySupportsDynamicUpdates;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConfigPropertySupportsDynamicUpdates(boolean newConfigPropertySupportsDynamicUpdates) {
>+		boolean oldConfigPropertySupportsDynamicUpdates = configPropertySupportsDynamicUpdates;
>+		configPropertySupportsDynamicUpdates = newConfigPropertySupportsDynamicUpdates;
>+		boolean oldConfigPropertySupportsDynamicUpdatesESet = configPropertySupportsDynamicUpdatesESet;
>+		configPropertySupportsDynamicUpdatesESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_SUPPORTS_DYNAMIC_UPDATES, oldConfigPropertySupportsDynamicUpdates, configPropertySupportsDynamicUpdates, !oldConfigPropertySupportsDynamicUpdatesESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetConfigPropertySupportsDynamicUpdates() {
>+		boolean oldConfigPropertySupportsDynamicUpdates = configPropertySupportsDynamicUpdates;
>+		boolean oldConfigPropertySupportsDynamicUpdatesESet = configPropertySupportsDynamicUpdatesESet;
>+		configPropertySupportsDynamicUpdates = CONFIG_PROPERTY_SUPPORTS_DYNAMIC_UPDATES_EDEFAULT;
>+		configPropertySupportsDynamicUpdatesESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_SUPPORTS_DYNAMIC_UPDATES, oldConfigPropertySupportsDynamicUpdates, CONFIG_PROPERTY_SUPPORTS_DYNAMIC_UPDATES_EDEFAULT, oldConfigPropertySupportsDynamicUpdatesESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetConfigPropertySupportsDynamicUpdates() {
>+		return configPropertySupportsDynamicUpdatesESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isConfigPropertyConfidential() {
>+		return configPropertyConfidential;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConfigPropertyConfidential(boolean newConfigPropertyConfidential) {
>+		boolean oldConfigPropertyConfidential = configPropertyConfidential;
>+		configPropertyConfidential = newConfigPropertyConfidential;
>+		boolean oldConfigPropertyConfidentialESet = configPropertyConfidentialESet;
>+		configPropertyConfidentialESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_CONFIDENTIAL, oldConfigPropertyConfidential, configPropertyConfidential, !oldConfigPropertyConfidentialESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetConfigPropertyConfidential() {
>+		boolean oldConfigPropertyConfidential = configPropertyConfidential;
>+		boolean oldConfigPropertyConfidentialESet = configPropertyConfidentialESet;
>+		configPropertyConfidential = CONFIG_PROPERTY_CONFIDENTIAL_EDEFAULT;
>+		configPropertyConfidentialESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_CONFIDENTIAL, oldConfigPropertyConfidential, CONFIG_PROPERTY_CONFIDENTIAL_EDEFAULT, oldConfigPropertyConfidentialESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetConfigPropertyConfidential() {
>+		return configPropertyConfidentialESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
>+				return ((InternalEList<?>)getDescription()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
>+				return getDescription();
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_NAME:
>+				return getConfigPropertyName();
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_TYPE:
>+				return getConfigPropertyType();
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_VALUE:
>+				return getConfigPropertyValue();
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_IGNORE:
>+				return isConfigPropertyIgnore();
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_SUPPORTS_DYNAMIC_UPDATES:
>+				return isConfigPropertySupportsDynamicUpdates();
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_CONFIDENTIAL:
>+				return isConfigPropertyConfidential();
>+			case JcaPackage.CONFIG_PROPERTY__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
>+				getDescription().clear();
>+				getDescription().addAll((Collection<? extends Description>)newValue);
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_NAME:
>+				setConfigPropertyName((String)newValue);
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_TYPE:
>+				setConfigPropertyType((ConfigPropertyTypeType)newValue);
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_VALUE:
>+				setConfigPropertyValue((String)newValue);
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_IGNORE:
>+				setConfigPropertyIgnore((Boolean)newValue);
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_SUPPORTS_DYNAMIC_UPDATES:
>+				setConfigPropertySupportsDynamicUpdates((Boolean)newValue);
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_CONFIDENTIAL:
>+				setConfigPropertyConfidential((Boolean)newValue);
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
>+				getDescription().clear();
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_NAME:
>+				setConfigPropertyName(CONFIG_PROPERTY_NAME_EDEFAULT);
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_TYPE:
>+				unsetConfigPropertyType();
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_VALUE:
>+				setConfigPropertyValue(CONFIG_PROPERTY_VALUE_EDEFAULT);
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_IGNORE:
>+				unsetConfigPropertyIgnore();
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_SUPPORTS_DYNAMIC_UPDATES:
>+				unsetConfigPropertySupportsDynamicUpdates();
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_CONFIDENTIAL:
>+				unsetConfigPropertyConfidential();
>+				return;
>+			case JcaPackage.CONFIG_PROPERTY__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
>+				return description != null && !description.isEmpty();
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_NAME:
>+				return CONFIG_PROPERTY_NAME_EDEFAULT == null ? configPropertyName != null : !CONFIG_PROPERTY_NAME_EDEFAULT.equals(configPropertyName);
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_TYPE:
>+				return isSetConfigPropertyType();
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_VALUE:
>+				return CONFIG_PROPERTY_VALUE_EDEFAULT == null ? configPropertyValue != null : !CONFIG_PROPERTY_VALUE_EDEFAULT.equals(configPropertyValue);
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_IGNORE:
>+				return isSetConfigPropertyIgnore();
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_SUPPORTS_DYNAMIC_UPDATES:
>+				return isSetConfigPropertySupportsDynamicUpdates();
>+			case JcaPackage.CONFIG_PROPERTY__CONFIG_PROPERTY_CONFIDENTIAL:
>+				return isSetConfigPropertyConfidential();
>+			case JcaPackage.CONFIG_PROPERTY__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (configPropertyName: "); //$NON-NLS-1$
>+		result.append(configPropertyName);
>+		result.append(", configPropertyType: "); //$NON-NLS-1$
>+		if (configPropertyTypeESet) result.append(configPropertyType); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", configPropertyValue: "); //$NON-NLS-1$
>+		result.append(configPropertyValue);
>+		result.append(", configPropertyIgnore: "); //$NON-NLS-1$
>+		if (configPropertyIgnoreESet) result.append(configPropertyIgnore); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", configPropertySupportsDynamicUpdates: "); //$NON-NLS-1$
>+		if (configPropertySupportsDynamicUpdatesESet) result.append(configPropertySupportsDynamicUpdates); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", configPropertyConfidential: "); //$NON-NLS-1$
>+		if (configPropertyConfidentialESet) result.append(configPropertyConfidential); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //ConfigPropertyImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ResourceAdapterImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ResourceAdapterImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/ResourceAdapterImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/ResourceAdapterImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,490 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.AdminObject;
>+import org.eclipse.jst.javaee.jca.ConfigProperty;
>+import org.eclipse.jst.javaee.jca.InboundResourceAdapter;
>+import org.eclipse.jst.javaee.jca.OutboundResourceAdapter;
>+import org.eclipse.jst.javaee.jca.ResourceAdapter;
>+import org.eclipse.jst.javaee.jca.SecurityPermission;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Resource Adapter'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ResourceAdapterImpl#getResourceadapterClass Resourceadapter Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ResourceAdapterImpl#getConfigProperty Config Property}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ResourceAdapterImpl#getOutboundResourceadapter Outbound Resourceadapter}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ResourceAdapterImpl#getInboundResourceadapter Inbound Resourceadapter}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ResourceAdapterImpl#getAdminobject Adminobject}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ResourceAdapterImpl#getSecurityPermission Security Permission}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ResourceAdapterImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ResourceAdapterImpl extends EObjectImpl implements ResourceAdapter {
>+	/**
>+	 * The default value of the '{@link #getResourceadapterClass() Resourceadapter Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getResourceadapterClass()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String RESOURCEADAPTER_CLASS_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getResourceadapterClass() Resourceadapter Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getResourceadapterClass()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String resourceadapterClass = RESOURCEADAPTER_CLASS_EDEFAULT;
>+
>+	/**
>+	 * The cached value of the '{@link #getConfigProperty() Config Property}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getConfigProperty()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ConfigProperty> configProperty;
>+
>+	/**
>+	 * The cached value of the '{@link #getOutboundResourceadapter() Outbound Resourceadapter}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getOutboundResourceadapter()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected OutboundResourceAdapter outboundResourceadapter;
>+
>+	/**
>+	 * The cached value of the '{@link #getInboundResourceadapter() Inbound Resourceadapter}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getInboundResourceadapter()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected InboundResourceAdapter inboundResourceadapter;
>+
>+	/**
>+	 * The cached value of the '{@link #getAdminobject() Adminobject}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getAdminobject()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<AdminObject> adminobject;
>+
>+	/**
>+	 * The cached value of the '{@link #getSecurityPermission() Security Permission}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getSecurityPermission()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<SecurityPermission> securityPermission;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected ResourceAdapterImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.RESOURCE_ADAPTER;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getResourceadapterClass() {
>+		return resourceadapterClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setResourceadapterClass(String newResourceadapterClass) {
>+		String oldResourceadapterClass = resourceadapterClass;
>+		resourceadapterClass = newResourceadapterClass;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__RESOURCEADAPTER_CLASS, oldResourceadapterClass, resourceadapterClass));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ConfigProperty> getConfigProperty() {
>+		if (configProperty == null) {
>+			configProperty = new EObjectContainmentEList<ConfigProperty>(ConfigProperty.class, this, JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTY);
>+		}
>+		return configProperty;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OutboundResourceAdapter getOutboundResourceadapter() {
>+		return outboundResourceadapter;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetOutboundResourceadapter(OutboundResourceAdapter newOutboundResourceadapter, NotificationChain msgs) {
>+		OutboundResourceAdapter oldOutboundResourceadapter = outboundResourceadapter;
>+		outboundResourceadapter = newOutboundResourceadapter;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCEADAPTER, oldOutboundResourceadapter, newOutboundResourceadapter);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setOutboundResourceadapter(OutboundResourceAdapter newOutboundResourceadapter) {
>+		if (newOutboundResourceadapter != outboundResourceadapter) {
>+			NotificationChain msgs = null;
>+			if (outboundResourceadapter != null)
>+				msgs = ((InternalEObject)outboundResourceadapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCEADAPTER, null, msgs);
>+			if (newOutboundResourceadapter != null)
>+				msgs = ((InternalEObject)newOutboundResourceadapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCEADAPTER, null, msgs);
>+			msgs = basicSetOutboundResourceadapter(newOutboundResourceadapter, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCEADAPTER, newOutboundResourceadapter, newOutboundResourceadapter));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public InboundResourceAdapter getInboundResourceadapter() {
>+		return inboundResourceadapter;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetInboundResourceadapter(InboundResourceAdapter newInboundResourceadapter, NotificationChain msgs) {
>+		InboundResourceAdapter oldInboundResourceadapter = inboundResourceadapter;
>+		inboundResourceadapter = newInboundResourceadapter;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCEADAPTER, oldInboundResourceadapter, newInboundResourceadapter);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setInboundResourceadapter(InboundResourceAdapter newInboundResourceadapter) {
>+		if (newInboundResourceadapter != inboundResourceadapter) {
>+			NotificationChain msgs = null;
>+			if (inboundResourceadapter != null)
>+				msgs = ((InternalEObject)inboundResourceadapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCEADAPTER, null, msgs);
>+			if (newInboundResourceadapter != null)
>+				msgs = ((InternalEObject)newInboundResourceadapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCEADAPTER, null, msgs);
>+			msgs = basicSetInboundResourceadapter(newInboundResourceadapter, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCEADAPTER, newInboundResourceadapter, newInboundResourceadapter));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<AdminObject> getAdminobject() {
>+		if (adminobject == null) {
>+			adminobject = new EObjectContainmentEList<AdminObject>(AdminObject.class, this, JcaPackage.RESOURCE_ADAPTER__ADMINOBJECT);
>+		}
>+		return adminobject;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<SecurityPermission> getSecurityPermission() {
>+		if (securityPermission == null) {
>+			securityPermission = new EObjectContainmentEList<SecurityPermission>(SecurityPermission.class, this, JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSION);
>+		}
>+		return securityPermission;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTY:
>+				return ((InternalEList<?>)getConfigProperty()).basicRemove(otherEnd, msgs);
>+			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCEADAPTER:
>+				return basicSetOutboundResourceadapter(null, msgs);
>+			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCEADAPTER:
>+				return basicSetInboundResourceadapter(null, msgs);
>+			case JcaPackage.RESOURCE_ADAPTER__ADMINOBJECT:
>+				return ((InternalEList<?>)getAdminobject()).basicRemove(otherEnd, msgs);
>+			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSION:
>+				return ((InternalEList<?>)getSecurityPermission()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.RESOURCE_ADAPTER__RESOURCEADAPTER_CLASS:
>+				return getResourceadapterClass();
>+			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTY:
>+				return getConfigProperty();
>+			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCEADAPTER:
>+				return getOutboundResourceadapter();
>+			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCEADAPTER:
>+				return getInboundResourceadapter();
>+			case JcaPackage.RESOURCE_ADAPTER__ADMINOBJECT:
>+				return getAdminobject();
>+			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSION:
>+				return getSecurityPermission();
>+			case JcaPackage.RESOURCE_ADAPTER__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.RESOURCE_ADAPTER__RESOURCEADAPTER_CLASS:
>+				setResourceadapterClass((String)newValue);
>+				return;
>+			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTY:
>+				getConfigProperty().clear();
>+				getConfigProperty().addAll((Collection<? extends ConfigProperty>)newValue);
>+				return;
>+			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCEADAPTER:
>+				setOutboundResourceadapter((OutboundResourceAdapter)newValue);
>+				return;
>+			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCEADAPTER:
>+				setInboundResourceadapter((InboundResourceAdapter)newValue);
>+				return;
>+			case JcaPackage.RESOURCE_ADAPTER__ADMINOBJECT:
>+				getAdminobject().clear();
>+				getAdminobject().addAll((Collection<? extends AdminObject>)newValue);
>+				return;
>+			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSION:
>+				getSecurityPermission().clear();
>+				getSecurityPermission().addAll((Collection<? extends SecurityPermission>)newValue);
>+				return;
>+			case JcaPackage.RESOURCE_ADAPTER__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.RESOURCE_ADAPTER__RESOURCEADAPTER_CLASS:
>+				setResourceadapterClass(RESOURCEADAPTER_CLASS_EDEFAULT);
>+				return;
>+			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTY:
>+				getConfigProperty().clear();
>+				return;
>+			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCEADAPTER:
>+				setOutboundResourceadapter((OutboundResourceAdapter)null);
>+				return;
>+			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCEADAPTER:
>+				setInboundResourceadapter((InboundResourceAdapter)null);
>+				return;
>+			case JcaPackage.RESOURCE_ADAPTER__ADMINOBJECT:
>+				getAdminobject().clear();
>+				return;
>+			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSION:
>+				getSecurityPermission().clear();
>+				return;
>+			case JcaPackage.RESOURCE_ADAPTER__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.RESOURCE_ADAPTER__RESOURCEADAPTER_CLASS:
>+				return RESOURCEADAPTER_CLASS_EDEFAULT == null ? resourceadapterClass != null : !RESOURCEADAPTER_CLASS_EDEFAULT.equals(resourceadapterClass);
>+			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTY:
>+				return configProperty != null && !configProperty.isEmpty();
>+			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCEADAPTER:
>+				return outboundResourceadapter != null;
>+			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCEADAPTER:
>+				return inboundResourceadapter != null;
>+			case JcaPackage.RESOURCE_ADAPTER__ADMINOBJECT:
>+				return adminobject != null && !adminobject.isEmpty();
>+			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSION:
>+				return securityPermission != null && !securityPermission.isEmpty();
>+			case JcaPackage.RESOURCE_ADAPTER__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (resourceadapterClass: "); //$NON-NLS-1$
>+		result.append(resourceadapterClass);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //ResourceAdapterImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/ResourceAdapter.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/ResourceAdapter.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/ResourceAdapter.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/ResourceAdapter.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,206 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Resource Adapter'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The resourceadapterType specifies information about the
>+ * resource adapter. The information includes fully qualified
>+ * resource adapter Java class name, configuration properties,
>+ * information specific to the implementation of the resource
>+ * adapter library as specified through the
>+ * outbound-resourceadapter and inbound-resourceadapter
>+ * elements, and an optional set of administered objects.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ResourceAdapter#getResourceadapterClass Resourceadapter Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ResourceAdapter#getConfigProperty Config Property}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ResourceAdapter#getOutboundResourceadapter Outbound Resourceadapter}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ResourceAdapter#getInboundResourceadapter Inbound Resourceadapter}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ResourceAdapter#getAdminobject Adminobject}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ResourceAdapter#getSecurityPermission Security Permission}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ResourceAdapter#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getResourceAdapter()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface ResourceAdapter extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Resourceadapter Class' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The element resourceadapter-class specifies the
>+	 * fully qualified name of a Java class that implements
>+	 * the javax.resource.spi.ResourceAdapter
>+	 * interface. This Java class is provided as part of
>+	 * resource adapter's implementation of connector
>+	 * architecture specified contracts. The implementation
>+	 * of this class is required to be a JavaBean.
>+	 * 
>+	 * 			@since Java EE 6, Connector 1.6 
>+	 * 
>+	 * 
>+	 * @return the value of the 'Resourceadapter Class' attribute.
>+	 * @see #setResourceadapterClass(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getResourceAdapter_ResourceadapterClass()
>+	 * @generated
>+	 */
>+	String getResourceadapterClass();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ResourceAdapter#getResourceadapterClass Resourceadapter Class}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Resourceadapter Class' attribute.
>+	 * @see #getResourceadapterClass()
>+	 * @generated
>+	 */
>+	void setResourceadapterClass(String value);
>+
>+	/**
>+	 * Returns the value of the 'Config Property' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.jca.ConfigProperty}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Config Property' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Config Property' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getResourceAdapter_ConfigProperty()
>+	 * @generated
>+	 */
>+	List<ConfigProperty> getConfigProperty();
>+
>+	/**
>+	 * Returns the value of the 'Outbound Resourceadapter' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Outbound Resourceadapter' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Outbound Resourceadapter' containment reference.
>+	 * @see #setOutboundResourceadapter(OutboundResourceAdapter)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getResourceAdapter_OutboundResourceadapter()
>+	 * @generated
>+	 */
>+	OutboundResourceAdapter getOutboundResourceadapter();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ResourceAdapter#getOutboundResourceadapter Outbound Resourceadapter}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Outbound Resourceadapter' containment reference.
>+	 * @see #getOutboundResourceadapter()
>+	 * @generated
>+	 */
>+	void setOutboundResourceadapter(OutboundResourceAdapter value);
>+
>+	/**
>+	 * Returns the value of the 'Inbound Resourceadapter' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Inbound Resourceadapter' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Inbound Resourceadapter' containment reference.
>+	 * @see #setInboundResourceadapter(InboundResourceAdapter)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getResourceAdapter_InboundResourceadapter()
>+	 * @generated
>+	 */
>+	InboundResourceAdapter getInboundResourceadapter();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ResourceAdapter#getInboundResourceadapter Inbound Resourceadapter}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Inbound Resourceadapter' containment reference.
>+	 * @see #getInboundResourceadapter()
>+	 * @generated
>+	 */
>+	void setInboundResourceadapter(InboundResourceAdapter value);
>+
>+	/**
>+	 * Returns the value of the 'Adminobject' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.jca.AdminObject}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Adminobject' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Adminobject' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getResourceAdapter_Adminobject()
>+	 * @generated
>+	 */
>+	List<AdminObject> getAdminobject();
>+
>+	/**
>+	 * Returns the value of the 'Security Permission' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.jca.SecurityPermission}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Security Permission' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Security Permission' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getResourceAdapter_SecurityPermission()
>+	 * @generated
>+	 */
>+	List<SecurityPermission> getSecurityPermission();
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getResourceAdapter_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ResourceAdapter#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // ResourceAdapter
>Index: jee-models/org/eclipse/jst/javaee/jca/ConnectionDefinition.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/ConnectionDefinition.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/ConnectionDefinition.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/ConnectionDefinition.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,286 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Connection Definition'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The connection-definitionType defines a set of connection
>+ * interfaces and classes pertaining to a particular connection
>+ * type. This also includes configurable properties for
>+ * ManagedConnectionFactory instances that may be produced out
>+ * of this set.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getManagedconnectionfactoryClass Managedconnectionfactory Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getConfigProperty Config Property}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getConnectionfactoryInterface Connectionfactory Interface}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getConnectionfactoryImplClass Connectionfactory Impl Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getConnectionInterface Connection Interface}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getConnectionImplClass Connection Impl Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectionDefinition()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface ConnectionDefinition extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Managedconnectionfactory Class' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * <![CDATA[[
>+	 * The element managedconnectionfactory-class specifies
>+	 * the fully qualified name of the Java class that
>+	 * implements the
>+	 * javax.resource.spi.ManagedConnectionFactory interface.
>+	 * This Java class is provided as part of resource
>+	 * adapter's implementation of connector architecture
>+	 * specified contracts. The implementation of this
>+	 * class is required to be a JavaBean.
>+	 * 
>+	 * Example:
>+	 * <managedconnectionfactory-class>
>+	 * 	 com.wombat.ManagedConnectionFactoryImpl
>+	 * </managedconnectionfactory-class>
>+	 * 
>+	 * ]]>
>+	 * 			@since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Managedconnectionfactory Class' attribute.
>+	 * @see #setManagedconnectionfactoryClass(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectionDefinition_ManagedconnectionfactoryClass()
>+	 * @generated
>+	 */
>+	String getManagedconnectionfactoryClass();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getManagedconnectionfactoryClass Managedconnectionfactory Class}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Managedconnectionfactory Class' attribute.
>+	 * @see #getManagedconnectionfactoryClass()
>+	 * @generated
>+	 */
>+	void setManagedconnectionfactoryClass(String value);
>+
>+	/**
>+	 * Returns the value of the 'Config Property' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.jca.ConfigProperty}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Config Property' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Config Property' containment reference list.
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectionDefinition_ConfigProperty()
>+	 * @generated
>+	 */
>+	List<ConfigProperty> getConfigProperty();
>+
>+	/**
>+	 * Returns the value of the 'Connectionfactory Interface' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * <![CDATA[[
>+	 * The element connectionfactory-interface specifies
>+	 * the fully qualified name of the ConnectionFactory
>+	 * interface supported by the resource adapter.
>+	 * 
>+	 * Example:
>+	 * <connectionfactory-interface>com.wombat.ConnectionFactory
>+	 * </connectionfactory-interface>
>+	 * 
>+	 * OR
>+	 * 
>+	 * <connectionfactory-interface>javax.resource.cci.ConnectionFactory
>+	 * </connectionfactory-interface>
>+	 * 
>+	 * ]]>
>+	 * 			@since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Connectionfactory Interface' attribute.
>+	 * @see #setConnectionfactoryInterface(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectionDefinition_ConnectionfactoryInterface()
>+	 * @generated
>+	 */
>+	String getConnectionfactoryInterface();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getConnectionfactoryInterface Connectionfactory Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Connectionfactory Interface' attribute.
>+	 * @see #getConnectionfactoryInterface()
>+	 * @generated
>+	 */
>+	void setConnectionfactoryInterface(String value);
>+
>+	/**
>+	 * Returns the value of the 'Connectionfactory Impl Class' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * <![CDATA[[
>+	 * The element connectionfactory-impl-class specifies
>+	 * the fully qualified name of the ConnectionFactory
>+	 * class that implements resource adapter
>+	 * specific ConnectionFactory interface.
>+	 * 
>+	 * Example:
>+	 * 
>+	 * <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
>+	 * </connectionfactory-impl-class>
>+	 * 
>+	 * ]]>
>+	 * 			@since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Connectionfactory Impl Class' attribute.
>+	 * @see #setConnectionfactoryImplClass(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectionDefinition_ConnectionfactoryImplClass()
>+	 * @generated
>+	 */
>+	String getConnectionfactoryImplClass();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getConnectionfactoryImplClass Connectionfactory Impl Class}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Connectionfactory Impl Class' attribute.
>+	 * @see #getConnectionfactoryImplClass()
>+	 * @generated
>+	 */
>+	void setConnectionfactoryImplClass(String value);
>+
>+	/**
>+	 * Returns the value of the 'Connection Interface' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * <![CDATA[[
>+	 * The connection-interface element specifies the fully
>+	 * qualified name of the Connection interface supported
>+	 * by the resource adapter.
>+	 * 
>+	 * Example:
>+	 * 
>+	 * 	 <connection-interface>javax.resource.cci.Connection
>+	 * 	 </connection-interface>
>+	 * 
>+	 * ]]>
>+	 * 			@since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Connection Interface' attribute.
>+	 * @see #setConnectionInterface(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectionDefinition_ConnectionInterface()
>+	 * @generated
>+	 */
>+	String getConnectionInterface();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getConnectionInterface Connection Interface}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Connection Interface' attribute.
>+	 * @see #getConnectionInterface()
>+	 * @generated
>+	 */
>+	void setConnectionInterface(String value);
>+
>+	/**
>+	 * Returns the value of the 'Connection Impl Class' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * <![CDATA[[
>+	 * The connection-impl-classType specifies the fully
>+	 * qualified name of the Connection class that
>+	 * implements resource adapter specific Connection
>+	 * interface. It is used by the connection-impl-class
>+	 * elements.
>+	 * 
>+	 * Example:
>+	 * 
>+	 * 	 <connection-impl-class>com.wombat.ConnectionImpl
>+	 * 	 </connection-impl-class>
>+	 * 
>+	 * ]]>
>+	 * 			@since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Connection Impl Class' attribute.
>+	 * @see #setConnectionImplClass(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectionDefinition_ConnectionImplClass()
>+	 * @generated
>+	 */
>+	String getConnectionImplClass();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getConnectionImplClass Connection Impl Class}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Connection Impl Class' attribute.
>+	 * @see #getConnectionImplClass()
>+	 * @generated
>+	 */
>+	void setConnectionImplClass(String value);
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnectionDefinition_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.ConnectionDefinition#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // ConnectionDefinition
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/MessageListenerImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/MessageListenerImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/MessageListenerImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/MessageListenerImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,303 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.ActivationSpec;
>+import org.eclipse.jst.javaee.jca.MessageListener;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Message Listener'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.MessageListenerImpl#getMessagelistenerType Messagelistener Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.MessageListenerImpl#getActivationspec Activationspec}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.MessageListenerImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class MessageListenerImpl extends EObjectImpl implements MessageListener {
>+	/**
>+	 * The default value of the '{@link #getMessagelistenerType() Messagelistener Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMessagelistenerType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String MESSAGELISTENER_TYPE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getMessagelistenerType() Messagelistener Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMessagelistenerType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String messagelistenerType = MESSAGELISTENER_TYPE_EDEFAULT;
>+
>+	/**
>+	 * The cached value of the '{@link #getActivationspec() Activationspec}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getActivationspec()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected ActivationSpec activationspec;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected MessageListenerImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.MESSAGE_LISTENER;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getMessagelistenerType() {
>+		return messagelistenerType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMessagelistenerType(String newMessagelistenerType) {
>+		String oldMessagelistenerType = messagelistenerType;
>+		messagelistenerType = newMessagelistenerType;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.MESSAGE_LISTENER__MESSAGELISTENER_TYPE, oldMessagelistenerType, messagelistenerType));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ActivationSpec getActivationspec() {
>+		return activationspec;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetActivationspec(ActivationSpec newActivationspec, NotificationChain msgs) {
>+		ActivationSpec oldActivationspec = activationspec;
>+		activationspec = newActivationspec;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.MESSAGE_LISTENER__ACTIVATIONSPEC, oldActivationspec, newActivationspec);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setActivationspec(ActivationSpec newActivationspec) {
>+		if (newActivationspec != activationspec) {
>+			NotificationChain msgs = null;
>+			if (activationspec != null)
>+				msgs = ((InternalEObject)activationspec).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.MESSAGE_LISTENER__ACTIVATIONSPEC, null, msgs);
>+			if (newActivationspec != null)
>+				msgs = ((InternalEObject)newActivationspec).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.MESSAGE_LISTENER__ACTIVATIONSPEC, null, msgs);
>+			msgs = basicSetActivationspec(newActivationspec, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.MESSAGE_LISTENER__ACTIVATIONSPEC, newActivationspec, newActivationspec));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.MESSAGE_LISTENER__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.MESSAGE_LISTENER__ACTIVATIONSPEC:
>+				return basicSetActivationspec(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.MESSAGE_LISTENER__MESSAGELISTENER_TYPE:
>+				return getMessagelistenerType();
>+			case JcaPackage.MESSAGE_LISTENER__ACTIVATIONSPEC:
>+				return getActivationspec();
>+			case JcaPackage.MESSAGE_LISTENER__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.MESSAGE_LISTENER__MESSAGELISTENER_TYPE:
>+				setMessagelistenerType((String)newValue);
>+				return;
>+			case JcaPackage.MESSAGE_LISTENER__ACTIVATIONSPEC:
>+				setActivationspec((ActivationSpec)newValue);
>+				return;
>+			case JcaPackage.MESSAGE_LISTENER__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.MESSAGE_LISTENER__MESSAGELISTENER_TYPE:
>+				setMessagelistenerType(MESSAGELISTENER_TYPE_EDEFAULT);
>+				return;
>+			case JcaPackage.MESSAGE_LISTENER__ACTIVATIONSPEC:
>+				setActivationspec((ActivationSpec)null);
>+				return;
>+			case JcaPackage.MESSAGE_LISTENER__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.MESSAGE_LISTENER__MESSAGELISTENER_TYPE:
>+				return MESSAGELISTENER_TYPE_EDEFAULT == null ? messagelistenerType != null : !MESSAGELISTENER_TYPE_EDEFAULT.equals(messagelistenerType);
>+			case JcaPackage.MESSAGE_LISTENER__ACTIVATIONSPEC:
>+				return activationspec != null;
>+			case JcaPackage.MESSAGE_LISTENER__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (messagelistenerType: "); //$NON-NLS-1$
>+		result.append(messagelistenerType);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //MessageListenerImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ActivationSpecImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ActivationSpecImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/ActivationSpecImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/ActivationSpecImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,319 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.ActivationSpec;
>+import org.eclipse.jst.javaee.jca.ConfigProperty;
>+import org.eclipse.jst.javaee.jca.RequiredConfigProperty;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Activation Spec'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ActivationSpecImpl#getActivationspecClass Activationspec Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ActivationSpecImpl#getRequiredConfigProperty Required Config Property}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ActivationSpecImpl#getConfigProperty Config Property}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ActivationSpecImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ActivationSpecImpl extends EObjectImpl implements ActivationSpec {
>+	/**
>+	 * The default value of the '{@link #getActivationspecClass() Activationspec Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getActivationspecClass()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ACTIVATIONSPEC_CLASS_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getActivationspecClass() Activationspec Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getActivationspecClass()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String activationspecClass = ACTIVATIONSPEC_CLASS_EDEFAULT;
>+
>+	/**
>+	 * The cached value of the '{@link #getRequiredConfigProperty() Required Config Property}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getRequiredConfigProperty()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<RequiredConfigProperty> requiredConfigProperty;
>+
>+	/**
>+	 * The cached value of the '{@link #getConfigProperty() Config Property}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getConfigProperty()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ConfigProperty> configProperty;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected ActivationSpecImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.ACTIVATION_SPEC;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getActivationspecClass() {
>+		return activationspecClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setActivationspecClass(String newActivationspecClass) {
>+		String oldActivationspecClass = activationspecClass;
>+		activationspecClass = newActivationspecClass;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.ACTIVATION_SPEC__ACTIVATIONSPEC_CLASS, oldActivationspecClass, activationspecClass));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<RequiredConfigProperty> getRequiredConfigProperty() {
>+		if (requiredConfigProperty == null) {
>+			requiredConfigProperty = new EObjectContainmentEList<RequiredConfigProperty>(RequiredConfigProperty.class, this, JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTY);
>+		}
>+		return requiredConfigProperty;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ConfigProperty> getConfigProperty() {
>+		if (configProperty == null) {
>+			configProperty = new EObjectContainmentEList<ConfigProperty>(ConfigProperty.class, this, JcaPackage.ACTIVATION_SPEC__CONFIG_PROPERTY);
>+		}
>+		return configProperty;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.ACTIVATION_SPEC__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTY:
>+				return ((InternalEList<?>)getRequiredConfigProperty()).basicRemove(otherEnd, msgs);
>+			case JcaPackage.ACTIVATION_SPEC__CONFIG_PROPERTY:
>+				return ((InternalEList<?>)getConfigProperty()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.ACTIVATION_SPEC__ACTIVATIONSPEC_CLASS:
>+				return getActivationspecClass();
>+			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTY:
>+				return getRequiredConfigProperty();
>+			case JcaPackage.ACTIVATION_SPEC__CONFIG_PROPERTY:
>+				return getConfigProperty();
>+			case JcaPackage.ACTIVATION_SPEC__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.ACTIVATION_SPEC__ACTIVATIONSPEC_CLASS:
>+				setActivationspecClass((String)newValue);
>+				return;
>+			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTY:
>+				getRequiredConfigProperty().clear();
>+				getRequiredConfigProperty().addAll((Collection<? extends RequiredConfigProperty>)newValue);
>+				return;
>+			case JcaPackage.ACTIVATION_SPEC__CONFIG_PROPERTY:
>+				getConfigProperty().clear();
>+				getConfigProperty().addAll((Collection<? extends ConfigProperty>)newValue);
>+				return;
>+			case JcaPackage.ACTIVATION_SPEC__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.ACTIVATION_SPEC__ACTIVATIONSPEC_CLASS:
>+				setActivationspecClass(ACTIVATIONSPEC_CLASS_EDEFAULT);
>+				return;
>+			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTY:
>+				getRequiredConfigProperty().clear();
>+				return;
>+			case JcaPackage.ACTIVATION_SPEC__CONFIG_PROPERTY:
>+				getConfigProperty().clear();
>+				return;
>+			case JcaPackage.ACTIVATION_SPEC__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.ACTIVATION_SPEC__ACTIVATIONSPEC_CLASS:
>+				return ACTIVATIONSPEC_CLASS_EDEFAULT == null ? activationspecClass != null : !ACTIVATIONSPEC_CLASS_EDEFAULT.equals(activationspecClass);
>+			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTY:
>+				return requiredConfigProperty != null && !requiredConfigProperty.isEmpty();
>+			case JcaPackage.ACTIVATION_SPEC__CONFIG_PROPERTY:
>+				return configProperty != null && !configProperty.isEmpty();
>+			case JcaPackage.ACTIVATION_SPEC__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (activationspecClass: "); //$NON-NLS-1$
>+		result.append(activationspecClass);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //ActivationSpecImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/CredentialInterfaceType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/CredentialInterfaceType.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/CredentialInterfaceType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/CredentialInterfaceType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,256 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import java.util.Arrays;
>+import java.util.Collections;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.util.Enumerator;
>+
>+/**
>+ * 
>+ * A representation of the literals of the enumeration 'Credential Interface Type',
>+ * and utility methods for working with them.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * The credential-interfaceType specifies the
>+ * interface that the resource adapter implementation
>+ * supports for the representation of the
>+ * credentials. This element(s) that use this type,
>+ * i.e. credential-interface, should be used by
>+ * application server to find out the Credential
>+ * interface it should use as part of the security
>+ * contract.
>+ * 
>+ * The possible values are:
>+ * 
>+ * javax.resource.spi.security.PasswordCredential
>+ * org.ietf.jgss.GSSCredential
>+ * javax.resource.spi.security.GenericCredential
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getCredentialInterfaceType()
>+ * @generated
>+ */
>+public enum CredentialInterfaceType implements Enumerator {
>+	/**
>+	 * The 'Javax Resource Spi Security Password Credential' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVAX_RESOURCE_SPI_SECURITY_PASSWORD_CREDENTIAL_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVAX_RESOURCE_SPI_SECURITY_PASSWORD_CREDENTIAL(0, "javaxResourceSpiSecurityPasswordCredential", "javax.resource.spi.security.PasswordCredential"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Org Ietf Jgss GSS Credential' literal object.
>+	 * 
>+	 * 
>+	 * @see #ORG_IETF_JGSS_GSS_CREDENTIAL_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	ORG_IETF_JGSS_GSS_CREDENTIAL(1, "orgIetfJgssGSSCredential", "org.ietf.jgss.GSSCredential"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Javax Resource Spi Security Generic Credential' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVAX_RESOURCE_SPI_SECURITY_GENERIC_CREDENTIAL_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVAX_RESOURCE_SPI_SECURITY_GENERIC_CREDENTIAL(2, "javaxResourceSpiSecurityGenericCredential", "javax.resource.spi.security.GenericCredential"); //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Javax Resource Spi Security Password Credential' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Javax Resource Spi Security Password Credential' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #JAVAX_RESOURCE_SPI_SECURITY_PASSWORD_CREDENTIAL
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int JAVAX_RESOURCE_SPI_SECURITY_PASSWORD_CREDENTIAL_VALUE = 0;
>+
>+	/**
>+	 * The 'Org Ietf Jgss GSS Credential' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Org Ietf Jgss GSS Credential' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #ORG_IETF_JGSS_GSS_CREDENTIAL
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int ORG_IETF_JGSS_GSS_CREDENTIAL_VALUE = 1;
>+
>+	/**
>+	 * The 'Javax Resource Spi Security Generic Credential' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Javax Resource Spi Security Generic Credential' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #JAVAX_RESOURCE_SPI_SECURITY_GENERIC_CREDENTIAL
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int JAVAX_RESOURCE_SPI_SECURITY_GENERIC_CREDENTIAL_VALUE = 2;
>+
>+	/**
>+	 * An array of all the 'Credential Interface Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private static final CredentialInterfaceType[] VALUES_ARRAY =
>+		new CredentialInterfaceType[] {
>+			JAVAX_RESOURCE_SPI_SECURITY_PASSWORD_CREDENTIAL,
>+			ORG_IETF_JGSS_GSS_CREDENTIAL,
>+			JAVAX_RESOURCE_SPI_SECURITY_GENERIC_CREDENTIAL,
>+		};
>+
>+	/**
>+	 * A public read-only list of all the 'Credential Interface Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final List<CredentialInterfaceType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+
>+	/**
>+	 * Returns the 'Credential Interface Type' literal with the specified literal value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static CredentialInterfaceType get(String literal) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			CredentialInterfaceType result = VALUES_ARRAY[i];
>+			if (result.toString().equals(literal)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Credential Interface Type' literal with the specified name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static CredentialInterfaceType getByName(String name) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			CredentialInterfaceType result = VALUES_ARRAY[i];
>+			if (result.getName().equals(name)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Credential Interface Type' literal with the specified integer value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static CredentialInterfaceType get(int value) {
>+		switch (value) {
>+			case JAVAX_RESOURCE_SPI_SECURITY_PASSWORD_CREDENTIAL_VALUE: return JAVAX_RESOURCE_SPI_SECURITY_PASSWORD_CREDENTIAL;
>+			case ORG_IETF_JGSS_GSS_CREDENTIAL_VALUE: return ORG_IETF_JGSS_GSS_CREDENTIAL;
>+			case JAVAX_RESOURCE_SPI_SECURITY_GENERIC_CREDENTIAL_VALUE: return JAVAX_RESOURCE_SPI_SECURITY_GENERIC_CREDENTIAL;
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final int value;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String name;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private final String literal;
>+
>+	/**
>+	 * Only this class can construct instances.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private CredentialInterfaceType(int value, String name, String literal) {
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public int getValue() {
>+	 return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+	 return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getLiteral() {
>+	 return literal;
>+	}
>+
>+	/**
>+	 * Returns the literal value of the enumerator, which is its string representation.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		return literal;
>+	}
>+	
>+} //CredentialInterfaceType
>Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/AddressingTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/core/internal/impl/AddressingTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/core/internal/impl/AddressingTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/AddressingTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,379 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+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.AddressingResponsesType;
>+import org.eclipse.jst.javaee.core.AddressingType;
>+
>+import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Addressing Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.AddressingTypeImpl#isEnabled Enabled}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.AddressingTypeImpl#isRequired Required}</li>
>+ * <li>{@link org.eclipse.jst.javaee.core.internal.impl.AddressingTypeImpl#getResponses Responses}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class AddressingTypeImpl extends EObjectImpl implements AddressingType {
>+	/**
>+	 * The default value of the '{@link #isEnabled() Enabled}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isEnabled()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean ENABLED_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isEnabled() Enabled}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isEnabled()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean enabled = ENABLED_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Enabled attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean enabledESet;
>+
>+	/**
>+	 * The default value of the '{@link #isRequired() Required}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isRequired()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean REQUIRED_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isRequired() Required}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isRequired()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean required = REQUIRED_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Required attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean requiredESet;
>+
>+	/**
>+	 * The default value of the '{@link #getResponses() Responses}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getResponses()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final AddressingResponsesType RESPONSES_EDEFAULT = AddressingResponsesType.ANONYMOUS;
>+
>+	/**
>+	 * The cached value of the '{@link #getResponses() Responses}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getResponses()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected AddressingResponsesType responses = RESPONSES_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Responses attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean responsesESet;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected AddressingTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JavaeePackage.Literals.ADDRESSING_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isEnabled() {
>+		return enabled;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setEnabled(boolean newEnabled) {
>+		boolean oldEnabled = enabled;
>+		enabled = newEnabled;
>+		boolean oldEnabledESet = enabledESet;
>+		enabledESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ADDRESSING_TYPE__ENABLED, oldEnabled, enabled, !oldEnabledESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetEnabled() {
>+		boolean oldEnabled = enabled;
>+		boolean oldEnabledESet = enabledESet;
>+		enabled = ENABLED_EDEFAULT;
>+		enabledESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.ADDRESSING_TYPE__ENABLED, oldEnabled, ENABLED_EDEFAULT, oldEnabledESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetEnabled() {
>+		return enabledESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isRequired() {
>+		return required;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setRequired(boolean newRequired) {
>+		boolean oldRequired = required;
>+		required = newRequired;
>+		boolean oldRequiredESet = requiredESet;
>+		requiredESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ADDRESSING_TYPE__REQUIRED, oldRequired, required, !oldRequiredESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetRequired() {
>+		boolean oldRequired = required;
>+		boolean oldRequiredESet = requiredESet;
>+		required = REQUIRED_EDEFAULT;
>+		requiredESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.ADDRESSING_TYPE__REQUIRED, oldRequired, REQUIRED_EDEFAULT, oldRequiredESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetRequired() {
>+		return requiredESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public AddressingResponsesType getResponses() {
>+		return responses;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setResponses(AddressingResponsesType newResponses) {
>+		AddressingResponsesType oldResponses = responses;
>+		responses = newResponses == null ? RESPONSES_EDEFAULT : newResponses;
>+		boolean oldResponsesESet = responsesESet;
>+		responsesESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.ADDRESSING_TYPE__RESPONSES, oldResponses, responses, !oldResponsesESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetResponses() {
>+		AddressingResponsesType oldResponses = responses;
>+		boolean oldResponsesESet = responsesESet;
>+		responses = RESPONSES_EDEFAULT;
>+		responsesESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, JavaeePackage.ADDRESSING_TYPE__RESPONSES, oldResponses, RESPONSES_EDEFAULT, oldResponsesESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetResponses() {
>+		return responsesESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JavaeePackage.ADDRESSING_TYPE__ENABLED:
>+				return isEnabled();
>+			case JavaeePackage.ADDRESSING_TYPE__REQUIRED:
>+				return isRequired();
>+			case JavaeePackage.ADDRESSING_TYPE__RESPONSES:
>+				return getResponses();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JavaeePackage.ADDRESSING_TYPE__ENABLED:
>+				setEnabled((Boolean)newValue);
>+				return;
>+			case JavaeePackage.ADDRESSING_TYPE__REQUIRED:
>+				setRequired((Boolean)newValue);
>+				return;
>+			case JavaeePackage.ADDRESSING_TYPE__RESPONSES:
>+				setResponses((AddressingResponsesType)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JavaeePackage.ADDRESSING_TYPE__ENABLED:
>+				unsetEnabled();
>+				return;
>+			case JavaeePackage.ADDRESSING_TYPE__REQUIRED:
>+				unsetRequired();
>+				return;
>+			case JavaeePackage.ADDRESSING_TYPE__RESPONSES:
>+				unsetResponses();
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JavaeePackage.ADDRESSING_TYPE__ENABLED:
>+				return isSetEnabled();
>+			case JavaeePackage.ADDRESSING_TYPE__REQUIRED:
>+				return isSetRequired();
>+			case JavaeePackage.ADDRESSING_TYPE__RESPONSES:
>+				return isSetResponses();
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (enabled: "); //$NON-NLS-1$
>+		if (enabledESet) result.append(enabled); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", required: "); //$NON-NLS-1$
>+		if (requiredESet) result.append(required); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", responses: "); //$NON-NLS-1$
>+		if (responsesESet) result.append(responses); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //AddressingTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/SecurityPermissionImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/internal/impl/SecurityPermissionImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/internal/impl/SecurityPermissionImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/SecurityPermissionImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,283 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca.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.jca.SecurityPermission;
>+
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Security Permission'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.SecurityPermissionImpl#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.SecurityPermissionImpl#getSecurityPermissionSpec Security Permission Spec}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.internal.impl.SecurityPermissionImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class SecurityPermissionImpl extends EObjectImpl implements SecurityPermission {
>+	/**
>+	 * The cached value of the '{@link #getDescription() Description}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDescription()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<Description> description;
>+
>+	/**
>+	 * The default value of the '{@link #getSecurityPermissionSpec() Security Permission Spec}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getSecurityPermissionSpec()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String SECURITY_PERMISSION_SPEC_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getSecurityPermissionSpec() Security Permission Spec}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getSecurityPermissionSpec()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String securityPermissionSpec = SECURITY_PERMISSION_SPEC_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ID_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getId() Id}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getId()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String id = ID_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected SecurityPermissionImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JcaPackage.Literals.SECURITY_PERMISSION;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Description> getDescription() {
>+		if (description == null) {
>+			description = new EObjectContainmentEList<Description>(Description.class, this, JcaPackage.SECURITY_PERMISSION__DESCRIPTION);
>+		}
>+		return description;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getSecurityPermissionSpec() {
>+		return securityPermissionSpec;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setSecurityPermissionSpec(String newSecurityPermissionSpec) {
>+		String oldSecurityPermissionSpec = securityPermissionSpec;
>+		securityPermissionSpec = newSecurityPermissionSpec;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.SECURITY_PERMISSION__SECURITY_PERMISSION_SPEC, oldSecurityPermissionSpec, securityPermissionSpec));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getId() {
>+		return id;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setId(String newId) {
>+		String oldId = id;
>+		id = newId;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.SECURITY_PERMISSION__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
>+				return ((InternalEList<?>)getDescription()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
>+				return getDescription();
>+			case JcaPackage.SECURITY_PERMISSION__SECURITY_PERMISSION_SPEC:
>+				return getSecurityPermissionSpec();
>+			case JcaPackage.SECURITY_PERMISSION__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
>+				getDescription().clear();
>+				getDescription().addAll((Collection<? extends Description>)newValue);
>+				return;
>+			case JcaPackage.SECURITY_PERMISSION__SECURITY_PERMISSION_SPEC:
>+				setSecurityPermissionSpec((String)newValue);
>+				return;
>+			case JcaPackage.SECURITY_PERMISSION__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
>+				getDescription().clear();
>+				return;
>+			case JcaPackage.SECURITY_PERMISSION__SECURITY_PERMISSION_SPEC:
>+				setSecurityPermissionSpec(SECURITY_PERMISSION_SPEC_EDEFAULT);
>+				return;
>+			case JcaPackage.SECURITY_PERMISSION__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
>+				return description != null && !description.isEmpty();
>+			case JcaPackage.SECURITY_PERMISSION__SECURITY_PERMISSION_SPEC:
>+				return SECURITY_PERMISSION_SPEC_EDEFAULT == null ? securityPermissionSpec != null : !SECURITY_PERMISSION_SPEC_EDEFAULT.equals(securityPermissionSpec);
>+			case JcaPackage.SECURITY_PERMISSION__ID:
>+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (securityPermissionSpec: "); //$NON-NLS-1$
>+		result.append(securityPermissionSpec);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //SecurityPermissionImpl
>Index: jee-models/org/eclipse/jst/javaee/jca/MessageListener.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/jca/MessageListener.java
>diff -N jee-models/org/eclipse/jst/javaee/jca/MessageListener.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/jca/MessageListener.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,130 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.jca;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Message Listener'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The messagelistenerType specifies information about a
>+ * specific message listener supported by the messaging
>+ * resource adapter. It contains information on the Java type
>+ * of the message listener interface and an activation
>+ * specification.
>+ * 
>+ * @since Java EE 6, Connector 1.6
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.jca.MessageListener#getMessagelistenerType Messagelistener Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.MessageListener#getActivationspec Activationspec}</li>
>+ * <li>{@link org.eclipse.jst.javaee.jca.MessageListener#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getMessageListener()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface MessageListener extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Messagelistener Type' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * <![CDATA[[
>+	 * The element messagelistener-type specifies the fully
>+	 * qualified name of the Java type of a message
>+	 * listener interface.
>+	 * 
>+	 * Example:
>+	 * 
>+	 * 	<messagelistener-type>javax.jms.MessageListener
>+	 * 	</messagelistener-type>
>+	 * 
>+	 * ]]>
>+	 * 			@since Java EE 6, Connector 1.6
>+	 * 
>+	 * 
>+	 * @return the value of the 'Messagelistener Type' attribute.
>+	 * @see #setMessagelistenerType(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getMessageListener_MessagelistenerType()
>+	 * @generated
>+	 */
>+	String getMessagelistenerType();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.MessageListener#getMessagelistenerType Messagelistener Type}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Messagelistener Type' attribute.
>+	 * @see #getMessagelistenerType()
>+	 * @generated
>+	 */
>+	void setMessagelistenerType(String value);
>+
>+	/**
>+	 * Returns the value of the 'Activationspec' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Activationspec' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Activationspec' containment reference.
>+	 * @see #setActivationspec(ActivationSpec)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getMessageListener_Activationspec()
>+	 * @generated
>+	 */
>+	ActivationSpec getActivationspec();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.MessageListener#getActivationspec Activationspec}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Activationspec' containment reference.
>+	 * @see #getActivationspec()
>+	 * @generated
>+	 */
>+	void setActivationspec(ActivationSpec value);
>+
>+	/**
>+	 * Returns the value of the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Id' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Id' attribute.
>+	 * @see #setId(String)
>+	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getMessageListener_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.MessageListener#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // MessageListener

Actions: View | Diff

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