Attachment 149601 Details for Bug 252615 – The Java EE 5 and 6 models - 3 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 - 3 of 3

JavaEE6modelsWTP1c.patch (text/plain), 1.25 MB, created by Carl Anderson

on 2009-10-14 17:49:09 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2009-10-14 17:49:09 EDT

Size: 1.25 MB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.jee.ejb
>Index: ejb/org/eclipse/jst/jee/model/internal/mergers/EjbJarMerger.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EjbJarMerger.java,v
>retrieving revision 1.4
>diff -u -r1.4 EjbJarMerger.java
>--- ejb/org/eclipse/jst/jee/model/internal/mergers/EjbJarMerger.java	9 Jun 2009 22:47:15 -0000	1.4
>+++ ejb/org/eclipse/jst/jee/model/internal/mergers/EjbJarMerger.java	14 Oct 2009 21:48:05 -0000
>@@ -241,9 +241,9 @@
> 			getBaseEjbJar().setInterceptors((InterceptorsType) (EcoreUtil.copy((EObject) getToMergeEjbJar().getInterceptors())));
> 		}
> 
>-		// if (!getToMergeEjbJar().isSetVersion()){
>-			// getBaseEjbJar().setVersion(getToMergeEjbJar().getVersion());
>-			// }
>+		 if (getToMergeEjbJar().isSetVersion()){
>+			 getBaseEjbJar().setVersion(getToMergeEjbJar().getVersion());
>+			 }
> 	}
> 
> 	private void copyAllContentInBase(List listSource, List target) {
>Index: ejb/org/eclipse/jst/jee/model/internal/mergers/AccessibleBeanMerger.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/AccessibleBeanMerger.java,v
>retrieving revision 1.4
>diff -u -r1.4 AccessibleBeanMerger.java
>--- ejb/org/eclipse/jst/jee/model/internal/mergers/AccessibleBeanMerger.java	10 Jun 2009 14:42:13 -0000	1.4
>+++ ejb/org/eclipse/jst/jee/model/internal/mergers/AccessibleBeanMerger.java	14 Oct 2009 21:48:05 -0000
>@@ -47,22 +47,22 @@
> SessionBean baseBean = getBaseBean();
> SessionBean toMergeBean = getToMergeBean();
> 
>- List toMergeBusinessLocal = toMergeBean.getBusinessLocals();
>- for(Object toMergeIntfs:toMergeBusinessLocal){
>- if (containsInterface(baseBean.getBusinessRemotes(), (String) toMergeIntfs)) {
>+ List<String> toMergeBusinessLocal = toMergeBean.getBusinessLocals();
>+ for(String toMergeIntfs:toMergeBusinessLocal){
>+ if (containsInterface(baseBean.getBusinessRemotes(), toMergeIntfs)) {
> continue;
> }
>- if (!containsInterface(baseBean.getBusinessLocals(), (String) toMergeIntfs)) {
>+ if (!containsInterface(baseBean.getBusinessLocals(), toMergeIntfs)) {
> baseBean.getBusinessLocals().add(toMergeIntfs);
> }
> }
> 
>- List toMergeIntfs = toMergeBean.getBusinessRemotes(); 
>- for(Object toMergeRemoteIntf:toMergeIntfs){
>- if (containsInterface(baseBean.getBusinessLocals(), (String) toMergeRemoteIntf)) {
>+ List<String> toMergeIntfs = toMergeBean.getBusinessRemotes(); 
>+ for(String toMergeRemoteIntf:toMergeIntfs){
>+ if (containsInterface(baseBean.getBusinessLocals(), toMergeRemoteIntf)) {
> continue;
> }
>- if (!containsInterface(baseBean.getBusinessRemotes(), (String) toMergeRemoteIntf)) {
>+ if (!containsInterface(baseBean.getBusinessRemotes(), toMergeRemoteIntf)) {
> baseBean.getBusinessRemotes().add(toMergeRemoteIntf);
> }
> }
>Index: ejb/org/eclipse/jst/jee/model/internal/mergers/SessionBeanMerger.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/SessionBeanMerger.java,v
>retrieving revision 1.3
>diff -u -r1.3 SessionBeanMerger.java
>--- ejb/org/eclipse/jst/jee/model/internal/mergers/SessionBeanMerger.java	10 Jun 2009 14:42:13 -0000	1.3
>+++ ejb/org/eclipse/jst/jee/model/internal/mergers/SessionBeanMerger.java	14 Oct 2009 21:48:05 -0000
>@@ -93,7 +93,7 @@
> base.setRetainIfException(((RemoveMethodType)object).isRetainIfException());
> }
> } else {
>- getBaseBean().getRemoveMethods().add(EcoreUtil.copy((EObject) object)); 
>+ getBaseBean().getRemoveMethods().add((RemoveMethodType) EcoreUtil.copy((EObject) object)); 
> }
> } 
> }
>@@ -134,7 +134,7 @@
> List toMergeList = getToMergeBean().getSecurityRoleRefs();
> for (Object roleRef:toMergeList) {
> if(!existingSecRoleRef(getBaseBean().getSecurityRoleRefs(), (SecurityRoleRef) roleRef)){
>- getBaseBean().getSecurityRoleRefs().add(EcoreUtil.copy((EObject) roleRef));
>+ getBaseBean().getSecurityRoleRefs().add((SecurityRoleRef) EcoreUtil.copy((EObject) roleRef));
> }
> 
> } 
>Index: ejb/org/eclipse/jst/jee/model/internal/mergers/EntityBeanMerger.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EntityBeanMerger.java,v
>retrieving revision 1.4
>diff -u -r1.4 EntityBeanMerger.java
>--- ejb/org/eclipse/jst/jee/model/internal/mergers/EntityBeanMerger.java	10 Jun 2009 14:42:13 -0000	1.4
>+++ ejb/org/eclipse/jst/jee/model/internal/mergers/EntityBeanMerger.java	14 Oct 2009 21:48:05 -0000
>@@ -64,13 +64,13 @@
> 
> 
> private void mergeSecurityRoleRefs(List warnings) throws ModelException {
>- List toMergeList = getToMergeBean().getSecurityRoleRefs();
>+ List<SecurityRoleRef> toMergeList = getToMergeBean().getSecurityRoleRefs();
> addAllRoleRefs(toMergeList, warnings);
> }
> 
>- private void addAllRoleRefs(List roleRefs, List warnings) {
>- for (Object roleRef:roleRefs) {
>- if(!existingSecRoleRef(getBaseBean().getSecurityRoleRefs(), (SecurityRoleRef) roleRef)){
>+ private void addAllRoleRefs(List<SecurityRoleRef> roleRefs, List warnings) {
>+ for (SecurityRoleRef roleRef:roleRefs) {
>+ if(!existingSecRoleRef(getBaseBean().getSecurityRoleRefs(), roleRef)){
> getBaseBean().getSecurityRoleRefs().add(roleRef);
> }
> 
>#P org.eclipse.jst.j2ee.tests
>Index: j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/JndiRefsTest.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/JndiRefsTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 JndiRefsTest.java
>--- j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/JndiRefsTest.java	25 Mar 2008 11:54:25 -0000	1.3
>+++ j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/JndiRefsTest.java	14 Oct 2009 21:48:06 -0000
>@@ -1888,7 +1888,7 @@
> assertEquals(1, beanBase.getEnvEntries().size());
> assertEquals("mapped1", ((EnvEntry)beanBase.getEnvEntries().get(0)).getMappedName());
> assertEquals("refName1", ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryName());
>- assertEquals(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL, ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryType());
>+ assertEquals(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL.getLiteral(), ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryType());
> assertEquals("true", ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryValue());
> }
> 
>@@ -1924,7 +1924,7 @@
> assertEquals(1, beanBase.getEnvEntries().size());
> assertEquals("mapped1", ((EnvEntry)beanBase.getEnvEntries().get(0)).getMappedName());
> assertEquals("refName1", ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryName());
>- assertEquals(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL, ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryType());
>+ assertEquals(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL.getLiteral(), ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryType());
> assertEquals("true", ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryValue());
> }
> 
>@@ -1963,7 +1963,7 @@
> assertEquals(1, beanBase.getEnvEntries().size());
> assertEquals("mapped1", ((EnvEntry)beanBase.getEnvEntries().get(0)).getMappedName());
> assertEquals("refName1", ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryName());
>- assertEquals(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL, ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryType());
>+ assertEquals(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL.getLiteral(), ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryType());
> assertEquals("true", ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryValue());
> 
> }
>@@ -2005,11 +2005,11 @@
> EnvEntry test = getEnvEntry(beanBase.getEnvEntries(), "refName1");
> EnvEntry test2 = getEnvEntry(beanBase.getEnvEntries(), "refName2");
> assertEquals("mapped1", test.getMappedName());
>- assertEquals(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL, test.getEnvEntryType());
>+ assertEquals(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL.getLiteral(), test.getEnvEntryType());
> assertEquals("true", test.getEnvEntryValue());
> 
> assertEquals("mapped2", test2.getMappedName());
>- assertEquals(EnvEntryType.JAVA_LANG_BYTE_LITERAL, test2.getEnvEntryType());
>+ assertEquals(EnvEntryType.JAVA_LANG_BYTE_LITERAL.getLiteral(), test2.getEnvEntryType());
> assertEquals("00", test2.getEnvEntryValue());
> 
> }
>@@ -2047,7 +2047,7 @@
> assertEquals(1, beanBase.getEnvEntries().size());
> 
> EnvEntry test = getEnvEntry(beanBase.getEnvEntries(), "refName1");
>- assertEquals(EnvEntryType.JAVA_LANG_BYTE_LITERAL, test.getEnvEntryType());
>+ assertEquals(EnvEntryType.JAVA_LANG_BYTE_LITERAL.getLiteral(), test.getEnvEntryType());
> assertEquals("mapped2", test.getMappedName());
> assertEquals("00", test.getEnvEntryValue());
> 
>#P org.eclipse.jst.j2ee.core
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AssemblyDescriptorImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AssemblyDescriptorImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 AssemblyDescriptorImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AssemblyDescriptorImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AssemblyDescriptorImpl.java	14 Oct 2009 21:48:07 -0000
>@@ -68,7 +68,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList securityRoles = null;
>+	protected EList<SecurityRole> securityRoles;
> 
> 	/**
> 	 * The cached value of the '{@link #getMethodPermissions() Method Permissions}' containment reference list.
>@@ -78,7 +78,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList methodPermissions = null;
>+	protected EList<MethodPermission> methodPermissions;
> 
> 	/**
> 	 * The cached value of the '{@link #getContainerTransactions() Container Transactions}' containment reference list.
>@@ -88,7 +88,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList containerTransactions = null;
>+	protected EList<ContainerTransactionType> containerTransactions;
> 
> 	/**
> 	 * The cached value of the '{@link #getInterceptorBindings() Interceptor Bindings}' containment reference list.
>@@ -98,7 +98,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList interceptorBindings = null;
>+	protected EList<InterceptorBindingType> interceptorBindings;
> 
> 	/**
> 	 * The cached value of the '{@link #getMessageDestinations() Message Destinations}' containment reference list.
>@@ -108,7 +108,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList messageDestinations = null;
>+	protected EList<MessageDestination> messageDestinations;
> 
> 	/**
> 	 * The cached value of the '{@link #getExcludeList() Exclude List}' containment reference.
>@@ -118,7 +118,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected ExcludeList excludeList = null;
>+	protected ExcludeList excludeList;
> 
> 	/**
> 	 * The cached value of the '{@link #getApplicationExceptions() Application Exceptions}' containment reference list.
>@@ -128,7 +128,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList applicationExceptions = null;
>+	protected EList<ApplicationException> applicationExceptions;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -174,9 +174,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getSecurityRoles() {
>+	public List<SecurityRole> getSecurityRoles() {
> 		if (securityRoles == null) {
>-			securityRoles = new EObjectContainmentEList(SecurityRole.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES);
>+			securityRoles = new EObjectContainmentEList<SecurityRole>(SecurityRole.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES);
> 		}
> 		return securityRoles;
> 	}
>@@ -186,9 +186,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMethodPermissions() {
>+	public List<MethodPermission> getMethodPermissions() {
> 		if (methodPermissions == null) {
>-			methodPermissions = new EObjectContainmentEList(MethodPermission.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS);
>+			methodPermissions = new EObjectContainmentEList<MethodPermission>(MethodPermission.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS);
> 		}
> 		return methodPermissions;
> 	}
>@@ -198,9 +198,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getContainerTransactions() {
>+	public List<ContainerTransactionType> getContainerTransactions() {
> 		if (containerTransactions == null) {
>-			containerTransactions = new EObjectContainmentEList(ContainerTransactionType.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS);
>+			containerTransactions = new EObjectContainmentEList<ContainerTransactionType>(ContainerTransactionType.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS);
> 		}
> 		return containerTransactions;
> 	}
>@@ -210,9 +210,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInterceptorBindings() {
>+	public List<InterceptorBindingType> getInterceptorBindings() {
> 		if (interceptorBindings == null) {
>-			interceptorBindings = new EObjectContainmentEList(InterceptorBindingType.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS);
>+			interceptorBindings = new EObjectContainmentEList<InterceptorBindingType>(InterceptorBindingType.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS);
> 		}
> 		return interceptorBindings;
> 	}
>@@ -222,9 +222,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMessageDestinations() {
>+	public List<MessageDestination> getMessageDestinations() {
> 		if (messageDestinations == null) {
>-			messageDestinations = new EObjectContainmentEList(MessageDestination.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS);
>+			messageDestinations = new EObjectContainmentEList<MessageDestination>(MessageDestination.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS);
> 		}
> 		return messageDestinations;
> 	}
>@@ -277,9 +277,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getApplicationExceptions() {
>+	public List<ApplicationException> getApplicationExceptions() {
> 		if (applicationExceptions == null) {
>-			applicationExceptions = new EObjectContainmentEList(ApplicationException.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS);
>+			applicationExceptions = new EObjectContainmentEList<ApplicationException>(ApplicationException.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS);
> 		}
> 		return applicationExceptions;
> 	}
>@@ -314,19 +314,19 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
>-				return ((InternalEList)getSecurityRoles()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getSecurityRoles()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
>-				return ((InternalEList)getMethodPermissions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMethodPermissions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS:
>-				return ((InternalEList)getContainerTransactions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getContainerTransactions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS:
>-				return ((InternalEList)getInterceptorBindings()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInterceptorBindings()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
>-				return ((InternalEList)getMessageDestinations()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMessageDestinations()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
> 				return basicSetExcludeList(null, msgs);
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS:
>-				return ((InternalEList)getApplicationExceptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getApplicationExceptions()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -364,35 +364,36 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
> 				getSecurityRoles().clear();
>-				getSecurityRoles().addAll((Collection)newValue);
>+				getSecurityRoles().addAll((Collection<? extends SecurityRole>)newValue);
> 				return;
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
> 				getMethodPermissions().clear();
>-				getMethodPermissions().addAll((Collection)newValue);
>+				getMethodPermissions().addAll((Collection<? extends MethodPermission>)newValue);
> 				return;
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__CONTAINER_TRANSACTIONS:
> 				getContainerTransactions().clear();
>-				getContainerTransactions().addAll((Collection)newValue);
>+				getContainerTransactions().addAll((Collection<? extends ContainerTransactionType>)newValue);
> 				return;
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__INTERCEPTOR_BINDINGS:
> 				getInterceptorBindings().clear();
>-				getInterceptorBindings().addAll((Collection)newValue);
>+				getInterceptorBindings().addAll((Collection<? extends InterceptorBindingType>)newValue);
> 				return;
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
> 				getMessageDestinations().clear();
>-				getMessageDestinations().addAll((Collection)newValue);
>+				getMessageDestinations().addAll((Collection<? extends MessageDestination>)newValue);
> 				return;
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
> 				setExcludeList((ExcludeList)newValue);
> 				return;
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS:
> 				getApplicationExceptions().clear();
>-				getApplicationExceptions().addAll((Collection)newValue);
>+				getApplicationExceptions().addAll((Collection<? extends ApplicationException>)newValue);
> 				return;
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMPFieldImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMPFieldImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 CMPFieldImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMPFieldImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMPFieldImpl.java	14 Oct 2009 21:48:07 -0000
>@@ -57,7 +57,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getFieldName() Field Name}' attribute.
>@@ -123,9 +123,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.CMP_FIELD__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.CMP_FIELD__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -181,7 +181,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.CMP_FIELD__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -209,12 +209,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.CMP_FIELD__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.CMP_FIELD__FIELD_NAME:
> 				setFieldName((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/NamedMethodTypeImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/NamedMethodTypeImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 NamedMethodTypeImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/NamedMethodTypeImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/NamedMethodTypeImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -68,7 +68,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected MethodParams methodParams = null;
>+	protected MethodParams methodParams;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EntityBeanImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EntityBeanImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 EntityBeanImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EntityBeanImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EntityBeanImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -27,6 +27,7 @@
> 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.DisplayName;
> import org.eclipse.jst.javaee.core.EjbLocalRef;
>@@ -86,6 +87,7 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getPersistenceUnitRefs Persistence Unit Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getPostConstructs Post Constructs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getPreDestroys Pre Destroys}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getDataSource Data Source}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getSecurityRoleRefs Security Role Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getSecurityIdentity Security Identity}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EntityBeanImpl#getQueries Queries}</li>
>@@ -104,7 +106,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>@@ -114,7 +116,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -124,7 +126,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
> 
> 	/**
> 	 * The default value of the '{@link #getEjbName() Ejb Name}' attribute.
>@@ -293,7 +295,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean persistenceTypeESet = false;
>+	protected boolean persistenceTypeESet;
> 
> 	/**
> 	 * The default value of the '{@link #getPrimKeyClass() Prim Key Class}' attribute.
>@@ -342,7 +344,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean reentrantESet = false;
>+	protected boolean reentrantESet;
> 
> 	/**
> 	 * The default value of the '{@link #getCmpVersion() Cmp Version}' attribute.
>@@ -371,7 +373,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean cmpVersionESet = false;
>+	protected boolean cmpVersionESet;
> 
> 	/**
> 	 * The default value of the '{@link #getAbstractSchemaName() Abstract Schema Name}' attribute.
>@@ -401,7 +403,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList cmpFields = null;
>+	protected EList<CMPField> cmpFields;
> 
> 	/**
> 	 * The default value of the '{@link #getPrimkeyField() Primkey Field}' attribute.
>@@ -431,7 +433,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList envEntries = null;
>+	protected EList<EnvEntry> envEntries;
> 
> 	/**
> 	 * The cached value of the '{@link #getEjbRefs() Ejb Refs}' containment reference list.
>@@ -441,7 +443,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList ejbRefs = null;
>+	protected EList<EjbRef> ejbRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getEjbLocalRefs() Ejb Local Refs}' containment reference list.
>@@ -451,7 +453,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList ejbLocalRefs = null;
>+	protected EList<EjbLocalRef> ejbLocalRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getServiceRefs() Service Refs}' containment reference list.
>@@ -461,7 +463,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList serviceRefs = null;
>+	protected EList<ServiceRef> serviceRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getResourceRefs() Resource Refs}' containment reference list.
>@@ -471,7 +473,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList resourceRefs = null;
>+	protected EList<ResourceRef> resourceRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getResourceEnvRefs() Resource Env Refs}' containment reference list.
>@@ -481,7 +483,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList resourceEnvRefs = null;
>+	protected EList<ResourceEnvRef> resourceEnvRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getMessageDestinationRefs() Message Destination Refs}' containment reference list.
>@@ -491,7 +493,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList messageDestinationRefs = null;
>+	protected EList<MessageDestinationRef> messageDestinationRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPersistenceContextRefs() Persistence Context Refs}' containment reference list.
>@@ -501,7 +503,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList persistenceContextRefs = null;
>+	protected EList<PersistenceContextRef> persistenceContextRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPersistenceUnitRefs() Persistence Unit Refs}' containment reference list.
>@@ -511,7 +513,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList persistenceUnitRefs = null;
>+	protected EList<PersistenceUnitRef> persistenceUnitRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPostConstructs() Post Constructs}' containment reference list.
>@@ -521,7 +523,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList postConstructs = null;
>+	protected EList<LifecycleCallback> postConstructs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPreDestroys() Pre Destroys}' containment reference list.
>@@ -531,7 +533,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList preDestroys = null;
>+	protected EList<LifecycleCallback> preDestroys;
>+
>+	/**
>+	 * The cached value of the '{@link #getDataSource() Data Source}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDataSource()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<DataSourceType> dataSource;
> 
> 	/**
> 	 * The cached value of the '{@link #getSecurityRoleRefs() Security Role Refs}' containment reference list.
>@@ -541,7 +553,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList securityRoleRefs = null;
>+	protected EList<SecurityRoleRef> securityRoleRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getSecurityIdentity() Security Identity}' containment reference.
>@@ -551,7 +563,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected SecurityIdentityType securityIdentity = null;
>+	protected SecurityIdentityType securityIdentity;
> 
> 	/**
> 	 * The cached value of the '{@link #getQueries() Queries}' containment reference list.
>@@ -561,7 +573,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList queries = null;
>+	protected EList<Query> queries;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -607,9 +619,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.ENTITY_BEAN__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.ENTITY_BEAN__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -619,9 +631,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, EjbPackage.ENTITY_BEAN__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, EjbPackage.ENTITY_BEAN__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -631,9 +643,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, EjbPackage.ENTITY_BEAN__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, EjbPackage.ENTITY_BEAN__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -970,9 +982,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getCmpFields() {
>+	public List<CMPField> getCmpFields() {
> 		if (cmpFields == null) {
>-			cmpFields = new EObjectContainmentEList(CMPField.class, this, EjbPackage.ENTITY_BEAN__CMP_FIELDS);
>+			cmpFields = new EObjectContainmentEList<CMPField>(CMPField.class, this, EjbPackage.ENTITY_BEAN__CMP_FIELDS);
> 		}
> 		return cmpFields;
> 	}
>@@ -1003,9 +1015,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEnvEntries() {
>+	public List<EnvEntry> getEnvEntries() {
> 		if (envEntries == null) {
>-			envEntries = new EObjectContainmentEList(EnvEntry.class, this, EjbPackage.ENTITY_BEAN__ENV_ENTRIES);
>+			envEntries = new EObjectContainmentEList<EnvEntry>(EnvEntry.class, this, EjbPackage.ENTITY_BEAN__ENV_ENTRIES);
> 		}
> 		return envEntries;
> 	}
>@@ -1015,9 +1027,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbRefs() {
>+	public List<EjbRef> getEjbRefs() {
> 		if (ejbRefs == null) {
>-			ejbRefs = new EObjectContainmentEList(EjbRef.class, this, EjbPackage.ENTITY_BEAN__EJB_REFS);
>+			ejbRefs = new EObjectContainmentEList<EjbRef>(EjbRef.class, this, EjbPackage.ENTITY_BEAN__EJB_REFS);
> 		}
> 		return ejbRefs;
> 	}
>@@ -1027,9 +1039,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbLocalRefs() {
>+	public List<EjbLocalRef> getEjbLocalRefs() {
> 		if (ejbLocalRefs == null) {
>-			ejbLocalRefs = new EObjectContainmentEList(EjbLocalRef.class, this, EjbPackage.ENTITY_BEAN__EJB_LOCAL_REFS);
>+			ejbLocalRefs = new EObjectContainmentEList<EjbLocalRef>(EjbLocalRef.class, this, EjbPackage.ENTITY_BEAN__EJB_LOCAL_REFS);
> 		}
> 		return ejbLocalRefs;
> 	}
>@@ -1039,9 +1051,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getServiceRefs() {
>+	public List<ServiceRef> getServiceRefs() {
> 		if (serviceRefs == null) {
>-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, EjbPackage.ENTITY_BEAN__SERVICE_REFS);
>+			serviceRefs = new EObjectContainmentEList<ServiceRef>(ServiceRef.class, this, EjbPackage.ENTITY_BEAN__SERVICE_REFS);
> 		}
> 		return serviceRefs;
> 	}
>@@ -1051,9 +1063,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getResourceRefs() {
>+	public List<ResourceRef> getResourceRefs() {
> 		if (resourceRefs == null) {
>-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, EjbPackage.ENTITY_BEAN__RESOURCE_REFS);
>+			resourceRefs = new EObjectContainmentEList<ResourceRef>(ResourceRef.class, this, EjbPackage.ENTITY_BEAN__RESOURCE_REFS);
> 		}
> 		return resourceRefs;
> 	}
>@@ -1063,9 +1075,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getResourceEnvRefs() {
>+	public List<ResourceEnvRef> getResourceEnvRefs() {
> 		if (resourceEnvRefs == null) {
>-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, EjbPackage.ENTITY_BEAN__RESOURCE_ENV_REFS);
>+			resourceEnvRefs = new EObjectContainmentEList<ResourceEnvRef>(ResourceEnvRef.class, this, EjbPackage.ENTITY_BEAN__RESOURCE_ENV_REFS);
> 		}
> 		return resourceEnvRefs;
> 	}
>@@ -1075,9 +1087,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMessageDestinationRefs() {
>+	public List<MessageDestinationRef> getMessageDestinationRefs() {
> 		if (messageDestinationRefs == null) {
>-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, EjbPackage.ENTITY_BEAN__MESSAGE_DESTINATION_REFS);
>+			messageDestinationRefs = new EObjectContainmentEList<MessageDestinationRef>(MessageDestinationRef.class, this, EjbPackage.ENTITY_BEAN__MESSAGE_DESTINATION_REFS);
> 		}
> 		return messageDestinationRefs;
> 	}
>@@ -1087,9 +1099,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPersistenceContextRefs() {
>+	public List<PersistenceContextRef> getPersistenceContextRefs() {
> 		if (persistenceContextRefs == null) {
>-			persistenceContextRefs = new EObjectContainmentEList(PersistenceContextRef.class, this, EjbPackage.ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS);
>+			persistenceContextRefs = new EObjectContainmentEList<PersistenceContextRef>(PersistenceContextRef.class, this, EjbPackage.ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS);
> 		}
> 		return persistenceContextRefs;
> 	}
>@@ -1099,9 +1111,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPersistenceUnitRefs() {
>+	public List<PersistenceUnitRef> getPersistenceUnitRefs() {
> 		if (persistenceUnitRefs == null) {
>-			persistenceUnitRefs = new EObjectContainmentEList(PersistenceUnitRef.class, this, EjbPackage.ENTITY_BEAN__PERSISTENCE_UNIT_REFS);
>+			persistenceUnitRefs = new EObjectContainmentEList<PersistenceUnitRef>(PersistenceUnitRef.class, this, EjbPackage.ENTITY_BEAN__PERSISTENCE_UNIT_REFS);
> 		}
> 		return persistenceUnitRefs;
> 	}
>@@ -1111,9 +1123,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPostConstructs() {
>+	public List<LifecycleCallback> getPostConstructs() {
> 		if (postConstructs == null) {
>-			postConstructs = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.ENTITY_BEAN__POST_CONSTRUCTS);
>+			postConstructs = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.ENTITY_BEAN__POST_CONSTRUCTS);
> 		}
> 		return postConstructs;
> 	}
>@@ -1123,9 +1135,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPreDestroys() {
>+	public List<LifecycleCallback> getPreDestroys() {
> 		if (preDestroys == null) {
>-			preDestroys = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.ENTITY_BEAN__PRE_DESTROYS);
>+			preDestroys = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.ENTITY_BEAN__PRE_DESTROYS);
> 		}
> 		return preDestroys;
> 	}
>@@ -1135,9 +1147,21 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getSecurityRoleRefs() {
>+	public List<DataSourceType> getDataSource() {
>+		if (dataSource == null) {
>+			dataSource = new EObjectContainmentEList<DataSourceType>(DataSourceType.class, this, EjbPackage.ENTITY_BEAN__DATA_SOURCE);
>+		}
>+		return dataSource;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<SecurityRoleRef> getSecurityRoleRefs() {
> 		if (securityRoleRefs == null) {
>-			securityRoleRefs = new EObjectContainmentEList(SecurityRoleRef.class, this, EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS);
>+			securityRoleRefs = new EObjectContainmentEList<SecurityRoleRef>(SecurityRoleRef.class, this, EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS);
> 		}
> 		return securityRoleRefs;
> 	}
>@@ -1190,9 +1214,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getQueries() {
>+	public List<Query> getQueries() {
> 		if (queries == null) {
>-			queries = new EObjectContainmentEList(Query.class, this, EjbPackage.ENTITY_BEAN__QUERIES);
>+			queries = new EObjectContainmentEList<Query>(Query.class, this, EjbPackage.ENTITY_BEAN__QUERIES);
> 		}
> 		return queries;
> 	}
>@@ -1227,41 +1251,43 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.ENTITY_BEAN__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__CMP_FIELDS:
>-				return ((InternalEList)getCmpFields()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getCmpFields()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__ENV_ENTRIES:
>-				return ((InternalEList)getEnvEntries()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEnvEntries()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__EJB_REFS:
>-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__EJB_LOCAL_REFS:
>-				return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__SERVICE_REFS:
>-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getServiceRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__RESOURCE_REFS:
>-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getResourceRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__RESOURCE_ENV_REFS:
>-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__MESSAGE_DESTINATION_REFS:
>-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS:
>-				return ((InternalEList)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__PERSISTENCE_UNIT_REFS:
>-				return ((InternalEList)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__POST_CONSTRUCTS:
>-				return ((InternalEList)getPostConstructs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPostConstructs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__PRE_DESTROYS:
>-				return ((InternalEList)getPreDestroys()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPreDestroys()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.ENTITY_BEAN__DATA_SOURCE:
>+				return ((InternalEList<?>)getDataSource()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS:
>-				return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY:
> 				return basicSetSecurityIdentity(null, msgs);
> 			case EjbPackage.ENTITY_BEAN__QUERIES:
>-				return ((InternalEList)getQueries()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getQueries()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -1299,7 +1325,7 @@
> 			case EjbPackage.ENTITY_BEAN__PRIM_KEY_CLASS:
> 				return getPrimKeyClass();
> 			case EjbPackage.ENTITY_BEAN__REENTRANT:
>-				return isReentrant() ? Boolean.TRUE : Boolean.FALSE;
>+				return isReentrant();
> 			case EjbPackage.ENTITY_BEAN__CMP_VERSION:
> 				return getCmpVersion();
> 			case EjbPackage.ENTITY_BEAN__ABSTRACT_SCHEMA_NAME:
>@@ -1330,6 +1356,8 @@
> 				return getPostConstructs();
> 			case EjbPackage.ENTITY_BEAN__PRE_DESTROYS:
> 				return getPreDestroys();
>+			case EjbPackage.ENTITY_BEAN__DATA_SOURCE:
>+				return getDataSource();
> 			case EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS:
> 				return getSecurityRoleRefs();
> 			case EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY:
>@@ -1347,20 +1375,21 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.ENTITY_BEAN__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__EJB_NAME:
> 				setEjbName((String)newValue);
>@@ -1390,7 +1419,7 @@
> 				setPrimKeyClass((String)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__REENTRANT:
>-				setReentrant(((Boolean)newValue).booleanValue());
>+				setReentrant((Boolean)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__CMP_VERSION:
> 				setCmpVersion((CmpVersionType)newValue);
>@@ -1400,65 +1429,69 @@
> 				return;
> 			case EjbPackage.ENTITY_BEAN__CMP_FIELDS:
> 				getCmpFields().clear();
>-				getCmpFields().addAll((Collection)newValue);
>+				getCmpFields().addAll((Collection<? extends CMPField>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__PRIMKEY_FIELD:
> 				setPrimkeyField((String)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__ENV_ENTRIES:
> 				getEnvEntries().clear();
>-				getEnvEntries().addAll((Collection)newValue);
>+				getEnvEntries().addAll((Collection<? extends EnvEntry>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__EJB_REFS:
> 				getEjbRefs().clear();
>-				getEjbRefs().addAll((Collection)newValue);
>+				getEjbRefs().addAll((Collection<? extends EjbRef>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__EJB_LOCAL_REFS:
> 				getEjbLocalRefs().clear();
>-				getEjbLocalRefs().addAll((Collection)newValue);
>+				getEjbLocalRefs().addAll((Collection<? extends EjbLocalRef>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__SERVICE_REFS:
> 				getServiceRefs().clear();
>-				getServiceRefs().addAll((Collection)newValue);
>+				getServiceRefs().addAll((Collection<? extends ServiceRef>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__RESOURCE_REFS:
> 				getResourceRefs().clear();
>-				getResourceRefs().addAll((Collection)newValue);
>+				getResourceRefs().addAll((Collection<? extends ResourceRef>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__RESOURCE_ENV_REFS:
> 				getResourceEnvRefs().clear();
>-				getResourceEnvRefs().addAll((Collection)newValue);
>+				getResourceEnvRefs().addAll((Collection<? extends ResourceEnvRef>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__MESSAGE_DESTINATION_REFS:
> 				getMessageDestinationRefs().clear();
>-				getMessageDestinationRefs().addAll((Collection)newValue);
>+				getMessageDestinationRefs().addAll((Collection<? extends MessageDestinationRef>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__PERSISTENCE_CONTEXT_REFS:
> 				getPersistenceContextRefs().clear();
>-				getPersistenceContextRefs().addAll((Collection)newValue);
>+				getPersistenceContextRefs().addAll((Collection<? extends PersistenceContextRef>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__PERSISTENCE_UNIT_REFS:
> 				getPersistenceUnitRefs().clear();
>-				getPersistenceUnitRefs().addAll((Collection)newValue);
>+				getPersistenceUnitRefs().addAll((Collection<? extends PersistenceUnitRef>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__POST_CONSTRUCTS:
> 				getPostConstructs().clear();
>-				getPostConstructs().addAll((Collection)newValue);
>+				getPostConstructs().addAll((Collection<? extends LifecycleCallback>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__PRE_DESTROYS:
> 				getPreDestroys().clear();
>-				getPreDestroys().addAll((Collection)newValue);
>+				getPreDestroys().addAll((Collection<? extends LifecycleCallback>)newValue);
>+				return;
>+			case EjbPackage.ENTITY_BEAN__DATA_SOURCE:
>+				getDataSource().clear();
>+				getDataSource().addAll((Collection<? extends DataSourceType>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS:
> 				getSecurityRoleRefs().clear();
>-				getSecurityRoleRefs().addAll((Collection)newValue);
>+				getSecurityRoleRefs().addAll((Collection<? extends SecurityRoleRef>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY:
> 				setSecurityIdentity((SecurityIdentityType)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__QUERIES:
> 				getQueries().clear();
>-				getQueries().addAll((Collection)newValue);
>+				getQueries().addAll((Collection<? extends Query>)newValue);
> 				return;
> 			case EjbPackage.ENTITY_BEAN__ID:
> 				setId((String)newValue);
>@@ -1559,6 +1592,9 @@
> 			case EjbPackage.ENTITY_BEAN__PRE_DESTROYS:
> 				getPreDestroys().clear();
> 				return;
>+			case EjbPackage.ENTITY_BEAN__DATA_SOURCE:
>+				getDataSource().clear();
>+				return;
> 			case EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS:
> 				getSecurityRoleRefs().clear();
> 				return;
>@@ -1639,6 +1675,8 @@
> 				return postConstructs != null && !postConstructs.isEmpty();
> 			case EjbPackage.ENTITY_BEAN__PRE_DESTROYS:
> 				return preDestroys != null && !preDestroys.isEmpty();
>+			case EjbPackage.ENTITY_BEAN__DATA_SOURCE:
>+				return dataSource != null && !dataSource.isEmpty();
> 			case EjbPackage.ENTITY_BEAN__SECURITY_ROLE_REFS:
> 				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
> 			case EjbPackage.ENTITY_BEAN__SECURITY_IDENTITY:
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorOrderTypeImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorOrderTypeImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 InterceptorOrderTypeImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorOrderTypeImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorOrderTypeImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -51,7 +51,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList interceptorClasses = null;
>+	protected EList<String> interceptorClasses;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -97,9 +97,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInterceptorClasses() {
>+	public List<String> getInterceptorClasses() {
> 		if (interceptorClasses == null) {
>-			interceptorClasses = new EDataTypeEList(String.class, this, EjbPackage.INTERCEPTOR_ORDER_TYPE__INTERCEPTOR_CLASSES);
>+			interceptorClasses = new EDataTypeEList<String>(String.class, this, EjbPackage.INTERCEPTOR_ORDER_TYPE__INTERCEPTOR_CLASSES);
> 		}
> 		return interceptorClasses;
> 	}
>@@ -146,12 +146,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.INTERCEPTOR_ORDER_TYPE__INTERCEPTOR_CLASSES:
> 				getInterceptorClasses().clear();
>-				getInterceptorClasses().addAll((Collection)newValue);
>+				getInterceptorClasses().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_ORDER_TYPE__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipRoleSourceTypeImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipRoleSourceTypeImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 RelationshipRoleSourceTypeImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipRoleSourceTypeImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipRoleSourceTypeImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -57,7 +57,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getEjbName() Ejb Name}' attribute.
>@@ -123,9 +123,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -181,7 +181,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -209,12 +209,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE__EJB_NAME:
> 				setEjbName((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EnterpriseBeansImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EnterpriseBeansImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 EnterpriseBeansImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EnterpriseBeansImpl.java	9 Jun 2009 22:38:41 -0000	1.4
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EnterpriseBeansImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -28,6 +28,9 @@
> 
> import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
> 
>+import org.eclipse.jst.javaee.ejb.EntityBean;
>+import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
>+import org.eclipse.jst.javaee.ejb.SessionBean;
> import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
> 
> /**
>@@ -56,7 +59,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected FeatureMap group = null;
>+	protected FeatureMap group;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -114,8 +117,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getSessionBeans() {
>-		return (getGroup()).list(EjbPackage.Literals.ENTERPRISE_BEANS__SESSION_BEANS);
>+	public List<SessionBean> getSessionBeans() {
>+		return getGroup().list(EjbPackage.Literals.ENTERPRISE_BEANS__SESSION_BEANS);
> 	}
> 
> 	/**
>@@ -123,8 +126,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEntityBeans() {
>-		return (getGroup()).list(EjbPackage.Literals.ENTERPRISE_BEANS__ENTITY_BEANS);
>+	public List<EntityBean> getEntityBeans() {
>+		return getGroup().list(EjbPackage.Literals.ENTERPRISE_BEANS__ENTITY_BEANS);
> 	}
> 
> 	/**
>@@ -132,8 +135,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMessageDrivenBeans() {
>-		return (getGroup()).list(EjbPackage.Literals.ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS);
>+	public List<MessageDrivenBean> getMessageDrivenBeans() {
>+		return getGroup().list(EjbPackage.Literals.ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS);
> 	}
> 
> 	/**
>@@ -166,13 +169,13 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.ENTERPRISE_BEANS__GROUP:
>-				return ((InternalEList)getGroup()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getGroup()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTERPRISE_BEANS__SESSION_BEANS:
>-				return ((InternalEList)getSessionBeans()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getSessionBeans()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTERPRISE_BEANS__ENTITY_BEANS:
>-				return ((InternalEList)getEntityBeans()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEntityBeans()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS:
>-				return ((InternalEList)getMessageDrivenBeans()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMessageDrivenBeans()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -205,6 +208,7 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
>@@ -213,15 +217,15 @@
> 				return;
> 			case EjbPackage.ENTERPRISE_BEANS__SESSION_BEANS:
> 				getSessionBeans().clear();
>-				getSessionBeans().addAll((Collection)newValue);
>+				getSessionBeans().addAll((Collection<? extends SessionBean>)newValue);
> 				return;
> 			case EjbPackage.ENTERPRISE_BEANS__ENTITY_BEANS:
> 				getEntityBeans().clear();
>-				getEntityBeans().addAll((Collection)newValue);
>+				getEntityBeans().addAll((Collection<? extends EntityBean>)newValue);
> 				return;
> 			case EjbPackage.ENTERPRISE_BEANS__MESSAGE_DRIVEN_BEANS:
> 				getMessageDrivenBeans().clear();
>-				getMessageDrivenBeans().addAll((Collection)newValue);
>+				getMessageDrivenBeans().addAll((Collection<? extends MessageDrivenBean>)newValue);
> 				return;
> 			case EjbPackage.ENTERPRISE_BEANS__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMRFieldImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMRFieldImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 CMRFieldImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMRFieldImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/CMRFieldImpl.java	14 Oct 2009 21:48:07 -0000
>@@ -59,7 +59,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getCmrFieldName() Cmr Field Name}' attribute.
>@@ -108,7 +108,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean cmrFieldTypeESet = false;
>+	protected boolean cmrFieldTypeESet;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -154,9 +154,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.CMR_FIELD__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.CMR_FIELD__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -258,7 +258,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.CMR_FIELD__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -288,12 +288,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.CMR_FIELD__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.CMR_FIELD__CMR_FIELD_NAME:
> 				setCmrFieldName((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarDeploymentDescriptorImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarDeploymentDescriptorImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 EJBJarDeploymentDescriptorImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarDeploymentDescriptorImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarDeploymentDescriptorImpl.java	14 Oct 2009 21:48:07 -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, EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP);
>+			xMLNSPrefixMap = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, EjbPackage.EJB_JAR_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, EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
>+			xSISchemaLocation = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XSI_SCHEMA_LOCATION);
> 		}
> 		return xSISchemaLocation.map();
> 	}
>@@ -172,11 +172,11 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__MIXED:
>-				return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.EJB_JAR_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 EjbPackage.EJB_JAR_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 EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR:
> 				return basicSetEjbJar(null, msgs);
> 		}
>@@ -195,10 +195,10 @@
> 				if (coreType) return getMixed();
> 				return ((FeatureMap.Internal)getMixed()).getWrapper();
> 			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__XMLNS_PREFIX_MAP:
>-				if (coreType) return ((EMap.InternalMapView)getXMLNSPrefixMap()).eMap();
>+				if (coreType) return ((EMap.InternalMapView<String, String>)getXMLNSPrefixMap()).eMap();
> 				else return getXMLNSPrefixMap();
> 			case EjbPackage.EJB_JAR_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 EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR:
> 				return getEjbJar();
>@@ -218,10 +218,10 @@
> 				((FeatureMap.Internal)getMixed()).set(newValue);
> 				return;
> 			case EjbPackage.EJB_JAR_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 EjbPackage.EJB_JAR_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 EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR__EJB_JAR:
> 				setEjbJar((EJBJar)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodPermissionImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodPermissionImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 MethodPermissionImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodPermissionImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodPermissionImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -62,7 +62,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getRoleNames() Role Names}' attribute list.
>@@ -72,7 +72,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList roleNames = null;
>+	protected EList<String> roleNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getUnchecked() Unchecked}' containment reference.
>@@ -82,7 +82,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EmptyType unchecked = null;
>+	protected EmptyType unchecked;
> 
> 	/**
> 	 * The cached value of the '{@link #getMethods() Methods}' containment reference list.
>@@ -92,7 +92,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList methods = null;
>+	protected EList<MethodType> methods;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -138,9 +138,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.METHOD_PERMISSION__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.METHOD_PERMISSION__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -150,9 +150,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getRoleNames() {
>+	public List<String> getRoleNames() {
> 		if (roleNames == null) {
>-			roleNames = new EDataTypeEList(String.class, this, EjbPackage.METHOD_PERMISSION__ROLE_NAMES);
>+			roleNames = new EDataTypeEList<String>(String.class, this, EjbPackage.METHOD_PERMISSION__ROLE_NAMES);
> 		}
> 		return roleNames;
> 	}
>@@ -205,9 +205,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMethods() {
>+	public List<MethodType> getMethods() {
> 		if (methods == null) {
>-			methods = new EObjectContainmentEList(MethodType.class, this, EjbPackage.METHOD_PERMISSION__METHODS);
>+			methods = new EObjectContainmentEList<MethodType>(MethodType.class, this, EjbPackage.METHOD_PERMISSION__METHODS);
> 		}
> 		return methods;
> 	}
>@@ -242,11 +242,11 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
> 				return basicSetUnchecked(null, msgs);
> 			case EjbPackage.METHOD_PERMISSION__METHODS:
>-				return ((InternalEList)getMethods()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMethods()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -278,23 +278,24 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.METHOD_PERMISSION__ROLE_NAMES:
> 				getRoleNames().clear();
>-				getRoleNames().addAll((Collection)newValue);
>+				getRoleNames().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
> 				setUnchecked((EmptyType)newValue);
> 				return;
> 			case EjbPackage.METHOD_PERMISSION__METHODS:
> 				getMethods().clear();
>-				getMethods().addAll((Collection)newValue);
>+				getMethods().addAll((Collection<? extends MethodType>)newValue);
> 				return;
> 			case EjbPackage.METHOD_PERMISSION__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorTypeImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorTypeImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 InterceptorTypeImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorTypeImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorTypeImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -27,6 +27,7 @@
> 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.EjbLocalRef;
> import org.eclipse.jst.javaee.core.EjbRef;
>@@ -40,6 +41,7 @@
> import org.eclipse.jst.javaee.core.ServiceRef;
> 
> import org.eclipse.jst.javaee.ejb.AroundInvokeType;
>+import org.eclipse.jst.javaee.ejb.AroundTimeoutType;
> import org.eclipse.jst.javaee.ejb.InterceptorType;
> 
> import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>@@ -54,6 +56,7 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getDescriptions Descriptions}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getInterceptorClass Interceptor Class}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getAroundInvokes Around Invokes}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getAroundTimeouts Around Timeouts}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEnvEntries Env Entries}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEjbRefs Ejb Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEjbLocalRefs Ejb Local Refs}</li>
>@@ -65,6 +68,7 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getPersistenceUnitRefs Persistence Unit Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getPostConstructs Post Constructs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getPreDestroys Pre Destroys}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getDataSource Data Source}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getPostActivates Post Activates}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getPrePassivates Pre Passivates}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getId Id}</li>
>@@ -82,7 +86,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getInterceptorClass() Interceptor Class}' attribute.
>@@ -112,7 +116,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList aroundInvokes = null;
>+	protected EList<AroundInvokeType> aroundInvokes;
>+
>+	/**
>+	 * The cached value of the '{@link #getAroundTimeouts() Around Timeouts}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getAroundTimeouts()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<AroundTimeoutType> aroundTimeouts;
> 
> 	/**
> 	 * The cached value of the '{@link #getEnvEntries() Env Entries}' containment reference list.
>@@ -122,7 +136,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList envEntries = null;
>+	protected EList<EnvEntry> envEntries;
> 
> 	/**
> 	 * The cached value of the '{@link #getEjbRefs() Ejb Refs}' containment reference list.
>@@ -132,7 +146,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList ejbRefs = null;
>+	protected EList<EjbRef> ejbRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getEjbLocalRefs() Ejb Local Refs}' containment reference list.
>@@ -142,7 +156,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList ejbLocalRefs = null;
>+	protected EList<EjbLocalRef> ejbLocalRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getServiceRefs() Service Refs}' containment reference list.
>@@ -152,7 +166,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList serviceRefs = null;
>+	protected EList<ServiceRef> serviceRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getResourceRefs() Resource Refs}' containment reference list.
>@@ -162,7 +176,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList resourceRefs = null;
>+	protected EList<ResourceRef> resourceRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getResourceEnvRefs() Resource Env Refs}' containment reference list.
>@@ -172,7 +186,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList resourceEnvRefs = null;
>+	protected EList<ResourceEnvRef> resourceEnvRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getMessageDestinationRefs() Message Destination Refs}' containment reference list.
>@@ -182,7 +196,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList messageDestinationRefs = null;
>+	protected EList<MessageDestinationRef> messageDestinationRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPersistenceContextRefs() Persistence Context Refs}' containment reference list.
>@@ -192,7 +206,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList persistenceContextRefs = null;
>+	protected EList<PersistenceContextRef> persistenceContextRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPersistenceUnitRefs() Persistence Unit Refs}' containment reference list.
>@@ -202,7 +216,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList persistenceUnitRefs = null;
>+	protected EList<PersistenceUnitRef> persistenceUnitRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPostConstructs() Post Constructs}' containment reference list.
>@@ -212,7 +226,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList postConstructs = null;
>+	protected EList<LifecycleCallback> postConstructs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPreDestroys() Pre Destroys}' containment reference list.
>@@ -222,7 +236,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList preDestroys = null;
>+	protected EList<LifecycleCallback> preDestroys;
>+
>+	/**
>+	 * The cached value of the '{@link #getDataSource() Data Source}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDataSource()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<DataSourceType> dataSource;
> 
> 	/**
> 	 * The cached value of the '{@link #getPostActivates() Post Activates}' containment reference list.
>@@ -232,7 +256,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList postActivates = null;
>+	protected EList<LifecycleCallback> postActivates;
> 
> 	/**
> 	 * The cached value of the '{@link #getPrePassivates() Pre Passivates}' containment reference list.
>@@ -242,7 +266,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList prePassivates = null;
>+	protected EList<LifecycleCallback> prePassivates;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -288,9 +312,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.INTERCEPTOR_TYPE__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.INTERCEPTOR_TYPE__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -321,9 +345,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getAroundInvokes() {
>+	public List<AroundInvokeType> getAroundInvokes() {
> 		if (aroundInvokes == null) {
>-			aroundInvokes = new EObjectContainmentEList(AroundInvokeType.class, this, EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES);
>+			aroundInvokes = new EObjectContainmentEList<AroundInvokeType>(AroundInvokeType.class, this, EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES);
> 		}
> 		return aroundInvokes;
> 	}
>@@ -333,9 +357,21 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEnvEntries() {
>+	public List<AroundTimeoutType> getAroundTimeouts() {
>+		if (aroundTimeouts == null) {
>+			aroundTimeouts = new EObjectContainmentEList<AroundTimeoutType>(AroundTimeoutType.class, this, EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS);
>+		}
>+		return aroundTimeouts;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<EnvEntry> getEnvEntries() {
> 		if (envEntries == null) {
>-			envEntries = new EObjectContainmentEList(EnvEntry.class, this, EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES);
>+			envEntries = new EObjectContainmentEList<EnvEntry>(EnvEntry.class, this, EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES);
> 		}
> 		return envEntries;
> 	}
>@@ -345,9 +381,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbRefs() {
>+	public List<EjbRef> getEjbRefs() {
> 		if (ejbRefs == null) {
>-			ejbRefs = new EObjectContainmentEList(EjbRef.class, this, EjbPackage.INTERCEPTOR_TYPE__EJB_REFS);
>+			ejbRefs = new EObjectContainmentEList<EjbRef>(EjbRef.class, this, EjbPackage.INTERCEPTOR_TYPE__EJB_REFS);
> 		}
> 		return ejbRefs;
> 	}
>@@ -357,9 +393,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbLocalRefs() {
>+	public List<EjbLocalRef> getEjbLocalRefs() {
> 		if (ejbLocalRefs == null) {
>-			ejbLocalRefs = new EObjectContainmentEList(EjbLocalRef.class, this, EjbPackage.INTERCEPTOR_TYPE__EJB_LOCAL_REFS);
>+			ejbLocalRefs = new EObjectContainmentEList<EjbLocalRef>(EjbLocalRef.class, this, EjbPackage.INTERCEPTOR_TYPE__EJB_LOCAL_REFS);
> 		}
> 		return ejbLocalRefs;
> 	}
>@@ -369,9 +405,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getServiceRefs() {
>+	public List<ServiceRef> getServiceRefs() {
> 		if (serviceRefs == null) {
>-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, EjbPackage.INTERCEPTOR_TYPE__SERVICE_REFS);
>+			serviceRefs = new EObjectContainmentEList<ServiceRef>(ServiceRef.class, this, EjbPackage.INTERCEPTOR_TYPE__SERVICE_REFS);
> 		}
> 		return serviceRefs;
> 	}
>@@ -381,9 +417,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getResourceRefs() {
>+	public List<ResourceRef> getResourceRefs() {
> 		if (resourceRefs == null) {
>-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, EjbPackage.INTERCEPTOR_TYPE__RESOURCE_REFS);
>+			resourceRefs = new EObjectContainmentEList<ResourceRef>(ResourceRef.class, this, EjbPackage.INTERCEPTOR_TYPE__RESOURCE_REFS);
> 		}
> 		return resourceRefs;
> 	}
>@@ -393,9 +429,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getResourceEnvRefs() {
>+	public List<ResourceEnvRef> getResourceEnvRefs() {
> 		if (resourceEnvRefs == null) {
>-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, EjbPackage.INTERCEPTOR_TYPE__RESOURCE_ENV_REFS);
>+			resourceEnvRefs = new EObjectContainmentEList<ResourceEnvRef>(ResourceEnvRef.class, this, EjbPackage.INTERCEPTOR_TYPE__RESOURCE_ENV_REFS);
> 		}
> 		return resourceEnvRefs;
> 	}
>@@ -405,9 +441,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMessageDestinationRefs() {
>+	public List<MessageDestinationRef> getMessageDestinationRefs() {
> 		if (messageDestinationRefs == null) {
>-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, EjbPackage.INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS);
>+			messageDestinationRefs = new EObjectContainmentEList<MessageDestinationRef>(MessageDestinationRef.class, this, EjbPackage.INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS);
> 		}
> 		return messageDestinationRefs;
> 	}
>@@ -417,9 +453,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPersistenceContextRefs() {
>+	public List<PersistenceContextRef> getPersistenceContextRefs() {
> 		if (persistenceContextRefs == null) {
>-			persistenceContextRefs = new EObjectContainmentEList(PersistenceContextRef.class, this, EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS);
>+			persistenceContextRefs = new EObjectContainmentEList<PersistenceContextRef>(PersistenceContextRef.class, this, EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS);
> 		}
> 		return persistenceContextRefs;
> 	}
>@@ -429,9 +465,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPersistenceUnitRefs() {
>+	public List<PersistenceUnitRef> getPersistenceUnitRefs() {
> 		if (persistenceUnitRefs == null) {
>-			persistenceUnitRefs = new EObjectContainmentEList(PersistenceUnitRef.class, this, EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS);
>+			persistenceUnitRefs = new EObjectContainmentEList<PersistenceUnitRef>(PersistenceUnitRef.class, this, EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS);
> 		}
> 		return persistenceUnitRefs;
> 	}
>@@ -441,9 +477,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPostConstructs() {
>+	public List<LifecycleCallback> getPostConstructs() {
> 		if (postConstructs == null) {
>-			postConstructs = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__POST_CONSTRUCTS);
>+			postConstructs = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__POST_CONSTRUCTS);
> 		}
> 		return postConstructs;
> 	}
>@@ -453,9 +489,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPreDestroys() {
>+	public List<LifecycleCallback> getPreDestroys() {
> 		if (preDestroys == null) {
>-			preDestroys = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS);
>+			preDestroys = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS);
> 		}
> 		return preDestroys;
> 	}
>@@ -465,9 +501,21 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPostActivates() {
>+	public List<DataSourceType> getDataSource() {
>+		if (dataSource == null) {
>+			dataSource = new EObjectContainmentEList<DataSourceType>(DataSourceType.class, this, EjbPackage.INTERCEPTOR_TYPE__DATA_SOURCE);
>+		}
>+		return dataSource;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<LifecycleCallback> getPostActivates() {
> 		if (postActivates == null) {
>-			postActivates = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES);
>+			postActivates = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES);
> 		}
> 		return postActivates;
> 	}
>@@ -477,9 +525,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPrePassivates() {
>+	public List<LifecycleCallback> getPrePassivates() {
> 		if (prePassivates == null) {
>-			prePassivates = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__PRE_PASSIVATES);
>+			prePassivates = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__PRE_PASSIVATES);
> 		}
> 		return prePassivates;
> 	}
>@@ -514,35 +562,39 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.INTERCEPTOR_TYPE__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES:
>-				return ((InternalEList)getAroundInvokes()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getAroundInvokes()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
>+				return ((InternalEList<?>)getAroundTimeouts()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
>-				return ((InternalEList)getEnvEntries()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEnvEntries()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
>-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__EJB_LOCAL_REFS:
>-				return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__SERVICE_REFS:
>-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getServiceRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_REFS:
>-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getResourceRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_ENV_REFS:
>-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS:
>-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS:
>-				return ((InternalEList)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS:
>-				return ((InternalEList)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__POST_CONSTRUCTS:
>-				return ((InternalEList)getPostConstructs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPostConstructs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS:
>-				return ((InternalEList)getPreDestroys()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPreDestroys()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.INTERCEPTOR_TYPE__DATA_SOURCE:
>+				return ((InternalEList<?>)getDataSource()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES:
>-				return ((InternalEList)getPostActivates()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPostActivates()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_TYPE__PRE_PASSIVATES:
>-				return ((InternalEList)getPrePassivates()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPrePassivates()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -561,6 +613,8 @@
> 				return getInterceptorClass();
> 			case EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES:
> 				return getAroundInvokes();
>+			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
>+				return getAroundTimeouts();
> 			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
> 				return getEnvEntries();
> 			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
>@@ -583,6 +637,8 @@
> 				return getPostConstructs();
> 			case EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS:
> 				return getPreDestroys();
>+			case EjbPackage.INTERCEPTOR_TYPE__DATA_SOURCE:
>+				return getDataSource();
> 			case EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES:
> 				return getPostActivates();
> 			case EjbPackage.INTERCEPTOR_TYPE__PRE_PASSIVATES:
>@@ -598,71 +654,80 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.INTERCEPTOR_TYPE__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__INTERCEPTOR_CLASS:
> 				setInterceptorClass((String)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES:
> 				getAroundInvokes().clear();
>-				getAroundInvokes().addAll((Collection)newValue);
>+				getAroundInvokes().addAll((Collection<? extends AroundInvokeType>)newValue);
>+				return;
>+			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
>+				getAroundTimeouts().clear();
>+				getAroundTimeouts().addAll((Collection<? extends AroundTimeoutType>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
> 				getEnvEntries().clear();
>-				getEnvEntries().addAll((Collection)newValue);
>+				getEnvEntries().addAll((Collection<? extends EnvEntry>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
> 				getEjbRefs().clear();
>-				getEjbRefs().addAll((Collection)newValue);
>+				getEjbRefs().addAll((Collection<? extends EjbRef>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__EJB_LOCAL_REFS:
> 				getEjbLocalRefs().clear();
>-				getEjbLocalRefs().addAll((Collection)newValue);
>+				getEjbLocalRefs().addAll((Collection<? extends EjbLocalRef>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__SERVICE_REFS:
> 				getServiceRefs().clear();
>-				getServiceRefs().addAll((Collection)newValue);
>+				getServiceRefs().addAll((Collection<? extends ServiceRef>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_REFS:
> 				getResourceRefs().clear();
>-				getResourceRefs().addAll((Collection)newValue);
>+				getResourceRefs().addAll((Collection<? extends ResourceRef>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__RESOURCE_ENV_REFS:
> 				getResourceEnvRefs().clear();
>-				getResourceEnvRefs().addAll((Collection)newValue);
>+				getResourceEnvRefs().addAll((Collection<? extends ResourceEnvRef>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS:
> 				getMessageDestinationRefs().clear();
>-				getMessageDestinationRefs().addAll((Collection)newValue);
>+				getMessageDestinationRefs().addAll((Collection<? extends MessageDestinationRef>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS:
> 				getPersistenceContextRefs().clear();
>-				getPersistenceContextRefs().addAll((Collection)newValue);
>+				getPersistenceContextRefs().addAll((Collection<? extends PersistenceContextRef>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS:
> 				getPersistenceUnitRefs().clear();
>-				getPersistenceUnitRefs().addAll((Collection)newValue);
>+				getPersistenceUnitRefs().addAll((Collection<? extends PersistenceUnitRef>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__POST_CONSTRUCTS:
> 				getPostConstructs().clear();
>-				getPostConstructs().addAll((Collection)newValue);
>+				getPostConstructs().addAll((Collection<? extends LifecycleCallback>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS:
> 				getPreDestroys().clear();
>-				getPreDestroys().addAll((Collection)newValue);
>+				getPreDestroys().addAll((Collection<? extends LifecycleCallback>)newValue);
>+				return;
>+			case EjbPackage.INTERCEPTOR_TYPE__DATA_SOURCE:
>+				getDataSource().clear();
>+				getDataSource().addAll((Collection<? extends DataSourceType>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES:
> 				getPostActivates().clear();
>-				getPostActivates().addAll((Collection)newValue);
>+				getPostActivates().addAll((Collection<? extends LifecycleCallback>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__PRE_PASSIVATES:
> 				getPrePassivates().clear();
>-				getPrePassivates().addAll((Collection)newValue);
>+				getPrePassivates().addAll((Collection<? extends LifecycleCallback>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__ID:
> 				setId((String)newValue);
>@@ -688,6 +753,9 @@
> 			case EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES:
> 				getAroundInvokes().clear();
> 				return;
>+			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
>+				getAroundTimeouts().clear();
>+				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
> 				getEnvEntries().clear();
> 				return;
>@@ -721,6 +789,9 @@
> 			case EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS:
> 				getPreDestroys().clear();
> 				return;
>+			case EjbPackage.INTERCEPTOR_TYPE__DATA_SOURCE:
>+				getDataSource().clear();
>+				return;
> 			case EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES:
> 				getPostActivates().clear();
> 				return;
>@@ -748,6 +819,8 @@
> 				return INTERCEPTOR_CLASS_EDEFAULT == null ? interceptorClass != null : !INTERCEPTOR_CLASS_EDEFAULT.equals(interceptorClass);
> 			case EjbPackage.INTERCEPTOR_TYPE__AROUND_INVOKES:
> 				return aroundInvokes != null && !aroundInvokes.isEmpty();
>+			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
>+				return aroundTimeouts != null && !aroundTimeouts.isEmpty();
> 			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
> 				return envEntries != null && !envEntries.isEmpty();
> 			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
>@@ -770,6 +843,8 @@
> 				return postConstructs != null && !postConstructs.isEmpty();
> 			case EjbPackage.INTERCEPTOR_TYPE__PRE_DESTROYS:
> 				return preDestroys != null && !preDestroys.isEmpty();
>+			case EjbPackage.INTERCEPTOR_TYPE__DATA_SOURCE:
>+				return dataSource != null && !dataSource.isEmpty();
> 			case EjbPackage.INTERCEPTOR_TYPE__POST_ACTIVATES:
> 				return postActivates != null && !postActivates.isEmpty();
> 			case EjbPackage.INTERCEPTOR_TYPE__PRE_PASSIVATES:
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ApplicationExceptionImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ApplicationExceptionImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ApplicationExceptionImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ApplicationExceptionImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ApplicationExceptionImpl.java	14 Oct 2009 21:48:07 -0000
>@@ -30,6 +30,7 @@
> * <ul>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ApplicationExceptionImpl#getExceptionClass Exception Class}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ApplicationExceptionImpl#isRollback Rollback}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ApplicationExceptionImpl#isInherited Inherited}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ApplicationExceptionImpl#getId Id}</li>
> * </ul>
> * 
>@@ -84,7 +85,36 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean rollbackESet = false;
>+	protected boolean rollbackESet;
>+
>+	/**
>+	 * The default value of the '{@link #isInherited() Inherited}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isInherited()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean INHERITED_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isInherited() Inherited}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isInherited()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean inherited = INHERITED_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Inherited attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean inheritedESet;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -197,6 +227,52 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public boolean isInherited() {
>+		return inherited;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setInherited(boolean newInherited) {
>+		boolean oldInherited = inherited;
>+		inherited = newInherited;
>+		boolean oldInheritedESet = inheritedESet;
>+		inheritedESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.APPLICATION_EXCEPTION__INHERITED, oldInherited, inherited, !oldInheritedESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetInherited() {
>+		boolean oldInherited = inherited;
>+		boolean oldInheritedESet = inheritedESet;
>+		inherited = INHERITED_EDEFAULT;
>+		inheritedESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.APPLICATION_EXCEPTION__INHERITED, oldInherited, INHERITED_EDEFAULT, oldInheritedESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetInherited() {
>+		return inheritedESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getId() {
> 		return id;
> 	}
>@@ -224,7 +300,9 @@
> 			case EjbPackage.APPLICATION_EXCEPTION__EXCEPTION_CLASS:
> 				return getExceptionClass();
> 			case EjbPackage.APPLICATION_EXCEPTION__ROLLBACK:
>-				return isRollback() ? Boolean.TRUE : Boolean.FALSE;
>+				return isRollback();
>+			case EjbPackage.APPLICATION_EXCEPTION__INHERITED:
>+				return isInherited();
> 			case EjbPackage.APPLICATION_EXCEPTION__ID:
> 				return getId();
> 		}
>@@ -243,7 +321,10 @@
> 				setExceptionClass((String)newValue);
> 				return;
> 			case EjbPackage.APPLICATION_EXCEPTION__ROLLBACK:
>-				setRollback(((Boolean)newValue).booleanValue());
>+				setRollback((Boolean)newValue);
>+				return;
>+			case EjbPackage.APPLICATION_EXCEPTION__INHERITED:
>+				setInherited((Boolean)newValue);
> 				return;
> 			case EjbPackage.APPLICATION_EXCEPTION__ID:
> 				setId((String)newValue);
>@@ -266,6 +347,9 @@
> 			case EjbPackage.APPLICATION_EXCEPTION__ROLLBACK:
> 				unsetRollback();
> 				return;
>+			case EjbPackage.APPLICATION_EXCEPTION__INHERITED:
>+				unsetInherited();
>+				return;
> 			case EjbPackage.APPLICATION_EXCEPTION__ID:
> 				setId(ID_EDEFAULT);
> 				return;
>@@ -285,6 +369,8 @@
> 				return EXCEPTION_CLASS_EDEFAULT == null ? exceptionClass != null : !EXCEPTION_CLASS_EDEFAULT.equals(exceptionClass);
> 			case EjbPackage.APPLICATION_EXCEPTION__ROLLBACK:
> 				return isSetRollback();
>+			case EjbPackage.APPLICATION_EXCEPTION__INHERITED:
>+				return isSetInherited();
> 			case EjbPackage.APPLICATION_EXCEPTION__ID:
> 				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
> 		}
>@@ -305,6 +391,8 @@
> 		result.append(exceptionClass);
> 		result.append(", rollback: "); //$NON-NLS-1$
> 		if (rollbackESet) result.append(rollback); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", inherited: "); //$NON-NLS-1$
>+		if (inheritedESet) result.append(inherited); 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/ejb/internal/impl/RemoveMethodTypeImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RemoveMethodTypeImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 RemoveMethodTypeImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RemoveMethodTypeImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RemoveMethodTypeImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -48,7 +48,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected NamedMethodType beanMethod = null;
>+	protected NamedMethodType beanMethod;
> 
> 	/**
> 	 * The default value of the '{@link #isRetainIfException() Retain If Exception}' attribute.
>@@ -77,7 +77,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean retainIfExceptionESet = false;
>+	protected boolean retainIfExceptionESet;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -253,7 +253,7 @@
> 			case EjbPackage.REMOVE_METHOD_TYPE__BEAN_METHOD:
> 				return getBeanMethod();
> 			case EjbPackage.REMOVE_METHOD_TYPE__RETAIN_IF_EXCEPTION:
>-				return isRetainIfException() ? Boolean.TRUE : Boolean.FALSE;
>+				return isRetainIfException();
> 			case EjbPackage.REMOVE_METHOD_TYPE__ID:
> 				return getId();
> 		}
>@@ -272,7 +272,7 @@
> 				setBeanMethod((NamedMethodType)newValue);
> 				return;
> 			case EjbPackage.REMOVE_METHOD_TYPE__RETAIN_IF_EXCEPTION:
>-				setRetainIfException(((Boolean)newValue).booleanValue());
>+				setRetainIfException((Boolean)newValue);
> 				return;
> 			case EjbPackage.REMOVE_METHOD_TYPE__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 EJBJarImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarImpl.java	14 Oct 2009 21:48:07 -0000
>@@ -42,6 +42,7 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getDescriptions Descriptions}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getDisplayNames Display Names}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getIcons Icons}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getModuleName Module Name}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getEnterpriseBeans Enterprise Beans}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getInterceptors Interceptors}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getRelationships Relationships}</li>
>@@ -64,7 +65,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>@@ -74,7 +75,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -84,7 +85,27 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
>+
>+	/**
>+	 * 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 #getEnterpriseBeans() Enterprise Beans}' containment reference.
>@@ -94,7 +115,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EnterpriseBeans enterpriseBeans = null;
>+	protected EnterpriseBeans enterpriseBeans;
> 
> 	/**
> 	 * The cached value of the '{@link #getInterceptors() Interceptors}' containment reference.
>@@ -104,7 +125,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected InterceptorsType interceptors = null;
>+	protected InterceptorsType interceptors;
> 
> 	/**
> 	 * The cached value of the '{@link #getRelationships() Relationships}' containment reference.
>@@ -114,7 +135,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Relationships relationships = null;
>+	protected Relationships relationships;
> 
> 	/**
> 	 * The cached value of the '{@link #getAssemblyDescriptor() Assembly Descriptor}' containment reference.
>@@ -124,7 +145,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected AssemblyDescriptor assemblyDescriptor = null;
>+	protected AssemblyDescriptor assemblyDescriptor;
> 
> 	/**
> 	 * The default value of the '{@link #getEjbClientJar() Ejb Client Jar}' attribute.
>@@ -193,7 +214,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean metadataCompleteESet = false;
>+	protected boolean metadataCompleteESet;
> 
> 	/**
> 	 * The default value of the '{@link #getVersion() Version}' attribute.
>@@ -203,7 +224,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected static final String VERSION_EDEFAULT = "3.0"; //$NON-NLS-1$
>+	protected static final String VERSION_EDEFAULT = "3.1"; //$NON-NLS-1$
> 
> 	/**
> 	 * The cached value of the '{@link #getVersion() Version}' attribute.
>@@ -222,7 +243,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean versionESet = false;
>+	protected boolean versionESet;
> 
> 	/**
> 	 * 
>@@ -248,9 +269,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EJB_JAR__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.EJB_JAR__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -260,9 +281,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, EjbPackage.EJB_JAR__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, EjbPackage.EJB_JAR__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -272,9 +293,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, EjbPackage.EJB_JAR__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, EjbPackage.EJB_JAR__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -284,6 +305,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public String getModuleName() {
>+		return moduleName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setModuleName(String newModuleName) {
>+		String oldModuleName = moduleName;
>+		moduleName = newModuleName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__MODULE_NAME, oldModuleName, moduleName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EnterpriseBeans getEnterpriseBeans() {
> 		return enterpriseBeans;
> 	}
>@@ -594,11 +636,11 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.EJB_JAR__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.EJB_JAR__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
> 				return basicSetEnterpriseBeans(null, msgs);
> 			case EjbPackage.EJB_JAR__INTERCEPTORS:
>@@ -625,6 +667,8 @@
> 				return getDisplayNames();
> 			case EjbPackage.EJB_JAR__ICONS:
> 				return getIcons();
>+			case EjbPackage.EJB_JAR__MODULE_NAME:
>+				return getModuleName();
> 			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
> 				return getEnterpriseBeans();
> 			case EjbPackage.EJB_JAR__INTERCEPTORS:
>@@ -638,7 +682,7 @@
> 			case EjbPackage.EJB_JAR__ID:
> 				return getId();
> 			case EjbPackage.EJB_JAR__METADATA_COMPLETE:
>-				return isMetadataComplete() ? Boolean.TRUE : Boolean.FALSE;
>+				return isMetadataComplete();
> 			case EjbPackage.EJB_JAR__VERSION:
> 				return getVersion();
> 		}
>@@ -650,20 +694,24 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.EJB_JAR__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case EjbPackage.EJB_JAR__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
>+				return;
>+			case EjbPackage.EJB_JAR__MODULE_NAME:
>+				setModuleName((String)newValue);
> 				return;
> 			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
> 				setEnterpriseBeans((EnterpriseBeans)newValue);
>@@ -684,7 +732,7 @@
> 				setId((String)newValue);
> 				return;
> 			case EjbPackage.EJB_JAR__METADATA_COMPLETE:
>-				setMetadataComplete(((Boolean)newValue).booleanValue());
>+				setMetadataComplete((Boolean)newValue);
> 				return;
> 			case EjbPackage.EJB_JAR__VERSION:
> 				setVersion((String)newValue);
>@@ -710,6 +758,9 @@
> 			case EjbPackage.EJB_JAR__ICONS:
> 				getIcons().clear();
> 				return;
>+			case EjbPackage.EJB_JAR__MODULE_NAME:
>+				setModuleName(MODULE_NAME_EDEFAULT);
>+				return;
> 			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
> 				setEnterpriseBeans((EnterpriseBeans)null);
> 				return;
>@@ -752,6 +803,8 @@
> 				return displayNames != null && !displayNames.isEmpty();
> 			case EjbPackage.EJB_JAR__ICONS:
> 				return icons != null && !icons.isEmpty();
>+			case EjbPackage.EJB_JAR__MODULE_NAME:
>+				return MODULE_NAME_EDEFAULT == null ? moduleName != null : !MODULE_NAME_EDEFAULT.equals(moduleName);
> 			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
> 				return enterpriseBeans != null;
> 			case EjbPackage.EJB_JAR__INTERCEPTORS:
>@@ -782,7 +835,9 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (ejbClientJar: "); //$NON-NLS-1$
>+		result.append(" (moduleName: "); //$NON-NLS-1$
>+		result.append(moduleName);
>+		result.append(", ejbClientJar: "); //$NON-NLS-1$
> 		result.append(ejbClientJar);
> 		result.append(", id: "); //$NON-NLS-1$
> 		result.append(id);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbFactoryImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 EjbFactoryImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbFactoryImpl.java	9 Jun 2009 22:38:41 -0000	1.4
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbFactoryImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -73,14 +73,19 @@
> 	@Override
> 	public EObject create(EClass eClass) {
> 		switch (eClass.getClassifierID()) {
>+			case EjbPackage.ACCESS_TIMEOUT_TYPE: return (EObject)createAccessTimeoutType();
> 			case EjbPackage.ACTIVATION_CONFIG: return (EObject)createActivationConfig();
> 			case EjbPackage.ACTIVATION_CONFIG_PROPERTY: return (EObject)createActivationConfigProperty();
> 			case EjbPackage.APPLICATION_EXCEPTION: return (EObject)createApplicationException();
> 			case EjbPackage.AROUND_INVOKE_TYPE: return (EObject)createAroundInvokeType();
>+			case EjbPackage.AROUND_TIMEOUT_TYPE: return (EObject)createAroundTimeoutType();
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR: return (EObject)createAssemblyDescriptor();
>+			case EjbPackage.ASYNC_METHOD_TYPE: return (EObject)createAsyncMethodType();
> 			case EjbPackage.CMP_FIELD: return (EObject)createCMPField();
> 			case EjbPackage.CMR_FIELD: return (EObject)createCMRField();
>+			case EjbPackage.CONCURRENT_METHOD_TYPE: return (EObject)createConcurrentMethodType();
> 			case EjbPackage.CONTAINER_TRANSACTION_TYPE: return (EObject)createContainerTransactionType();
>+			case EjbPackage.DEPENDS_ON_TYPE: return (EObject)createDependsOnType();
> 			case EjbPackage.EJB_JAR: return (EObject)createEJBJar();
> 			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR: return (EObject)createEJBJarDeploymentDescriptor();
> 			case EjbPackage.EJB_RELATION: return (EObject)createEJBRelation();
>@@ -105,6 +110,9 @@
> 			case EjbPackage.REMOVE_METHOD_TYPE: return (EObject)createRemoveMethodType();
> 			case EjbPackage.SECURITY_IDENTITY_TYPE: return (EObject)createSecurityIdentityType();
> 			case EjbPackage.SESSION_BEAN: return (EObject)createSessionBean();
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE: return (EObject)createStatefulTimeoutType();
>+			case EjbPackage.TIMER_SCHEDULE_TYPE: return (EObject)createTimerScheduleType();
>+			case EjbPackage.TIMER_TYPE: return (EObject)createTimerType();
> 			default:
> 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
> 		}
>@@ -122,6 +130,10 @@
> 				return createCmpVersionTypeFromString(eDataType, initialValue);
> 			case EjbPackage.CMR_FIELD_TYPE:
> 				return createCMRFieldTypeFromString(eDataType, initialValue);
>+			case EjbPackage.CONCURRENCY_MANAGEMENT_TYPE_TYPE:
>+				return createConcurrencyManagementTypeTypeFromString(eDataType, initialValue);
>+			case EjbPackage.CONCURRENT_LOCK_TYPE_TYPE:
>+				return createConcurrentLockTypeTypeFromString(eDataType, initialValue);
> 			case EjbPackage.METHOD_INTERFACE_TYPE:
> 				return createMethodInterfaceTypeFromString(eDataType, initialValue);
> 			case EjbPackage.MULTIPLICITY_TYPE:
>@@ -132,6 +144,8 @@
> 				return createResultTypeMappingTypeFromString(eDataType, initialValue);
> 			case EjbPackage.SESSION_TYPE:
> 				return createSessionTypeFromString(eDataType, initialValue);
>+			case EjbPackage.TIME_UNIT_TYPE_TYPE:
>+				return createTimeUnitTypeTypeFromString(eDataType, initialValue);
> 			case EjbPackage.TRANSACTION_ATTRIBUTE_TYPE:
> 				return createTransactionAttributeTypeFromString(eDataType, initialValue);
> 			case EjbPackage.TRANSACTION_TYPE:
>@@ -140,6 +154,10 @@
> 				return createCmpVersionTypeObjectFromString(eDataType, initialValue);
> 			case EjbPackage.CMR_FIELD_TYPE_OBJECT:
> 				return createCMRFieldTypeObjectFromString(eDataType, initialValue);
>+			case EjbPackage.CONCURRENCY_MANAGEMENT_TYPE_TYPE_OBJECT:
>+				return createConcurrencyManagementTypeTypeObjectFromString(eDataType, initialValue);
>+			case EjbPackage.CONCURRENT_LOCK_TYPE_TYPE_OBJECT:
>+				return createConcurrentLockTypeTypeObjectFromString(eDataType, initialValue);
> 			case EjbPackage.EJB_CLASS_TYPE:
> 				return createEjbClassTypeFromString(eDataType, initialValue);
> 			case EjbPackage.EJB_NAME_TYPE:
>@@ -156,6 +174,8 @@
> 				return createResultTypeMappingTypeObjectFromString(eDataType, initialValue);
> 			case EjbPackage.SESSION_TYPE_OBJECT:
> 				return createSessionTypeObjectFromString(eDataType, initialValue);
>+			case EjbPackage.TIME_UNIT_TYPE_TYPE_OBJECT:
>+				return createTimeUnitTypeTypeObjectFromString(eDataType, initialValue);
> 			case EjbPackage.TRANSACTION_ATTRIBUTE_TYPE_OBJECT:
> 				return createTransactionAttributeTypeObjectFromString(eDataType, initialValue);
> 			case EjbPackage.TRANSACTION_TYPE_OBJECT:
>@@ -177,6 +197,10 @@
> 				return convertCmpVersionTypeToString(eDataType, instanceValue);
> 			case EjbPackage.CMR_FIELD_TYPE:
> 				return convertCMRFieldTypeToString(eDataType, instanceValue);
>+			case EjbPackage.CONCURRENCY_MANAGEMENT_TYPE_TYPE:
>+				return convertConcurrencyManagementTypeTypeToString(eDataType, instanceValue);
>+			case EjbPackage.CONCURRENT_LOCK_TYPE_TYPE:
>+				return convertConcurrentLockTypeTypeToString(eDataType, instanceValue);
> 			case EjbPackage.METHOD_INTERFACE_TYPE:
> 				return convertMethodInterfaceTypeToString(eDataType, instanceValue);
> 			case EjbPackage.MULTIPLICITY_TYPE:
>@@ -187,6 +211,8 @@
> 				return convertResultTypeMappingTypeToString(eDataType, instanceValue);
> 			case EjbPackage.SESSION_TYPE:
> 				return convertSessionTypeToString(eDataType, instanceValue);
>+			case EjbPackage.TIME_UNIT_TYPE_TYPE:
>+				return convertTimeUnitTypeTypeToString(eDataType, instanceValue);
> 			case EjbPackage.TRANSACTION_ATTRIBUTE_TYPE:
> 				return convertTransactionAttributeTypeToString(eDataType, instanceValue);
> 			case EjbPackage.TRANSACTION_TYPE:
>@@ -195,6 +221,10 @@
> 				return convertCmpVersionTypeObjectToString(eDataType, instanceValue);
> 			case EjbPackage.CMR_FIELD_TYPE_OBJECT:
> 				return convertCMRFieldTypeObjectToString(eDataType, instanceValue);
>+			case EjbPackage.CONCURRENCY_MANAGEMENT_TYPE_TYPE_OBJECT:
>+				return convertConcurrencyManagementTypeTypeObjectToString(eDataType, instanceValue);
>+			case EjbPackage.CONCURRENT_LOCK_TYPE_TYPE_OBJECT:
>+				return convertConcurrentLockTypeTypeObjectToString(eDataType, instanceValue);
> 			case EjbPackage.EJB_CLASS_TYPE:
> 				return convertEjbClassTypeToString(eDataType, instanceValue);
> 			case EjbPackage.EJB_NAME_TYPE:
>@@ -211,6 +241,8 @@
> 				return convertResultTypeMappingTypeObjectToString(eDataType, instanceValue);
> 			case EjbPackage.SESSION_TYPE_OBJECT:
> 				return convertSessionTypeObjectToString(eDataType, instanceValue);
>+			case EjbPackage.TIME_UNIT_TYPE_TYPE_OBJECT:
>+				return convertTimeUnitTypeTypeObjectToString(eDataType, instanceValue);
> 			case EjbPackage.TRANSACTION_ATTRIBUTE_TYPE_OBJECT:
> 				return convertTransactionAttributeTypeObjectToString(eDataType, instanceValue);
> 			case EjbPackage.TRANSACTION_TYPE_OBJECT:
>@@ -225,6 +257,16 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public AccessTimeoutType createAccessTimeoutType() {
>+		AccessTimeoutTypeImpl accessTimeoutType = new AccessTimeoutTypeImpl();
>+		return accessTimeoutType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public ActivationConfig createActivationConfig() {
> 		ActivationConfigImpl activationConfig = new ActivationConfigImpl();
> 		return activationConfig;
>@@ -265,6 +307,16 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public AroundTimeoutType createAroundTimeoutType() {
>+		AroundTimeoutTypeImpl aroundTimeoutType = new AroundTimeoutTypeImpl();
>+		return aroundTimeoutType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public AssemblyDescriptor createAssemblyDescriptor() {
> 		AssemblyDescriptorImpl assemblyDescriptor = new AssemblyDescriptorImpl();
> 		return assemblyDescriptor;
>@@ -275,6 +327,16 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public AsyncMethodType createAsyncMethodType() {
>+		AsyncMethodTypeImpl asyncMethodType = new AsyncMethodTypeImpl();
>+		return asyncMethodType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public CMPField createCMPField() {
> 		CMPFieldImpl cmpField = new CMPFieldImpl();
> 		return cmpField;
>@@ -295,6 +357,16 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public ConcurrentMethodType createConcurrentMethodType() {
>+		ConcurrentMethodTypeImpl concurrentMethodType = new ConcurrentMethodTypeImpl();
>+		return concurrentMethodType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public ContainerTransactionType createContainerTransactionType() {
> 		ContainerTransactionTypeImpl containerTransactionType = new ContainerTransactionTypeImpl();
> 		return containerTransactionType;
>@@ -305,6 +377,16 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public DependsOnType createDependsOnType() {
>+		DependsOnTypeImpl dependsOnType = new DependsOnTypeImpl();
>+		return dependsOnType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EJBJar createEJBJar() {
> 		EJBJarImpl ejbJar = new EJBJarImpl();
> 		return ejbJar;
>@@ -545,6 +627,36 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public StatefulTimeoutType createStatefulTimeoutType() {
>+		StatefulTimeoutTypeImpl statefulTimeoutType = new StatefulTimeoutTypeImpl();
>+		return statefulTimeoutType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public TimerScheduleType createTimerScheduleType() {
>+		TimerScheduleTypeImpl timerScheduleType = new TimerScheduleTypeImpl();
>+		return timerScheduleType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public TimerType createTimerType() {
>+		TimerTypeImpl timerType = new TimerTypeImpl();
>+		return timerType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public CmpVersionType createCmpVersionTypeFromString(EDataType eDataType, String initialValue) {
> 		CmpVersionType result = CmpVersionType.get(initialValue);
> 		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>@@ -585,6 +697,46 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public ConcurrencyManagementTypeType createConcurrencyManagementTypeTypeFromString(EDataType eDataType, String initialValue) {
>+		ConcurrencyManagementTypeType result = ConcurrencyManagementTypeType.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 convertConcurrencyManagementTypeTypeToString(EDataType eDataType, Object instanceValue) {
>+		return instanceValue == null ? null : instanceValue.toString();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ConcurrentLockTypeType createConcurrentLockTypeTypeFromString(EDataType eDataType, String initialValue) {
>+		ConcurrentLockTypeType result = ConcurrentLockTypeType.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 convertConcurrentLockTypeTypeToString(EDataType eDataType, Object instanceValue) {
>+		return instanceValue == null ? null : instanceValue.toString();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public MethodInterfaceType createMethodInterfaceTypeFromString(EDataType eDataType, String initialValue) {
> 		MethodInterfaceType result = MethodInterfaceType.get(initialValue);
> 		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>@@ -685,6 +837,26 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public TimeUnitTypeType createTimeUnitTypeTypeFromString(EDataType eDataType, String initialValue) {
>+		TimeUnitTypeType result = TimeUnitTypeType.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 convertTimeUnitTypeTypeToString(EDataType eDataType, Object instanceValue) {
>+		return instanceValue == null ? null : instanceValue.toString();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public TransactionAttributeType createTransactionAttributeTypeFromString(EDataType eDataType, String initialValue) {
> 		TransactionAttributeType result = TransactionAttributeType.get(initialValue);
> 		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>@@ -761,6 +933,42 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public ConcurrencyManagementTypeType createConcurrencyManagementTypeTypeObjectFromString(EDataType eDataType, String initialValue) {
>+		return createConcurrencyManagementTypeTypeFromString(EjbPackage.Literals.CONCURRENCY_MANAGEMENT_TYPE_TYPE, initialValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertConcurrencyManagementTypeTypeObjectToString(EDataType eDataType, Object instanceValue) {
>+		return convertConcurrencyManagementTypeTypeToString(EjbPackage.Literals.CONCURRENCY_MANAGEMENT_TYPE_TYPE, instanceValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ConcurrentLockTypeType createConcurrentLockTypeTypeObjectFromString(EDataType eDataType, String initialValue) {
>+		return createConcurrentLockTypeTypeFromString(EjbPackage.Literals.CONCURRENT_LOCK_TYPE_TYPE, initialValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertConcurrentLockTypeTypeObjectToString(EDataType eDataType, Object instanceValue) {
>+		return convertConcurrentLockTypeTypeToString(EjbPackage.Literals.CONCURRENT_LOCK_TYPE_TYPE, instanceValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String createEjbClassTypeFromString(EDataType eDataType, String initialValue) {
> 		return (String)JavaeeFactory.eINSTANCE.createFromString(JavaeePackage.Literals.FULLY_QUALIFIED_CLASS_TYPE, initialValue);
> 	}
>@@ -905,6 +1113,24 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public TimeUnitTypeType createTimeUnitTypeTypeObjectFromString(EDataType eDataType, String initialValue) {
>+		return createTimeUnitTypeTypeFromString(EjbPackage.Literals.TIME_UNIT_TYPE_TYPE, initialValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String convertTimeUnitTypeTypeObjectToString(EDataType eDataType, Object instanceValue) {
>+		return convertTimeUnitTypeTypeToString(EjbPackage.Literals.TIME_UNIT_TYPE_TYPE, instanceValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public TransactionAttributeType createTransactionAttributeTypeObjectFromString(EDataType eDataType, String initialValue) {
> 		return createTransactionAttributeTypeFromString(EjbPackage.Literals.TRANSACTION_ATTRIBUTE_TYPE, initialValue);
> 	}
>@@ -951,6 +1177,7 @@
> 	 * @deprecated
> 	 * @generated
> 	 */
>+	@Deprecated
> 	public static EjbPackage getPackage() {
> 		return EjbPackage.eINSTANCE;
> 	}
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipsImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipsImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 RelationshipsImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipsImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/RelationshipsImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -58,7 +58,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getEjbRelations() Ejb Relations}' containment reference list.
>@@ -68,7 +68,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList ejbRelations = null;
>+	protected EList<EJBRelation> ejbRelations;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -114,9 +114,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.RELATIONSHIPS__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.RELATIONSHIPS__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -126,9 +126,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbRelations() {
>+	public List<EJBRelation> getEjbRelations() {
> 		if (ejbRelations == null) {
>-			ejbRelations = new EObjectContainmentEList(EJBRelation.class, this, EjbPackage.RELATIONSHIPS__EJB_RELATIONS);
>+			ejbRelations = new EObjectContainmentEList<EJBRelation>(EJBRelation.class, this, EjbPackage.RELATIONSHIPS__EJB_RELATIONS);
> 		}
> 		return ejbRelations;
> 	}
>@@ -163,9 +163,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
>-				return ((InternalEList)getEjbRelations()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbRelations()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -193,16 +193,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
> 				getEjbRelations().clear();
>-				getEjbRelations().addAll((Collection)newValue);
>+				getEjbRelations().addAll((Collection<? extends EJBRelation>)newValue);
> 				return;
> 			case EjbPackage.RELATIONSHIPS__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodTypeImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodTypeImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 MethodTypeImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodTypeImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodTypeImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -62,7 +62,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getEjbName() Ejb Name}' attribute.
>@@ -111,7 +111,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean methodIntfESet = false;
>+	protected boolean methodIntfESet;
> 
> 	/**
> 	 * The default value of the '{@link #getMethodName() Method Name}' attribute.
>@@ -141,7 +141,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected MethodParams methodParams = null;
>+	protected MethodParams methodParams;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -187,9 +187,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.METHOD_TYPE__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.METHOD_TYPE__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -355,7 +355,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.METHOD_TYPE__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.METHOD_TYPE__METHOD_PARAMS:
> 				return basicSetMethodParams(null, msgs);
> 		}
>@@ -391,12 +391,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.METHOD_TYPE__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.METHOD_TYPE__EJB_NAME:
> 				setEjbName((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MessageDrivenBeanImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MessageDrivenBeanImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 MessageDrivenBeanImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MessageDrivenBeanImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MessageDrivenBeanImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -27,6 +27,7 @@
> 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.DisplayName;
> import org.eclipse.jst.javaee.core.EjbLocalRef;
>@@ -39,13 +40,16 @@
> import org.eclipse.jst.javaee.core.PersistenceUnitRef;
> import org.eclipse.jst.javaee.core.ResourceEnvRef;
> import org.eclipse.jst.javaee.core.ResourceRef;
>+import org.eclipse.jst.javaee.core.SecurityRoleRef;
> import org.eclipse.jst.javaee.core.ServiceRef;
> 
> import org.eclipse.jst.javaee.ejb.ActivationConfig;
> import org.eclipse.jst.javaee.ejb.AroundInvokeType;
>+import org.eclipse.jst.javaee.ejb.AroundTimeoutType;
> import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
> import org.eclipse.jst.javaee.ejb.NamedMethodType;
> import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
>+import org.eclipse.jst.javaee.ejb.TimerType;
> import org.eclipse.jst.javaee.ejb.TransactionType;
> 
> import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>@@ -65,11 +69,13 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getEjbClass Ejb Class}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getMessagingType Messaging Type}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getTimeoutMethod Timeout Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getTimer Timer}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getTransactionType Transaction Type}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getMessageDestinationType Message Destination Type}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getMessageDestinationLink Message Destination Link}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getActivationConfig Activation Config}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getAroundInvokes Around Invokes}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getAroundTimeouts Around Timeouts}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getEnvEntries Env Entries}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getEjbRefs Ejb Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getEjbLocalRefs Ejb Local Refs}</li>
>@@ -81,6 +87,8 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getPersistenceUnitRefs Persistence Unit Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getPostConstructs Post Constructs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getPreDestroys Pre Destroys}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getDataSource Data Source}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getSecurityRoleRef Security Role Ref}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getSecurityIdentity Security Identity}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl#getId Id}</li>
> * </ul>
>@@ -97,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.
>@@ -107,7 +115,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -117,7 +125,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
> 
> 	/**
> 	 * The default value of the '{@link #getEjbName() Ejb Name}' attribute.
>@@ -207,7 +215,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected NamedMethodType timeoutMethod = null;
>+	protected NamedMethodType timeoutMethod;
>+
>+	/**
>+	 * The cached value of the '{@link #getTimer() Timer}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getTimer()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<TimerType> timer;
> 
> 	/**
> 	 * The default value of the '{@link #getTransactionType() Transaction Type}' attribute.
>@@ -236,7 +254,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean transactionTypeESet = false;
>+	protected boolean transactionTypeESet;
> 
> 	/**
> 	 * The default value of the '{@link #getMessageDestinationType() Message Destination Type}' attribute.
>@@ -286,7 +304,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected ActivationConfig activationConfig = null;
>+	protected ActivationConfig activationConfig;
> 
> 	/**
> 	 * The cached value of the '{@link #getAroundInvokes() Around Invokes}' containment reference list.
>@@ -296,7 +314,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList aroundInvokes = null;
>+	protected EList<AroundInvokeType> aroundInvokes;
>+
>+	/**
>+	 * The cached value of the '{@link #getAroundTimeouts() Around Timeouts}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getAroundTimeouts()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<AroundTimeoutType> aroundTimeouts;
> 
> 	/**
> 	 * The cached value of the '{@link #getEnvEntries() Env Entries}' containment reference list.
>@@ -306,7 +334,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList envEntries = null;
>+	protected EList<EnvEntry> envEntries;
> 
> 	/**
> 	 * The cached value of the '{@link #getEjbRefs() Ejb Refs}' containment reference list.
>@@ -316,7 +344,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList ejbRefs = null;
>+	protected EList<EjbRef> ejbRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getEjbLocalRefs() Ejb Local Refs}' containment reference list.
>@@ -326,7 +354,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList ejbLocalRefs = null;
>+	protected EList<EjbLocalRef> ejbLocalRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getServiceRefs() Service Refs}' containment reference list.
>@@ -336,7 +364,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList serviceRefs = null;
>+	protected EList<ServiceRef> serviceRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getResourceRefs() Resource Refs}' containment reference list.
>@@ -346,7 +374,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList resourceRefs = null;
>+	protected EList<ResourceRef> resourceRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getResourceEnvRefs() Resource Env Refs}' containment reference list.
>@@ -356,7 +384,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList resourceEnvRefs = null;
>+	protected EList<ResourceEnvRef> resourceEnvRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getMessageDestinationRefs() Message Destination Refs}' containment reference list.
>@@ -366,7 +394,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList messageDestinationRefs = null;
>+	protected EList<MessageDestinationRef> messageDestinationRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPersistenceContextRefs() Persistence Context Refs}' containment reference list.
>@@ -376,7 +404,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList persistenceContextRefs = null;
>+	protected EList<PersistenceContextRef> persistenceContextRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPersistenceUnitRefs() Persistence Unit Refs}' containment reference list.
>@@ -386,7 +414,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList persistenceUnitRefs = null;
>+	protected EList<PersistenceUnitRef> persistenceUnitRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPostConstructs() Post Constructs}' containment reference list.
>@@ -396,7 +424,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList postConstructs = null;
>+	protected EList<LifecycleCallback> postConstructs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPreDestroys() Pre Destroys}' containment reference list.
>@@ -406,7 +434,27 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList preDestroys = null;
>+	protected EList<LifecycleCallback> preDestroys;
>+
>+	/**
>+	 * The cached value of the '{@link #getDataSource() Data Source}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDataSource()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<DataSourceType> dataSource;
>+
>+	/**
>+	 * The cached value of the '{@link #getSecurityRoleRef() Security Role Ref}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getSecurityRoleRef()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<SecurityRoleRef> securityRoleRef;
> 
> 	/**
> 	 * The cached value of the '{@link #getSecurityIdentity() Security Identity}' containment reference.
>@@ -416,7 +464,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected SecurityIdentityType securityIdentity = null;
>+	protected SecurityIdentityType securityIdentity;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -462,9 +510,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -474,9 +522,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -486,9 +534,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -625,6 +673,18 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public List<TimerType> getTimer() {
>+		if (timer == null) {
>+			timer = new EObjectContainmentEList<TimerType>(TimerType.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__TIMER);
>+		}
>+		return timer;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public TransactionType getTransactionType() {
> 		return transactionType;
> 	}
>@@ -756,9 +816,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getAroundInvokes() {
>+	public List<AroundInvokeType> getAroundInvokes() {
> 		if (aroundInvokes == null) {
>-			aroundInvokes = new EObjectContainmentEList(AroundInvokeType.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES);
>+			aroundInvokes = new EObjectContainmentEList<AroundInvokeType>(AroundInvokeType.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES);
> 		}
> 		return aroundInvokes;
> 	}
>@@ -768,9 +828,21 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEnvEntries() {
>+	public List<AroundTimeoutType> getAroundTimeouts() {
>+		if (aroundTimeouts == null) {
>+			aroundTimeouts = new EObjectContainmentEList<AroundTimeoutType>(AroundTimeoutType.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_TIMEOUTS);
>+		}
>+		return aroundTimeouts;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<EnvEntry> getEnvEntries() {
> 		if (envEntries == null) {
>-			envEntries = new EObjectContainmentEList(EnvEntry.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES);
>+			envEntries = new EObjectContainmentEList<EnvEntry>(EnvEntry.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES);
> 		}
> 		return envEntries;
> 	}
>@@ -780,9 +852,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbRefs() {
>+	public List<EjbRef> getEjbRefs() {
> 		if (ejbRefs == null) {
>-			ejbRefs = new EObjectContainmentEList(EjbRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_REFS);
>+			ejbRefs = new EObjectContainmentEList<EjbRef>(EjbRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_REFS);
> 		}
> 		return ejbRefs;
> 	}
>@@ -792,9 +864,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbLocalRefs() {
>+	public List<EjbLocalRef> getEjbLocalRefs() {
> 		if (ejbLocalRefs == null) {
>-			ejbLocalRefs = new EObjectContainmentEList(EjbLocalRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS);
>+			ejbLocalRefs = new EObjectContainmentEList<EjbLocalRef>(EjbLocalRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS);
> 		}
> 		return ejbLocalRefs;
> 	}
>@@ -804,9 +876,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getServiceRefs() {
>+	public List<ServiceRef> getServiceRefs() {
> 		if (serviceRefs == null) {
>-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__SERVICE_REFS);
>+			serviceRefs = new EObjectContainmentEList<ServiceRef>(ServiceRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__SERVICE_REFS);
> 		}
> 		return serviceRefs;
> 	}
>@@ -816,9 +888,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getResourceRefs() {
>+	public List<ResourceRef> getResourceRefs() {
> 		if (resourceRefs == null) {
>-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_REFS);
>+			resourceRefs = new EObjectContainmentEList<ResourceRef>(ResourceRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_REFS);
> 		}
> 		return resourceRefs;
> 	}
>@@ -828,9 +900,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getResourceEnvRefs() {
>+	public List<ResourceEnvRef> getResourceEnvRefs() {
> 		if (resourceEnvRefs == null) {
>-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS);
>+			resourceEnvRefs = new EObjectContainmentEList<ResourceEnvRef>(ResourceEnvRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS);
> 		}
> 		return resourceEnvRefs;
> 	}
>@@ -840,9 +912,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMessageDestinationRefs() {
>+	public List<MessageDestinationRef> getMessageDestinationRefs() {
> 		if (messageDestinationRefs == null) {
>-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS);
>+			messageDestinationRefs = new EObjectContainmentEList<MessageDestinationRef>(MessageDestinationRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS);
> 		}
> 		return messageDestinationRefs;
> 	}
>@@ -852,9 +924,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPersistenceContextRefs() {
>+	public List<PersistenceContextRef> getPersistenceContextRefs() {
> 		if (persistenceContextRefs == null) {
>-			persistenceContextRefs = new EObjectContainmentEList(PersistenceContextRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS);
>+			persistenceContextRefs = new EObjectContainmentEList<PersistenceContextRef>(PersistenceContextRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS);
> 		}
> 		return persistenceContextRefs;
> 	}
>@@ -864,9 +936,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPersistenceUnitRefs() {
>+	public List<PersistenceUnitRef> getPersistenceUnitRefs() {
> 		if (persistenceUnitRefs == null) {
>-			persistenceUnitRefs = new EObjectContainmentEList(PersistenceUnitRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS);
>+			persistenceUnitRefs = new EObjectContainmentEList<PersistenceUnitRef>(PersistenceUnitRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS);
> 		}
> 		return persistenceUnitRefs;
> 	}
>@@ -876,9 +948,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPostConstructs() {
>+	public List<LifecycleCallback> getPostConstructs() {
> 		if (postConstructs == null) {
>-			postConstructs = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS);
>+			postConstructs = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS);
> 		}
> 		return postConstructs;
> 	}
>@@ -888,9 +960,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPreDestroys() {
>+	public List<LifecycleCallback> getPreDestroys() {
> 		if (preDestroys == null) {
>-			preDestroys = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS);
>+			preDestroys = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS);
> 		}
> 		return preDestroys;
> 	}
>@@ -900,6 +972,30 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public List<DataSourceType> getDataSource() {
>+		if (dataSource == null) {
>+			dataSource = new EObjectContainmentEList<DataSourceType>(DataSourceType.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__DATA_SOURCE);
>+		}
>+		return dataSource;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<SecurityRoleRef> getSecurityRoleRef() {
>+		if (securityRoleRef == null) {
>+			securityRoleRef = new EObjectContainmentEList<SecurityRoleRef>(SecurityRoleRef.class, this, EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_ROLE_REF);
>+		}
>+		return securityRoleRef;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public SecurityIdentityType getSecurityIdentity() {
> 		return securityIdentity;
> 	}
>@@ -968,39 +1064,47 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD:
> 				return basicSetTimeoutMethod(null, msgs);
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMER:
>+				return ((InternalEList<?>)getTimer()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG:
> 				return basicSetActivationConfig(null, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES:
>-				return ((InternalEList)getAroundInvokes()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getAroundInvokes()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_TIMEOUTS:
>+				return ((InternalEList<?>)getAroundTimeouts()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES:
>-				return ((InternalEList)getEnvEntries()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEnvEntries()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_REFS:
>-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS:
>-				return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__SERVICE_REFS:
>-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getServiceRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_REFS:
>-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getResourceRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS:
>-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS:
>-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS:
>-				return ((InternalEList)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS:
>-				return ((InternalEList)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS:
>-				return ((InternalEList)getPostConstructs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPostConstructs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS:
>-				return ((InternalEList)getPreDestroys()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPreDestroys()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__DATA_SOURCE:
>+				return ((InternalEList<?>)getDataSource()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_ROLE_REF:
>+				return ((InternalEList<?>)getSecurityRoleRef()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY:
> 				return basicSetSecurityIdentity(null, msgs);
> 		}
>@@ -1031,6 +1135,8 @@
> 				return getMessagingType();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD:
> 				return getTimeoutMethod();
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMER:
>+				return getTimer();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE:
> 				return getTransactionType();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE:
>@@ -1041,6 +1147,8 @@
> 				return getActivationConfig();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES:
> 				return getAroundInvokes();
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_TIMEOUTS:
>+				return getAroundTimeouts();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES:
> 				return getEnvEntries();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_REFS:
>@@ -1063,6 +1171,10 @@
> 				return getPostConstructs();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS:
> 				return getPreDestroys();
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__DATA_SOURCE:
>+				return getDataSource();
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_ROLE_REF:
>+				return getSecurityRoleRef();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY:
> 				return getSecurityIdentity();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__ID:
>@@ -1076,20 +1188,21 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_NAME:
> 				setEjbName((String)newValue);
>@@ -1106,6 +1219,10 @@
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD:
> 				setTimeoutMethod((NamedMethodType)newValue);
> 				return;
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMER:
>+				getTimer().clear();
>+				getTimer().addAll((Collection<? extends TimerType>)newValue);
>+				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE:
> 				setTransactionType((TransactionType)newValue);
> 				return;
>@@ -1120,51 +1237,63 @@
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES:
> 				getAroundInvokes().clear();
>-				getAroundInvokes().addAll((Collection)newValue);
>+				getAroundInvokes().addAll((Collection<? extends AroundInvokeType>)newValue);
>+				return;
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_TIMEOUTS:
>+				getAroundTimeouts().clear();
>+				getAroundTimeouts().addAll((Collection<? extends AroundTimeoutType>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES:
> 				getEnvEntries().clear();
>-				getEnvEntries().addAll((Collection)newValue);
>+				getEnvEntries().addAll((Collection<? extends EnvEntry>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_REFS:
> 				getEjbRefs().clear();
>-				getEjbRefs().addAll((Collection)newValue);
>+				getEjbRefs().addAll((Collection<? extends EjbRef>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS:
> 				getEjbLocalRefs().clear();
>-				getEjbLocalRefs().addAll((Collection)newValue);
>+				getEjbLocalRefs().addAll((Collection<? extends EjbLocalRef>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__SERVICE_REFS:
> 				getServiceRefs().clear();
>-				getServiceRefs().addAll((Collection)newValue);
>+				getServiceRefs().addAll((Collection<? extends ServiceRef>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_REFS:
> 				getResourceRefs().clear();
>-				getResourceRefs().addAll((Collection)newValue);
>+				getResourceRefs().addAll((Collection<? extends ResourceRef>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS:
> 				getResourceEnvRefs().clear();
>-				getResourceEnvRefs().addAll((Collection)newValue);
>+				getResourceEnvRefs().addAll((Collection<? extends ResourceEnvRef>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS:
> 				getMessageDestinationRefs().clear();
>-				getMessageDestinationRefs().addAll((Collection)newValue);
>+				getMessageDestinationRefs().addAll((Collection<? extends MessageDestinationRef>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS:
> 				getPersistenceContextRefs().clear();
>-				getPersistenceContextRefs().addAll((Collection)newValue);
>+				getPersistenceContextRefs().addAll((Collection<? extends PersistenceContextRef>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS:
> 				getPersistenceUnitRefs().clear();
>-				getPersistenceUnitRefs().addAll((Collection)newValue);
>+				getPersistenceUnitRefs().addAll((Collection<? extends PersistenceUnitRef>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS:
> 				getPostConstructs().clear();
>-				getPostConstructs().addAll((Collection)newValue);
>+				getPostConstructs().addAll((Collection<? extends LifecycleCallback>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS:
> 				getPreDestroys().clear();
>-				getPreDestroys().addAll((Collection)newValue);
>+				getPreDestroys().addAll((Collection<? extends LifecycleCallback>)newValue);
>+				return;
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__DATA_SOURCE:
>+				getDataSource().clear();
>+				getDataSource().addAll((Collection<? extends DataSourceType>)newValue);
>+				return;
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_ROLE_REF:
>+				getSecurityRoleRef().clear();
>+				getSecurityRoleRef().addAll((Collection<? extends SecurityRoleRef>)newValue);
> 				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY:
> 				setSecurityIdentity((SecurityIdentityType)newValue);
>@@ -1208,6 +1337,9 @@
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD:
> 				setTimeoutMethod((NamedMethodType)null);
> 				return;
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMER:
>+				getTimer().clear();
>+				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE:
> 				unsetTransactionType();
> 				return;
>@@ -1223,6 +1355,9 @@
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES:
> 				getAroundInvokes().clear();
> 				return;
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_TIMEOUTS:
>+				getAroundTimeouts().clear();
>+				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES:
> 				getEnvEntries().clear();
> 				return;
>@@ -1256,6 +1391,12 @@
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS:
> 				getPreDestroys().clear();
> 				return;
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__DATA_SOURCE:
>+				getDataSource().clear();
>+				return;
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_ROLE_REF:
>+				getSecurityRoleRef().clear();
>+				return;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY:
> 				setSecurityIdentity((SecurityIdentityType)null);
> 				return;
>@@ -1290,6 +1431,8 @@
> 				return MESSAGING_TYPE_EDEFAULT == null ? messagingType != null : !MESSAGING_TYPE_EDEFAULT.equals(messagingType);
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD:
> 				return timeoutMethod != null;
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__TIMER:
>+				return timer != null && !timer.isEmpty();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE:
> 				return isSetTransactionType();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE:
>@@ -1300,6 +1443,8 @@
> 				return activationConfig != null;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_INVOKES:
> 				return aroundInvokes != null && !aroundInvokes.isEmpty();
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__AROUND_TIMEOUTS:
>+				return aroundTimeouts != null && !aroundTimeouts.isEmpty();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__ENV_ENTRIES:
> 				return envEntries != null && !envEntries.isEmpty();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__EJB_REFS:
>@@ -1322,6 +1467,10 @@
> 				return postConstructs != null && !postConstructs.isEmpty();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__PRE_DESTROYS:
> 				return preDestroys != null && !preDestroys.isEmpty();
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__DATA_SOURCE:
>+				return dataSource != null && !dataSource.isEmpty();
>+			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_ROLE_REF:
>+				return securityRoleRef != null && !securityRoleRef.isEmpty();
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY:
> 				return securityIdentity != null;
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN__ID:
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InitMethodTypeImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InitMethodTypeImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 InitMethodTypeImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InitMethodTypeImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InitMethodTypeImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -48,7 +48,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected NamedMethodType createMethod = null;
>+	protected NamedMethodType createMethod;
> 
> 	/**
> 	 * The cached value of the '{@link #getBeanMethod() Bean Method}' containment reference.
>@@ -58,7 +58,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected NamedMethodType beanMethod = null;
>+	protected NamedMethodType beanMethod;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationshipRoleImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationshipRoleImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 EJBRelationshipRoleImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationshipRoleImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationshipRoleImpl.java	14 Oct 2009 21:48:07 -0000
>@@ -65,7 +65,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getEjbRelationshipRoleName() Ejb Relationship Role Name}' attribute.
>@@ -114,7 +114,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean multiplicityESet = false;
>+	protected boolean multiplicityESet;
> 
> 	/**
> 	 * The cached value of the '{@link #getCascadeDelete() Cascade Delete}' containment reference.
>@@ -124,7 +124,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EmptyType cascadeDelete = null;
>+	protected EmptyType cascadeDelete;
> 
> 	/**
> 	 * The cached value of the '{@link #getRelationshipRoleSource() Relationship Role Source}' containment reference.
>@@ -134,7 +134,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected RelationshipRoleSourceType relationshipRoleSource = null;
>+	protected RelationshipRoleSourceType relationshipRoleSource;
> 
> 	/**
> 	 * The cached value of the '{@link #getCmrField() Cmr Field}' containment reference.
>@@ -144,7 +144,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected CMRField cmrField = null;
>+	protected CMRField cmrField;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -190,9 +190,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -423,7 +423,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
> 				return basicSetCascadeDelete(null, msgs);
> 			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP_ROLE_SOURCE:
>@@ -465,12 +465,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.EJB_RELATIONSHIP_ROLE__EJB_RELATIONSHIP_ROLE_NAME:
> 				setEjbRelationshipRoleName((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorBindingTypeImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorBindingTypeImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 InterceptorBindingTypeImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorBindingTypeImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorBindingTypeImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -65,7 +65,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getEjbName() Ejb Name}' attribute.
>@@ -95,7 +95,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList interceptorClasses = null;
>+	protected EList<String> interceptorClasses;
> 
> 	/**
> 	 * The cached value of the '{@link #getInterceptorOrder() Interceptor Order}' containment reference.
>@@ -105,7 +105,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected InterceptorOrderType interceptorOrder = null;
>+	protected InterceptorOrderType interceptorOrder;
> 
> 	/**
> 	 * The default value of the '{@link #isExcludeDefaultInterceptors() Exclude Default Interceptors}' attribute.
>@@ -134,7 +134,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean excludeDefaultInterceptorsESet = false;
>+	protected boolean excludeDefaultInterceptorsESet;
> 
> 	/**
> 	 * The default value of the '{@link #isExcludeClassInterceptors() Exclude Class Interceptors}' attribute.
>@@ -163,7 +163,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean excludeClassInterceptorsESet = false;
>+	protected boolean excludeClassInterceptorsESet;
> 
> 	/**
> 	 * The cached value of the '{@link #getMethod() Method}' containment reference.
>@@ -173,7 +173,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected NamedMethodType method = null;
>+	protected NamedMethodType method;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -219,9 +219,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -252,9 +252,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInterceptorClasses() {
>+	public List<String> getInterceptorClasses() {
> 		if (interceptorClasses == null) {
>-			interceptorClasses = new EDataTypeEList(String.class, this, EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_CLASSES);
>+			interceptorClasses = new EDataTypeEList<String>(String.class, this, EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_CLASSES);
> 		}
> 		return interceptorClasses;
> 	}
>@@ -467,7 +467,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER:
> 				return basicSetInterceptorOrder(null, msgs);
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__METHOD:
>@@ -493,9 +493,9 @@
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER:
> 				return getInterceptorOrder();
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_DEFAULT_INTERCEPTORS:
>-				return isExcludeDefaultInterceptors() ? Boolean.TRUE : Boolean.FALSE;
>+				return isExcludeDefaultInterceptors();
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_CLASS_INTERCEPTORS:
>-				return isExcludeClassInterceptors() ? Boolean.TRUE : Boolean.FALSE;
>+				return isExcludeClassInterceptors();
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__METHOD:
> 				return getMethod();
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__ID:
>@@ -509,28 +509,29 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EJB_NAME:
> 				setEjbName((String)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_CLASSES:
> 				getInterceptorClasses().clear();
>-				getInterceptorClasses().addAll((Collection)newValue);
>+				getInterceptorClasses().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__INTERCEPTOR_ORDER:
> 				setInterceptorOrder((InterceptorOrderType)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_DEFAULT_INTERCEPTORS:
>-				setExcludeDefaultInterceptors(((Boolean)newValue).booleanValue());
>+				setExcludeDefaultInterceptors((Boolean)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__EXCLUDE_CLASS_INTERCEPTORS:
>-				setExcludeClassInterceptors(((Boolean)newValue).booleanValue());
>+				setExcludeClassInterceptors((Boolean)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE__METHOD:
> 				setMethod((NamedMethodType)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 EJBRelationImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBRelationImpl.java	14 Oct 2009 21:48:07 -0000
>@@ -59,7 +59,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The default value of the '{@link #getEjbRelationName() Ejb Relation Name}' attribute.
>@@ -89,7 +89,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList ejbRelationshipRoles = null;
>+	protected EList<EJBRelationshipRole> ejbRelationshipRoles;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -135,9 +135,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EJB_RELATION__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.EJB_RELATION__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -168,9 +168,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbRelationshipRoles() {
>+	public List<EJBRelationshipRole> getEjbRelationshipRoles() {
> 		if (ejbRelationshipRoles == null) {
>-			ejbRelationshipRoles = new EObjectContainmentEList(EJBRelationshipRole.class, this, EjbPackage.EJB_RELATION__EJB_RELATIONSHIP_ROLES);
>+			ejbRelationshipRoles = new EObjectContainmentEList<EJBRelationshipRole>(EJBRelationshipRole.class, this, EjbPackage.EJB_RELATION__EJB_RELATIONSHIP_ROLES);
> 		}
> 		return ejbRelationshipRoles;
> 	}
>@@ -205,9 +205,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.EJB_RELATION__EJB_RELATIONSHIP_ROLES:
>-				return ((InternalEList)getEjbRelationshipRoles()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbRelationshipRoles()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -237,19 +237,20 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.EJB_RELATION__EJB_RELATION_NAME:
> 				setEjbRelationName((String)newValue);
> 				return;
> 			case EjbPackage.EJB_RELATION__EJB_RELATIONSHIP_ROLES:
> 				getEjbRelationshipRoles().clear();
>-				getEjbRelationshipRoles().addAll((Collection)newValue);
>+				getEjbRelationshipRoles().addAll((Collection<? extends EJBRelationshipRole>)newValue);
> 				return;
> 			case EjbPackage.EJB_RELATION__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryMethodImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryMethodImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 QueryMethodImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryMethodImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryMethodImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -68,7 +68,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected MethodParams methodParams = null;
>+	protected MethodParams methodParams;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 EjbPackageImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java	26 Jul 2007 16:56:11 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -25,16 +25,23 @@
> 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.AccessTimeoutType;
> import org.eclipse.jst.javaee.ejb.ActivationConfig;
> import org.eclipse.jst.javaee.ejb.ActivationConfigProperty;
> import org.eclipse.jst.javaee.ejb.ApplicationException;
> import org.eclipse.jst.javaee.ejb.AroundInvokeType;
>+import org.eclipse.jst.javaee.ejb.AroundTimeoutType;
> import org.eclipse.jst.javaee.ejb.AssemblyDescriptor;
>+import org.eclipse.jst.javaee.ejb.AsyncMethodType;
> import org.eclipse.jst.javaee.ejb.CMPField;
> import org.eclipse.jst.javaee.ejb.CMRField;
> import org.eclipse.jst.javaee.ejb.CMRFieldType;
> import org.eclipse.jst.javaee.ejb.CmpVersionType;
>+import org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType;
>+import org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType;
>+import org.eclipse.jst.javaee.ejb.ConcurrentMethodType;
> import org.eclipse.jst.javaee.ejb.ContainerTransactionType;
>+import org.eclipse.jst.javaee.ejb.DependsOnType;
> import org.eclipse.jst.javaee.ejb.EJBJar;
> import org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor;
> import org.eclipse.jst.javaee.ejb.EJBRelation;
>@@ -65,13 +72,23 @@
> import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
> import org.eclipse.jst.javaee.ejb.SessionBean;
> import org.eclipse.jst.javaee.ejb.SessionType;
>+import org.eclipse.jst.javaee.ejb.StatefulTimeoutType;
>+import org.eclipse.jst.javaee.ejb.TimeUnitTypeType;
>+import org.eclipse.jst.javaee.ejb.TimerScheduleType;
>+import org.eclipse.jst.javaee.ejb.TimerType;
> import org.eclipse.jst.javaee.ejb.TransactionAttributeType;
> import org.eclipse.jst.javaee.ejb.TransactionType;
> import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>+import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
>+import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
> import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
> import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
> import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
> import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
>+import org.eclipse.jst.javaee.webapp.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;
> 
> /**
> * 
>@@ -85,6 +102,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass accessTimeoutTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass activationConfigEClass = null;
> 
> 	/**
>@@ -113,6 +137,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass aroundTimeoutTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass assemblyDescriptorEClass = null;
> 
> 	/**
>@@ -120,6 +151,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass asyncMethodTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass cmpFieldEClass = null;
> 
> 	/**
>@@ -134,6 +172,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass concurrentMethodTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass containerTransactionTypeEClass = null;
> 
> 	/**
>@@ -141,6 +186,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass dependsOnTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass ejbJarEClass = null;
> 
> 	/**
>@@ -309,6 +361,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass statefulTimeoutTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass timerScheduleTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass timerTypeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EEnum cmpVersionTypeEEnum = null;
> 
> 	/**
>@@ -323,6 +396,20 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EEnum concurrencyManagementTypeTypeEEnum = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EEnum concurrentLockTypeTypeEEnum = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EEnum methodInterfaceTypeEEnum = null;
> 
> 	/**
>@@ -358,6 +445,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EEnum timeUnitTypeTypeEEnum = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EEnum transactionAttributeTypeEEnum = null;
> 
> 	/**
>@@ -386,6 +480,20 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EDataType concurrencyManagementTypeTypeObjectEDataType = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EDataType concurrentLockTypeTypeObjectEDataType = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EDataType ejbClassTypeEDataType = null;
> 
> 	/**
>@@ -442,6 +550,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EDataType timeUnitTypeTypeObjectEDataType = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EDataType transactionAttributeTypeObjectEDataType = null;
> 
> 	/**
>@@ -478,20 +593,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 EjbPackage#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
>@@ -503,7 +608,7 @@
> 		if (isInited) return (EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI);
> 
> 		// Obtain or create and register package
>-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EjbPackageImpl());
>+		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EjbPackageImpl());
> 
> 		isInited = true;
> 
>@@ -512,31 +617,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);
> 		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);
> 		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
> 		theEjbPackage.createPackageContents();
>-		theWebPackage.createPackageContents();
> 		theApplicationPackage.createPackageContents();
> 		theJavaeePackage.createPackageContents();
> 		theApplicationclientPackage.createPackageContents();
>+		theJcaPackage.createPackageContents();
> 		theJspPackage.createPackageContents();
>+		theWebPackage.createPackageContents();
>+		theWebappPackage.createPackageContents();
>+		theWebfragmentPackage.createPackageContents();
> 
> 		// Initialize created meta-data
> 		theEjbPackage.initializePackageContents();
>-		theWebPackage.initializePackageContents();
> 		theApplicationPackage.initializePackageContents();
> 		theJavaeePackage.initializePackageContents();
> 		theApplicationclientPackage.initializePackageContents();
>+		theJcaPackage.initializePackageContents();
> 		theJspPackage.initializePackageContents();
>+		theWebPackage.initializePackageContents();
>+		theWebappPackage.initializePackageContents();
>+		theWebfragmentPackage.initializePackageContents();
> 
> 		// Mark meta-data to indicate it can't be changed
> 		theEjbPackage.freeze();
> 
>+ 
>+		// Update the registry and return the package
>+		EPackage.Registry.INSTANCE.put(EjbPackage.eNS_URI, theEjbPackage);
> 		return theEjbPackage;
> 	}
> 
>@@ -545,6 +662,42 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EClass getAccessTimeoutType() {
>+		return accessTimeoutTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAccessTimeoutType_Timeout() {
>+		return (EAttribute)accessTimeoutTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAccessTimeoutType_Unit() {
>+		return (EAttribute)accessTimeoutTypeEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAccessTimeoutType_Id() {
>+		return (EAttribute)accessTimeoutTypeEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getActivationConfig() {
> 		return activationConfigEClass;
> 	}
>@@ -644,7 +797,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getApplicationException_Id() {
>+	public EAttribute getApplicationException_Inherited() {
> 		return (EAttribute)applicationExceptionEClass.getEStructuralFeatures().get(2);
> 	}
> 
>@@ -653,6 +806,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EAttribute getApplicationException_Id() {
>+		return (EAttribute)applicationExceptionEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getAroundInvokeType() {
> 		return aroundInvokeTypeEClass;
> 	}
>@@ -680,6 +842,33 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EClass getAroundTimeoutType() {
>+		return aroundTimeoutTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAroundTimeoutType_Class() {
>+		return (EAttribute)aroundTimeoutTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAroundTimeoutType_MethodName() {
>+		return (EAttribute)aroundTimeoutTypeEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getAssemblyDescriptor() {
> 		return assemblyDescriptorEClass;
> 	}
>@@ -761,6 +950,51 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EClass getAsyncMethodType() {
>+		return asyncMethodTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAsyncMethodType_MethodName() {
>+		return (EAttribute)asyncMethodTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getAsyncMethodType_MethodParams() {
>+		return (EReference)asyncMethodTypeEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAsyncMethodType_MethodIntf() {
>+		return (EAttribute)asyncMethodTypeEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getAsyncMethodType_Id() {
>+		return (EAttribute)asyncMethodTypeEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getCMPField() {
> 		return cmpFieldEClass;
> 	}
>@@ -842,8 +1076,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EClass getContainerTransactionType() {
>-		return containerTransactionTypeEClass;
>+	public EClass getConcurrentMethodType() {
>+		return concurrentMethodTypeEClass;
> 	}
> 
> 	/**
>@@ -851,8 +1085,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getContainerTransactionType_Descriptions() {
>-		return (EReference)containerTransactionTypeEClass.getEStructuralFeatures().get(0);
>+	public EReference getConcurrentMethodType_Method() {
>+		return (EReference)concurrentMethodTypeEClass.getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -860,8 +1094,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getContainerTransactionType_Methods() {
>-		return (EReference)containerTransactionTypeEClass.getEStructuralFeatures().get(1);
>+	public EAttribute getConcurrentMethodType_Lock() {
>+		return (EAttribute)concurrentMethodTypeEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -869,8 +1103,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getContainerTransactionType_TransAttribute() {
>-		return (EAttribute)containerTransactionTypeEClass.getEStructuralFeatures().get(2);
>+	public EReference getConcurrentMethodType_AccessTimeout() {
>+		return (EReference)concurrentMethodTypeEClass.getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -878,8 +1112,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getContainerTransactionType_Id() {
>-		return (EAttribute)containerTransactionTypeEClass.getEStructuralFeatures().get(3);
>+	public EAttribute getConcurrentMethodType_Id() {
>+		return (EAttribute)concurrentMethodTypeEClass.getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -887,8 +1121,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EClass getEJBJar() {
>-		return ejbJarEClass;
>+	public EClass getContainerTransactionType() {
>+		return containerTransactionTypeEClass;
> 	}
> 
> 	/**
>@@ -896,8 +1130,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEJBJar_Descriptions() {
>-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(0);
>+	public EReference getContainerTransactionType_Descriptions() {
>+		return (EReference)containerTransactionTypeEClass.getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -905,8 +1139,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEJBJar_DisplayNames() {
>-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(1);
>+	public EReference getContainerTransactionType_Methods() {
>+		return (EReference)containerTransactionTypeEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -914,8 +1148,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEJBJar_Icons() {
>-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(2);
>+	public EAttribute getContainerTransactionType_TransAttribute() {
>+		return (EAttribute)containerTransactionTypeEClass.getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -923,8 +1157,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEJBJar_EnterpriseBeans() {
>-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(3);
>+	public EAttribute getContainerTransactionType_Id() {
>+		return (EAttribute)containerTransactionTypeEClass.getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -932,8 +1166,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEJBJar_Interceptors() {
>-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(4);
>+	public EClass getDependsOnType() {
>+		return dependsOnTypeEClass;
> 	}
> 
> 	/**
>@@ -941,8 +1175,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEJBJar_Relationships() {
>-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(5);
>+	public EAttribute getDependsOnType_EjbName() {
>+		return (EAttribute)dependsOnTypeEClass.getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -950,8 +1184,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEJBJar_AssemblyDescriptor() {
>-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(6);
>+	public EAttribute getDependsOnType_Id() {
>+		return (EAttribute)dependsOnTypeEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -959,8 +1193,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getEJBJar_EjbClientJar() {
>-		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(7);
>+	public EClass getEJBJar() {
>+		return ejbJarEClass;
> 	}
> 
> 	/**
>@@ -968,8 +1202,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getEJBJar_Id() {
>-		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(8);
>+	public EReference getEJBJar_Descriptions() {
>+		return (EReference)ejbJarEClass.getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -977,8 +1211,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getEJBJar_MetadataComplete() {
>-		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(9);
>+	public EReference getEJBJar_DisplayNames() {
>+		return (EReference)ejbJarEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -986,8 +1220,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getEJBJar_Version() {
>-		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(10);
>+	public EReference getEJBJar_Icons() {
>+		return (EReference)ejbJarEClass.getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -995,8 +1229,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EClass getEJBJarDeploymentDescriptor() {
>-		return ejbJarDeploymentDescriptorEClass;
>+	public EAttribute getEJBJar_ModuleName() {
>+		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -1004,8 +1238,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getEJBJarDeploymentDescriptor_Mixed() {
>-		return (EAttribute)ejbJarDeploymentDescriptorEClass.getEStructuralFeatures().get(0);
>+	public EReference getEJBJar_EnterpriseBeans() {
>+		return (EReference)ejbJarEClass.getEStructuralFeatures().get(4);
> 	}
> 
> 	/**
>@@ -1013,8 +1247,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEJBJarDeploymentDescriptor_XMLNSPrefixMap() {
>-		return (EReference)ejbJarDeploymentDescriptorEClass.getEStructuralFeatures().get(1);
>+	public EReference getEJBJar_Interceptors() {
>+		return (EReference)ejbJarEClass.getEStructuralFeatures().get(5);
> 	}
> 
> 	/**
>@@ -1022,8 +1256,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEJBJarDeploymentDescriptor_XSISchemaLocation() {
>-		return (EReference)ejbJarDeploymentDescriptorEClass.getEStructuralFeatures().get(2);
>+	public EReference getEJBJar_Relationships() {
>+		return (EReference)ejbJarEClass.getEStructuralFeatures().get(6);
> 	}
> 
> 	/**
>@@ -1031,8 +1265,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEJBJarDeploymentDescriptor_EjbJar() {
>-		return (EReference)ejbJarDeploymentDescriptorEClass.getEStructuralFeatures().get(3);
>+	public EReference getEJBJar_AssemblyDescriptor() {
>+		return (EReference)ejbJarEClass.getEStructuralFeatures().get(7);
> 	}
> 
> 	/**
>@@ -1040,8 +1274,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EClass getEJBRelation() {
>-		return ejbRelationEClass;
>+	public EAttribute getEJBJar_EjbClientJar() {
>+		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(8);
> 	}
> 
> 	/**
>@@ -1049,8 +1283,89 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEJBRelation_Descriptions() {
>-		return (EReference)ejbRelationEClass.getEStructuralFeatures().get(0);
>+	public EAttribute getEJBJar_Id() {
>+		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(9);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getEJBJar_MetadataComplete() {
>+		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(10);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getEJBJar_Version() {
>+		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(11);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getEJBJarDeploymentDescriptor() {
>+		return ejbJarDeploymentDescriptorEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getEJBJarDeploymentDescriptor_Mixed() {
>+		return (EAttribute)ejbJarDeploymentDescriptorEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getEJBJarDeploymentDescriptor_XMLNSPrefixMap() {
>+		return (EReference)ejbJarDeploymentDescriptorEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getEJBJarDeploymentDescriptor_XSISchemaLocation() {
>+		return (EReference)ejbJarDeploymentDescriptorEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getEJBJarDeploymentDescriptor_EjbJar() {
>+		return (EReference)ejbJarDeploymentDescriptorEClass.getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getEJBRelation() {
>+		return ejbRelationEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getEJBRelation_Descriptions() {
>+		return (EReference)ejbRelationEClass.getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -1472,7 +1787,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEntityBean_SecurityRoleRefs() {
>+	public EReference getEntityBean_DataSource() {
> 		return (EReference)entityBeanEClass.getEStructuralFeatures().get(28);
> 	}
> 
>@@ -1481,7 +1796,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEntityBean_SecurityIdentity() {
>+	public EReference getEntityBean_SecurityRoleRefs() {
> 		return (EReference)entityBeanEClass.getEStructuralFeatures().get(29);
> 	}
> 
>@@ -1490,7 +1805,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getEntityBean_Queries() {
>+	public EReference getEntityBean_SecurityIdentity() {
> 		return (EReference)entityBeanEClass.getEStructuralFeatures().get(30);
> 	}
> 
>@@ -1499,8 +1814,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EReference getEntityBean_Queries() {
>+		return (EReference)entityBeanEClass.getEStructuralFeatures().get(31);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EAttribute getEntityBean_Id() {
>-		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(31);
>+		return (EAttribute)entityBeanEClass.getEStructuralFeatures().get(32);
> 	}
> 
> 	/**
>@@ -1760,7 +2084,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_EnvEntries() {
>+	public EReference getInterceptorType_AroundTimeouts() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(3);
> 	}
> 
>@@ -1769,7 +2093,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_EjbRefs() {
>+	public EReference getInterceptorType_EnvEntries() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(4);
> 	}
> 
>@@ -1778,7 +2102,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_EjbLocalRefs() {
>+	public EReference getInterceptorType_EjbRefs() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(5);
> 	}
> 
>@@ -1787,7 +2111,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_ServiceRefs() {
>+	public EReference getInterceptorType_EjbLocalRefs() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(6);
> 	}
> 
>@@ -1796,7 +2120,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_ResourceRefs() {
>+	public EReference getInterceptorType_ServiceRefs() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(7);
> 	}
> 
>@@ -1805,7 +2129,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_ResourceEnvRefs() {
>+	public EReference getInterceptorType_ResourceRefs() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(8);
> 	}
> 
>@@ -1814,7 +2138,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_MessageDestinationRefs() {
>+	public EReference getInterceptorType_ResourceEnvRefs() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(9);
> 	}
> 
>@@ -1823,7 +2147,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_PersistenceContextRefs() {
>+	public EReference getInterceptorType_MessageDestinationRefs() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(10);
> 	}
> 
>@@ -1832,7 +2156,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_PersistenceUnitRefs() {
>+	public EReference getInterceptorType_PersistenceContextRefs() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(11);
> 	}
> 
>@@ -1841,7 +2165,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_PostConstructs() {
>+	public EReference getInterceptorType_PersistenceUnitRefs() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(12);
> 	}
> 
>@@ -1850,7 +2174,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_PreDestroys() {
>+	public EReference getInterceptorType_PostConstructs() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(13);
> 	}
> 
>@@ -1859,7 +2183,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_PostActivates() {
>+	public EReference getInterceptorType_PreDestroys() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(14);
> 	}
> 
>@@ -1868,7 +2192,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getInterceptorType_PrePassivates() {
>+	public EReference getInterceptorType_DataSource() {
> 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(15);
> 	}
> 
>@@ -1877,8 +2201,26 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EReference getInterceptorType_PostActivates() {
>+		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(16);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getInterceptorType_PrePassivates() {
>+		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(17);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EAttribute getInterceptorType_Id() {
>-		return (EAttribute)interceptorTypeEClass.getEStructuralFeatures().get(16);
>+		return (EAttribute)interceptorTypeEClass.getEStructuralFeatures().get(18);
> 	}
> 
> 	/**
>@@ -1967,8 +2309,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EReference getMessageDrivenBean_Timer() {
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(8);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EAttribute getMessageDrivenBean_TransactionType() {
>-		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(8);
>+		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(9);
> 	}
> 
> 	/**
>@@ -1977,7 +2328,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getMessageDrivenBean_MessageDestinationType() {
>-		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(9);
>+		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(10);
> 	}
> 
> 	/**
>@@ -1986,7 +2337,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getMessageDrivenBean_MessageDestinationLink() {
>-		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(10);
>+		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(11);
> 	}
> 
> 	/**
>@@ -1995,7 +2346,7 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_ActivationConfig() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(11);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(12);
> 	}
> 
> 	/**
>@@ -2004,7 +2355,16 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_AroundInvokes() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(12);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(13);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getMessageDrivenBean_AroundTimeouts() {
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(14);
> 	}
> 
> 	/**
>@@ -2013,7 +2373,7 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_EnvEntries() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(13);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(15);
> 	}
> 
> 	/**
>@@ -2022,7 +2382,7 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_EjbRefs() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(14);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(16);
> 	}
> 
> 	/**
>@@ -2031,7 +2391,7 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_EjbLocalRefs() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(15);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(17);
> 	}
> 
> 	/**
>@@ -2040,7 +2400,7 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_ServiceRefs() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(16);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(18);
> 	}
> 
> 	/**
>@@ -2049,7 +2409,7 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_ResourceRefs() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(17);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(19);
> 	}
> 
> 	/**
>@@ -2058,7 +2418,7 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_ResourceEnvRefs() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(18);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(20);
> 	}
> 
> 	/**
>@@ -2067,7 +2427,7 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_MessageDestinationRefs() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(19);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(21);
> 	}
> 
> 	/**
>@@ -2076,7 +2436,7 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_PersistenceContextRefs() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(20);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(22);
> 	}
> 
> 	/**
>@@ -2085,7 +2445,7 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_PersistenceUnitRefs() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(21);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(23);
> 	}
> 
> 	/**
>@@ -2094,7 +2454,7 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_PostConstructs() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(22);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(24);
> 	}
> 
> 	/**
>@@ -2103,7 +2463,25 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_PreDestroys() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(23);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(25);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getMessageDrivenBean_DataSource() {
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(26);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getMessageDrivenBean_SecurityRoleRef() {
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(27);
> 	}
> 
> 	/**
>@@ -2112,7 +2490,7 @@
> 	 * @generated
> 	 */
> 	public EReference getMessageDrivenBean_SecurityIdentity() {
>-		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(24);
>+		return (EReference)messageDrivenBeanEClass.getEStructuralFeatures().get(28);
> 	}
> 
> 	/**
>@@ -2121,7 +2499,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getMessageDrivenBean_Id() {
>-		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(25);
>+		return (EAttribute)messageDrivenBeanEClass.getEStructuralFeatures().get(29);
> 	}
> 
> 	/**
>@@ -2660,8 +3038,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EReference getSessionBean_LocalBean() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(11);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EAttribute getSessionBean_ServiceEndpoint() {
>-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(11);
>+		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(12);
> 	}
> 
> 	/**
>@@ -2670,7 +3057,7 @@
> 	 * @generated
> 	 */
> 	public EAttribute getSessionBean_EjbClass() {
>-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(12);
>+		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(13);
> 	}
> 
> 	/**
>@@ -2679,7 +3066,16 @@
> 	 * @generated
> 	 */
> 	public EAttribute getSessionBean_SessionType() {
>-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(13);
>+		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(14);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_StatefulTimeout() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(15);
> 	}
> 
> 	/**
>@@ -2688,7 +3084,52 @@
> 	 * @generated
> 	 */
> 	public EReference getSessionBean_TimeoutMethod() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(14);
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(16);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_Timer() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(17);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getSessionBean_InitOnStartup() {
>+		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(18);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getSessionBean_ConcurrencyManagementType() {
>+		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(19);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_ConcurrentMethod() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(20);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_DependsOn() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(21);
> 	}
> 
> 	/**
>@@ -2697,7 +3138,286 @@
> 	 * @generated
> 	 */
> 	public EReference getSessionBean_InitMethods() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(15);
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(22);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_RemoveMethods() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(23);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_AsyncMethod() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(24);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getSessionBean_TransactionType() {
>+		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(25);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_AfterBeginMethod() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(26);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_BeforeCompletionMethod() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(27);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_AfterCompletionMethod() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(28);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_AroundInvokes() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(29);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_AroundTimeouts() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(30);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_EnvEntries() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(31);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_EjbRefs() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(32);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_EjbLocalRefs() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(33);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_ServiceRefs() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(34);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_ResourceRefs() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(35);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_ResourceEnvRefs() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(36);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_MessageDestinationRefs() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(37);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_PersistenceContextRefs() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(38);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_PersistenceUnitRefs() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(39);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_PostConstructs() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(40);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_PreDestroys() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(41);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_DataSource() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(42);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_PostActivates() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(43);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_PrePassivates() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(44);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_SecurityRoleRefs() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(45);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getSessionBean_SecurityIdentities() {
>+		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(46);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getSessionBean_Id() {
>+		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(47);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getStatefulTimeoutType() {
>+		return statefulTimeoutTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getStatefulTimeoutType_Timeout() {
>+		return (EAttribute)statefulTimeoutTypeEClass.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getStatefulTimeoutType_Unit() {
>+		return (EAttribute)statefulTimeoutTypeEClass.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getStatefulTimeoutType_Id() {
>+		return (EAttribute)statefulTimeoutTypeEClass.getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getTimerScheduleType() {
>+		return timerScheduleTypeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getTimerScheduleType_Second() {
>+		return (EAttribute)timerScheduleTypeEClass.getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -2705,8 +3425,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_RemoveMethods() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(16);
>+	public EAttribute getTimerScheduleType_Minute() {
>+		return (EAttribute)timerScheduleTypeEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -2714,8 +3434,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getSessionBean_TransactionType() {
>-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(17);
>+	public EAttribute getTimerScheduleType_Hour() {
>+		return (EAttribute)timerScheduleTypeEClass.getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -2723,8 +3443,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_AroundInvokes() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(18);
>+	public EAttribute getTimerScheduleType_DayOfMonth() {
>+		return (EAttribute)timerScheduleTypeEClass.getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -2732,8 +3452,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_EnvEntries() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(19);
>+	public EAttribute getTimerScheduleType_Month() {
>+		return (EAttribute)timerScheduleTypeEClass.getEStructuralFeatures().get(4);
> 	}
> 
> 	/**
>@@ -2741,8 +3461,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_EjbRefs() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(20);
>+	public EAttribute getTimerScheduleType_DayOfWeek() {
>+		return (EAttribute)timerScheduleTypeEClass.getEStructuralFeatures().get(5);
> 	}
> 
> 	/**
>@@ -2750,8 +3470,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_EjbLocalRefs() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(21);
>+	public EAttribute getTimerScheduleType_Year() {
>+		return (EAttribute)timerScheduleTypeEClass.getEStructuralFeatures().get(6);
> 	}
> 
> 	/**
>@@ -2759,8 +3479,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_ServiceRefs() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(22);
>+	public EAttribute getTimerScheduleType_Id() {
>+		return (EAttribute)timerScheduleTypeEClass.getEStructuralFeatures().get(7);
> 	}
> 
> 	/**
>@@ -2768,8 +3488,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_ResourceRefs() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(23);
>+	public EClass getTimerType() {
>+		return timerTypeEClass;
> 	}
> 
> 	/**
>@@ -2777,8 +3497,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_ResourceEnvRefs() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(24);
>+	public EReference getTimerType_Description() {
>+		return (EReference)timerTypeEClass.getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -2786,8 +3506,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_MessageDestinationRefs() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(25);
>+	public EReference getTimerType_Schedule() {
>+		return (EReference)timerTypeEClass.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -2795,8 +3515,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_PersistenceContextRefs() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(26);
>+	public EAttribute getTimerType_Start() {
>+		return (EAttribute)timerTypeEClass.getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -2804,8 +3524,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_PersistenceUnitRefs() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(27);
>+	public EAttribute getTimerType_End() {
>+		return (EAttribute)timerTypeEClass.getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -2813,8 +3533,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_PostConstructs() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(28);
>+	public EReference getTimerType_TimeoutMethod() {
>+		return (EReference)timerTypeEClass.getEStructuralFeatures().get(4);
> 	}
> 
> 	/**
>@@ -2822,8 +3542,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_PreDestroys() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(29);
>+	public EAttribute getTimerType_Persistent() {
>+		return (EAttribute)timerTypeEClass.getEStructuralFeatures().get(5);
> 	}
> 
> 	/**
>@@ -2831,8 +3551,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_PostActivates() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(30);
>+	public EAttribute getTimerType_Timezone() {
>+		return (EAttribute)timerTypeEClass.getEStructuralFeatures().get(6);
> 	}
> 
> 	/**
>@@ -2840,8 +3560,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_PrePassivates() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(31);
>+	public EAttribute getTimerType_Info() {
>+		return (EAttribute)timerTypeEClass.getEStructuralFeatures().get(7);
> 	}
> 
> 	/**
>@@ -2849,8 +3569,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_SecurityRoleRefs() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(32);
>+	public EAttribute getTimerType_Id() {
>+		return (EAttribute)timerTypeEClass.getEStructuralFeatures().get(8);
> 	}
> 
> 	/**
>@@ -2858,8 +3578,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getSessionBean_SecurityIdentities() {
>-		return (EReference)sessionBeanEClass.getEStructuralFeatures().get(33);
>+	public EEnum getCmpVersionType() {
>+		return cmpVersionTypeEEnum;
> 	}
> 
> 	/**
>@@ -2867,8 +3587,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getSessionBean_Id() {
>-		return (EAttribute)sessionBeanEClass.getEStructuralFeatures().get(34);
>+	public EEnum getCMRFieldType() {
>+		return cmrFieldTypeEEnum;
> 	}
> 
> 	/**
>@@ -2876,8 +3596,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EEnum getCmpVersionType() {
>-		return cmpVersionTypeEEnum;
>+	public EEnum getConcurrencyManagementTypeType() {
>+		return concurrencyManagementTypeTypeEEnum;
> 	}
> 
> 	/**
>@@ -2885,8 +3605,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EEnum getCMRFieldType() {
>-		return cmrFieldTypeEEnum;
>+	public EEnum getConcurrentLockTypeType() {
>+		return concurrentLockTypeTypeEEnum;
> 	}
> 
> 	/**
>@@ -2939,6 +3659,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EEnum getTimeUnitTypeType() {
>+		return timeUnitTypeTypeEEnum;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EEnum getTransactionAttributeType() {
> 		return transactionAttributeTypeEEnum;
> 	}
>@@ -2975,6 +3704,24 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EDataType getConcurrencyManagementTypeTypeObject() {
>+		return concurrencyManagementTypeTypeObjectEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EDataType getConcurrentLockTypeTypeObject() {
>+		return concurrentLockTypeTypeObjectEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EDataType getEjbClassType() {
> 		return ejbClassTypeEDataType;
> 	}
>@@ -3047,6 +3794,15 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EDataType getTimeUnitTypeTypeObject() {
>+		return timeUnitTypeTypeObjectEDataType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EDataType getTransactionAttributeTypeObject() {
> 		return transactionAttributeTypeObjectEDataType;
> 	}
>@@ -3088,6 +3844,11 @@
> 		isCreated = true;
> 
> 		// Create classes and their features
>+		accessTimeoutTypeEClass = createEClass(ACCESS_TIMEOUT_TYPE);
>+		createEAttribute(accessTimeoutTypeEClass, ACCESS_TIMEOUT_TYPE__TIMEOUT);
>+		createEAttribute(accessTimeoutTypeEClass, ACCESS_TIMEOUT_TYPE__UNIT);
>+		createEAttribute(accessTimeoutTypeEClass, ACCESS_TIMEOUT_TYPE__ID);
>+
> 		activationConfigEClass = createEClass(ACTIVATION_CONFIG);
> 		createEReference(activationConfigEClass, ACTIVATION_CONFIG__DESCRIPTIONS);
> 		createEReference(activationConfigEClass, ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES);
>@@ -3101,12 +3862,17 @@
> 		applicationExceptionEClass = createEClass(APPLICATION_EXCEPTION);
> 		createEAttribute(applicationExceptionEClass, APPLICATION_EXCEPTION__EXCEPTION_CLASS);
> 		createEAttribute(applicationExceptionEClass, APPLICATION_EXCEPTION__ROLLBACK);
>+		createEAttribute(applicationExceptionEClass, APPLICATION_EXCEPTION__INHERITED);
> 		createEAttribute(applicationExceptionEClass, APPLICATION_EXCEPTION__ID);
> 
> 		aroundInvokeTypeEClass = createEClass(AROUND_INVOKE_TYPE);
> 		createEAttribute(aroundInvokeTypeEClass, AROUND_INVOKE_TYPE__CLASS);
> 		createEAttribute(aroundInvokeTypeEClass, AROUND_INVOKE_TYPE__METHOD_NAME);
> 
>+		aroundTimeoutTypeEClass = createEClass(AROUND_TIMEOUT_TYPE);
>+		createEAttribute(aroundTimeoutTypeEClass, AROUND_TIMEOUT_TYPE__CLASS);
>+		createEAttribute(aroundTimeoutTypeEClass, AROUND_TIMEOUT_TYPE__METHOD_NAME);
>+
> 		assemblyDescriptorEClass = createEClass(ASSEMBLY_DESCRIPTOR);
> 		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__SECURITY_ROLES);
> 		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS);
>@@ -3117,6 +3883,12 @@
> 		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__APPLICATION_EXCEPTIONS);
> 		createEAttribute(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__ID);
> 
>+		asyncMethodTypeEClass = createEClass(ASYNC_METHOD_TYPE);
>+		createEAttribute(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__METHOD_NAME);
>+		createEReference(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__METHOD_PARAMS);
>+		createEAttribute(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__METHOD_INTF);
>+		createEAttribute(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__ID);
>+
> 		cmpFieldEClass = createEClass(CMP_FIELD);
> 		createEReference(cmpFieldEClass, CMP_FIELD__DESCRIPTIONS);
> 		createEAttribute(cmpFieldEClass, CMP_FIELD__FIELD_NAME);
>@@ -3128,16 +3900,27 @@
> 		createEAttribute(cmrFieldEClass, CMR_FIELD__CMR_FIELD_TYPE);
> 		createEAttribute(cmrFieldEClass, CMR_FIELD__ID);
> 
>+		concurrentMethodTypeEClass = createEClass(CONCURRENT_METHOD_TYPE);
>+		createEReference(concurrentMethodTypeEClass, CONCURRENT_METHOD_TYPE__METHOD);
>+		createEAttribute(concurrentMethodTypeEClass, CONCURRENT_METHOD_TYPE__LOCK);
>+		createEReference(concurrentMethodTypeEClass, CONCURRENT_METHOD_TYPE__ACCESS_TIMEOUT);
>+		createEAttribute(concurrentMethodTypeEClass, CONCURRENT_METHOD_TYPE__ID);
>+
> 		containerTransactionTypeEClass = createEClass(CONTAINER_TRANSACTION_TYPE);
> 		createEReference(containerTransactionTypeEClass, CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS);
> 		createEReference(containerTransactionTypeEClass, CONTAINER_TRANSACTION_TYPE__METHODS);
> 		createEAttribute(containerTransactionTypeEClass, CONTAINER_TRANSACTION_TYPE__TRANS_ATTRIBUTE);
> 		createEAttribute(containerTransactionTypeEClass, CONTAINER_TRANSACTION_TYPE__ID);
> 
>+		dependsOnTypeEClass = createEClass(DEPENDS_ON_TYPE);
>+		createEAttribute(dependsOnTypeEClass, DEPENDS_ON_TYPE__EJB_NAME);
>+		createEAttribute(dependsOnTypeEClass, DEPENDS_ON_TYPE__ID);
>+
> 		ejbJarEClass = createEClass(EJB_JAR);
> 		createEReference(ejbJarEClass, EJB_JAR__DESCRIPTIONS);
> 		createEReference(ejbJarEClass, EJB_JAR__DISPLAY_NAMES);
> 		createEReference(ejbJarEClass, EJB_JAR__ICONS);
>+		createEAttribute(ejbJarEClass, EJB_JAR__MODULE_NAME);
> 		createEReference(ejbJarEClass, EJB_JAR__ENTERPRISE_BEANS);
> 		createEReference(ejbJarEClass, EJB_JAR__INTERCEPTORS);
> 		createEReference(ejbJarEClass, EJB_JAR__RELATIONSHIPS);
>@@ -3204,6 +3987,7 @@
> 		createEReference(entityBeanEClass, ENTITY_BEAN__PERSISTENCE_UNIT_REFS);
> 		createEReference(entityBeanEClass, ENTITY_BEAN__POST_CONSTRUCTS);
> 		createEReference(entityBeanEClass, ENTITY_BEAN__PRE_DESTROYS);
>+		createEReference(entityBeanEClass, ENTITY_BEAN__DATA_SOURCE);
> 		createEReference(entityBeanEClass, ENTITY_BEAN__SECURITY_ROLE_REFS);
> 		createEReference(entityBeanEClass, ENTITY_BEAN__SECURITY_IDENTITY);
> 		createEReference(entityBeanEClass, ENTITY_BEAN__QUERIES);
>@@ -3242,6 +4026,7 @@
> 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__DESCRIPTIONS);
> 		createEAttribute(interceptorTypeEClass, INTERCEPTOR_TYPE__INTERCEPTOR_CLASS);
> 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__AROUND_INVOKES);
>+		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__AROUND_TIMEOUTS);
> 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__ENV_ENTRIES);
> 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__EJB_REFS);
> 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__EJB_LOCAL_REFS);
>@@ -3253,6 +4038,7 @@
> 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS);
> 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__POST_CONSTRUCTS);
> 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__PRE_DESTROYS);
>+		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__DATA_SOURCE);
> 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__POST_ACTIVATES);
> 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__PRE_PASSIVATES);
> 		createEAttribute(interceptorTypeEClass, INTERCEPTOR_TYPE__ID);
>@@ -3266,11 +4052,13 @@
> 		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__EJB_CLASS);
> 		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__MESSAGING_TYPE);
> 		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD);
>+		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__TIMER);
> 		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE);
> 		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE);
> 		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_LINK);
> 		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG);
> 		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__AROUND_INVOKES);
>+		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__AROUND_TIMEOUTS);
> 		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__ENV_ENTRIES);
> 		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__EJB_REFS);
> 		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS);
>@@ -3282,6 +4070,8 @@
> 		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS);
> 		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS);
> 		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__PRE_DESTROYS);
>+		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__DATA_SOURCE);
>+		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__SECURITY_ROLE_REF);
> 		createEReference(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY);
> 		createEAttribute(messageDrivenBeanEClass, MESSAGE_DRIVEN_BEAN__ID);
> 
>@@ -3354,14 +4144,26 @@
> 		createEAttribute(sessionBeanEClass, SESSION_BEAN__LOCAL);
> 		createEAttribute(sessionBeanEClass, SESSION_BEAN__BUSINESS_LOCALS);
> 		createEAttribute(sessionBeanEClass, SESSION_BEAN__BUSINESS_REMOTES);
>+		createEReference(sessionBeanEClass, SESSION_BEAN__LOCAL_BEAN);
> 		createEAttribute(sessionBeanEClass, SESSION_BEAN__SERVICE_ENDPOINT);
> 		createEAttribute(sessionBeanEClass, SESSION_BEAN__EJB_CLASS);
> 		createEAttribute(sessionBeanEClass, SESSION_BEAN__SESSION_TYPE);
>+		createEReference(sessionBeanEClass, SESSION_BEAN__STATEFUL_TIMEOUT);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__TIMEOUT_METHOD);
>+		createEReference(sessionBeanEClass, SESSION_BEAN__TIMER);
>+		createEAttribute(sessionBeanEClass, SESSION_BEAN__INIT_ON_STARTUP);
>+		createEAttribute(sessionBeanEClass, SESSION_BEAN__CONCURRENCY_MANAGEMENT_TYPE);
>+		createEReference(sessionBeanEClass, SESSION_BEAN__CONCURRENT_METHOD);
>+		createEReference(sessionBeanEClass, SESSION_BEAN__DEPENDS_ON);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__INIT_METHODS);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__REMOVE_METHODS);
>+		createEReference(sessionBeanEClass, SESSION_BEAN__ASYNC_METHOD);
> 		createEAttribute(sessionBeanEClass, SESSION_BEAN__TRANSACTION_TYPE);
>+		createEReference(sessionBeanEClass, SESSION_BEAN__AFTER_BEGIN_METHOD);
>+		createEReference(sessionBeanEClass, SESSION_BEAN__BEFORE_COMPLETION_METHOD);
>+		createEReference(sessionBeanEClass, SESSION_BEAN__AFTER_COMPLETION_METHOD);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__AROUND_INVOKES);
>+		createEReference(sessionBeanEClass, SESSION_BEAN__AROUND_TIMEOUTS);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__ENV_ENTRIES);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__EJB_REFS);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__EJB_LOCAL_REFS);
>@@ -3373,26 +4175,58 @@
> 		createEReference(sessionBeanEClass, SESSION_BEAN__PERSISTENCE_UNIT_REFS);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__POST_CONSTRUCTS);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__PRE_DESTROYS);
>+		createEReference(sessionBeanEClass, SESSION_BEAN__DATA_SOURCE);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__POST_ACTIVATES);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__PRE_PASSIVATES);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__SECURITY_ROLE_REFS);
> 		createEReference(sessionBeanEClass, SESSION_BEAN__SECURITY_IDENTITIES);
> 		createEAttribute(sessionBeanEClass, SESSION_BEAN__ID);
> 
>+		statefulTimeoutTypeEClass = createEClass(STATEFUL_TIMEOUT_TYPE);
>+		createEAttribute(statefulTimeoutTypeEClass, STATEFUL_TIMEOUT_TYPE__TIMEOUT);
>+		createEAttribute(statefulTimeoutTypeEClass, STATEFUL_TIMEOUT_TYPE__UNIT);
>+		createEAttribute(statefulTimeoutTypeEClass, STATEFUL_TIMEOUT_TYPE__ID);
>+
>+		timerScheduleTypeEClass = createEClass(TIMER_SCHEDULE_TYPE);
>+		createEAttribute(timerScheduleTypeEClass, TIMER_SCHEDULE_TYPE__SECOND);
>+		createEAttribute(timerScheduleTypeEClass, TIMER_SCHEDULE_TYPE__MINUTE);
>+		createEAttribute(timerScheduleTypeEClass, TIMER_SCHEDULE_TYPE__HOUR);
>+		createEAttribute(timerScheduleTypeEClass, TIMER_SCHEDULE_TYPE__DAY_OF_MONTH);
>+		createEAttribute(timerScheduleTypeEClass, TIMER_SCHEDULE_TYPE__MONTH);
>+		createEAttribute(timerScheduleTypeEClass, TIMER_SCHEDULE_TYPE__DAY_OF_WEEK);
>+		createEAttribute(timerScheduleTypeEClass, TIMER_SCHEDULE_TYPE__YEAR);
>+		createEAttribute(timerScheduleTypeEClass, TIMER_SCHEDULE_TYPE__ID);
>+
>+		timerTypeEClass = createEClass(TIMER_TYPE);
>+		createEReference(timerTypeEClass, TIMER_TYPE__DESCRIPTION);
>+		createEReference(timerTypeEClass, TIMER_TYPE__SCHEDULE);
>+		createEAttribute(timerTypeEClass, TIMER_TYPE__START);
>+		createEAttribute(timerTypeEClass, TIMER_TYPE__END);
>+		createEReference(timerTypeEClass, TIMER_TYPE__TIMEOUT_METHOD);
>+		createEAttribute(timerTypeEClass, TIMER_TYPE__PERSISTENT);
>+		createEAttribute(timerTypeEClass, TIMER_TYPE__TIMEZONE);
>+		createEAttribute(timerTypeEClass, TIMER_TYPE__INFO);
>+		createEAttribute(timerTypeEClass, TIMER_TYPE__ID);
>+
> 		// Create enums
> 		cmpVersionTypeEEnum = createEEnum(CMP_VERSION_TYPE);
> 		cmrFieldTypeEEnum = createEEnum(CMR_FIELD_TYPE);
>+		concurrencyManagementTypeTypeEEnum = createEEnum(CONCURRENCY_MANAGEMENT_TYPE_TYPE);
>+		concurrentLockTypeTypeEEnum = createEEnum(CONCURRENT_LOCK_TYPE_TYPE);
> 		methodInterfaceTypeEEnum = createEEnum(METHOD_INTERFACE_TYPE);
> 		multiplicityTypeEEnum = createEEnum(MULTIPLICITY_TYPE);
> 		persistenceTypeEEnum = createEEnum(PERSISTENCE_TYPE);
> 		resultTypeMappingTypeEEnum = createEEnum(RESULT_TYPE_MAPPING_TYPE);
> 		sessionTypeEEnum = createEEnum(SESSION_TYPE);
>+		timeUnitTypeTypeEEnum = createEEnum(TIME_UNIT_TYPE_TYPE);
> 		transactionAttributeTypeEEnum = createEEnum(TRANSACTION_ATTRIBUTE_TYPE);
> 		transactionTypeEEnum = createEEnum(TRANSACTION_TYPE);
> 
> 		// Create data types
> 		cmpVersionTypeObjectEDataType = createEDataType(CMP_VERSION_TYPE_OBJECT);
> 		cmrFieldTypeObjectEDataType = createEDataType(CMR_FIELD_TYPE_OBJECT);
>+		concurrencyManagementTypeTypeObjectEDataType = createEDataType(CONCURRENCY_MANAGEMENT_TYPE_TYPE_OBJECT);
>+		concurrentLockTypeTypeObjectEDataType = createEDataType(CONCURRENT_LOCK_TYPE_TYPE_OBJECT);
> 		ejbClassTypeEDataType = createEDataType(EJB_CLASS_TYPE);
> 		ejbNameTypeEDataType = createEDataType(EJB_NAME_TYPE);
> 		methodInterfaceTypeObjectEDataType = createEDataType(METHOD_INTERFACE_TYPE_OBJECT);
>@@ -3401,6 +4235,7 @@
> 		persistenceTypeObjectEDataType = createEDataType(PERSISTENCE_TYPE_OBJECT);
> 		resultTypeMappingTypeObjectEDataType = createEDataType(RESULT_TYPE_MAPPING_TYPE_OBJECT);
> 		sessionTypeObjectEDataType = createEDataType(SESSION_TYPE_OBJECT);
>+		timeUnitTypeTypeObjectEDataType = createEDataType(TIME_UNIT_TYPE_TYPE_OBJECT);
> 		transactionAttributeTypeObjectEDataType = createEDataType(TRANSACTION_ATTRIBUTE_TYPE_OBJECT);
> 		transactionTypeObjectEDataType = createEDataType(TRANSACTION_TYPE_OBJECT);
> 	}
>@@ -3429,30 +4264,44 @@
> 		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(accessTimeoutTypeEClass, AccessTimeoutType.class, "AccessTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getAccessTimeoutType_Timeout(), theXMLTypePackage.getPositiveInteger(), "timeout", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAccessTimeoutType_Unit(), this.getTimeUnitTypeType(), "unit", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAccessTimeoutType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
> 		initEClass(activationConfigEClass, ActivationConfig.class, "ActivationConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getActivationConfig_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getActivationConfig_ActivationConfigProperties(), this.getActivationConfigProperty(), null, "activationConfigProperties", null, 1, -1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getActivationConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getActivationConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(activationConfigPropertyEClass, ActivationConfigProperty.class, "ActivationConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getActivationConfigProperty_ActivationConfigPropertyName(), theXMLTypePackage.getString(), "activationConfigPropertyName", null, 1, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getActivationConfigProperty_ActivationConfigPropertyValue(), theXMLTypePackage.getString(), "activationConfigPropertyValue", null, 1, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getActivationConfigProperty_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getActivationConfigProperty_ActivationConfigPropertyName(), theXMLTypePackage.getString(), "activationConfigPropertyName", null, 1, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getActivationConfigProperty_ActivationConfigPropertyValue(), theXMLTypePackage.getString(), "activationConfigPropertyValue", null, 1, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getActivationConfigProperty_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(applicationExceptionEClass, ApplicationException.class, "ApplicationException", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getApplicationException_ExceptionClass(), theJavaeePackage.getFullyQualifiedClassType(), "exceptionClass", null, 1, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getApplicationException_Rollback(), theJavaeePackage.getTrueFalseType(), "rollback", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getApplicationException_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getApplicationException_ExceptionClass(), theJavaeePackage.getFullyQualifiedClassType(), "exceptionClass", null, 1, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getApplicationException_Rollback(), theJavaeePackage.getTrueFalseType(), "rollback", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getApplicationException_Inherited(), theJavaeePackage.getTrueFalseType(), "inherited", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getApplicationException_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(aroundInvokeTypeEClass, AroundInvokeType.class, "AroundInvokeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getAroundInvokeType_Class(), theJavaeePackage.getFullyQualifiedClassType(), "class", null, 0, 1, AroundInvokeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getAroundInvokeType_MethodName(), theJavaeePackage.getJavaIdentifier(), "methodName", null, 1, 1, AroundInvokeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAroundInvokeType_Class(), theJavaeePackage.getFullyQualifiedClassType(), "class", null, 0, 1, AroundInvokeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAroundInvokeType_MethodName(), theJavaeePackage.getJavaIdentifier(), "methodName", null, 1, 1, AroundInvokeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(aroundTimeoutTypeEClass, AroundTimeoutType.class, "AroundTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getAroundTimeoutType_Class(), theJavaeePackage.getFullyQualifiedClassType(), "class", null, 0, 1, AroundTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAroundTimeoutType_MethodName(), theJavaeePackage.getJavaIdentifier(), "methodName", null, 1, 1, AroundTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(assemblyDescriptorEClass, AssemblyDescriptor.class, "AssemblyDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getAssemblyDescriptor_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>@@ -3462,37 +4311,54 @@
> 		initEReference(getAssemblyDescriptor_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getAssemblyDescriptor_ExcludeList(), this.getExcludeList(), null, "excludeList", null, 0, 1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getAssemblyDescriptor_ApplicationExceptions(), this.getApplicationException(), null, "applicationExceptions", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getAssemblyDescriptor_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAssemblyDescriptor_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(asyncMethodTypeEClass, AsyncMethodType.class, "AsyncMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getAsyncMethodType_MethodName(), theXMLTypePackage.getToken(), "methodName", null, 1, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getAsyncMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAsyncMethodType_MethodIntf(), this.getMethodInterfaceType(), "methodIntf", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getAsyncMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(cmpFieldEClass, CMPField.class, "CMPField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getCMPField_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getCMPField_FieldName(), theJavaeePackage.getJavaIdentifier(), "fieldName", null, 1, 1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getCMPField_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getCMPField_FieldName(), theJavaeePackage.getJavaIdentifier(), "fieldName", null, 1, 1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getCMPField_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(cmrFieldEClass, CMRField.class, "CMRField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getCMRField_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getCMRField_CmrFieldName(), theXMLTypePackage.getToken(), "cmrFieldName", null, 1, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getCMRField_CmrFieldType(), this.getCMRFieldType(), "cmrFieldType", "java.util.Collection", 0, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>-		initEAttribute(getCMRField_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getCMRField_CmrFieldName(), theXMLTypePackage.getToken(), "cmrFieldName", null, 1, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getCMRField_CmrFieldType(), this.getCMRFieldType(), "cmrFieldType", null, 0, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getCMRField_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(concurrentMethodTypeEClass, ConcurrentMethodType.class, "ConcurrentMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getConcurrentMethodType_Method(), this.getNamedMethodType(), null, "method", null, 1, 1, ConcurrentMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConcurrentMethodType_Lock(), this.getConcurrentLockTypeType(), "lock", null, 0, 1, ConcurrentMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getConcurrentMethodType_AccessTimeout(), this.getAccessTimeoutType(), null, "accessTimeout", null, 0, 1, ConcurrentMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getConcurrentMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ConcurrentMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(containerTransactionTypeEClass, ContainerTransactionType.class, "ContainerTransactionType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getContainerTransactionType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getContainerTransactionType_Methods(), this.getMethodType(), null, "methods", null, 1, -1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getContainerTransactionType_TransAttribute(), this.getTransactionAttributeType(), "transAttribute", "NotSupported", 1, 1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>-		initEAttribute(getContainerTransactionType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getContainerTransactionType_TransAttribute(), this.getTransactionAttributeType(), "transAttribute", null, 1, 1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getContainerTransactionType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(dependsOnTypeEClass, DependsOnType.class, "DependsOnType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getDependsOnType_EjbName(), theJavaeePackage.getEJBLink(), "ejbName", null, 1, -1, DependsOnType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getDependsOnType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, DependsOnType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(ejbJarEClass, EJBJar.class, "EJBJar", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getEJBJar_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEJBJar_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEJBJar_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEJBJar_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEJBJar_EnterpriseBeans(), this.getEnterpriseBeans(), null, "enterpriseBeans", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEJBJar_Interceptors(), this.getInterceptorsType(), null, "interceptors", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEJBJar_Relationships(), this.getRelationships(), null, "relationships", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEJBJar_AssemblyDescriptor(), this.getAssemblyDescriptor(), null, "assemblyDescriptor", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEJBJar_EjbClientJar(), theJavaeePackage.getPathType(), "ejbClientJar", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEJBJar_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEJBJar_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEJBJar_Version(), theJavaeePackage.getDeweyVersionType(), "version", "3.0", 1, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>+		initEAttribute(getEJBJar_EjbClientJar(), theJavaeePackage.getPathType(), "ejbClientJar", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEJBJar_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEJBJar_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEJBJar_Version(), theJavaeePackage.getDeweyVersionType(), "version", "3.1", 1, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
> 
> 		initEClass(ejbJarDeploymentDescriptorEClass, EJBJarDeploymentDescriptor.class, "EJBJarDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEAttribute(getEJBJarDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>@@ -3502,44 +4368,44 @@
> 
> 		initEClass(ejbRelationEClass, EJBRelation.class, "EJBRelation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getEJBRelation_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEJBRelation_EjbRelationName(), theXMLTypePackage.getToken(), "ejbRelationName", null, 0, 1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEJBRelation_EjbRelationName(), theXMLTypePackage.getToken(), "ejbRelationName", null, 0, 1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEJBRelation_EjbRelationshipRoles(), this.getEJBRelationshipRole(), null, "ejbRelationshipRoles", null, 2, 2, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEJBRelation_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEJBRelation_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(ejbRelationshipRoleEClass, EJBRelationshipRole.class, "EJBRelationshipRole", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getEJBRelationshipRole_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEJBRelationshipRole_EjbRelationshipRoleName(), theXMLTypePackage.getToken(), "ejbRelationshipRoleName", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEJBRelationshipRole_Multiplicity(), this.getMultiplicityType(), "multiplicity", "One", 1, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>+		initEAttribute(getEJBRelationshipRole_EjbRelationshipRoleName(), theXMLTypePackage.getToken(), "ejbRelationshipRoleName", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEJBRelationshipRole_Multiplicity(), this.getMultiplicityType(), "multiplicity", null, 1, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEJBRelationshipRole_CascadeDelete(), theJavaeePackage.getEmptyType(), null, "cascadeDelete", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEJBRelationshipRole_RelationshipRoleSource(), this.getRelationshipRoleSourceType(), null, "relationshipRoleSource", null, 1, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEJBRelationshipRole_CmrField(), this.getCMRField(), null, "cmrField", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEJBRelationshipRole_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEJBRelationshipRole_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(enterpriseBeansEClass, EnterpriseBeans.class, "EnterpriseBeans", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEAttribute(getEnterpriseBeans_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, EnterpriseBeans.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEnterpriseBeans_SessionBeans(), this.getSessionBean(), null, "sessionBeans", null, 0, -1, EnterpriseBeans.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEnterpriseBeans_EntityBeans(), this.getEntityBean(), null, "entityBeans", null, 0, -1, EnterpriseBeans.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEnterpriseBeans_MessageDrivenBeans(), this.getMessageDrivenBean(), null, "messageDrivenBeans", null, 0, -1, EnterpriseBeans.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEnterpriseBeans_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EnterpriseBeans.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEnterpriseBeans_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EnterpriseBeans.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(entityBeanEClass, EntityBean.class, "EntityBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getEntityBean_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEntityBean_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEntityBean_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEntityBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEntityBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEntityBean_Home(), theJavaeePackage.getHome(), "home", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEntityBean_Remote(), theJavaeePackage.getRemote(), "remote", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEntityBean_LocalHome(), theJavaeePackage.getLocalHome(), "localHome", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEntityBean_Local(), theJavaeePackage.getLocal(), "local", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEntityBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEntityBean_PersistenceType(), this.getPersistenceType(), "persistenceType", "Bean", 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>-		initEAttribute(getEntityBean_PrimKeyClass(), theJavaeePackage.getFullyQualifiedClassType(), "primKeyClass", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEntityBean_Reentrant(), theJavaeePackage.getTrueFalseType(), "reentrant", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEntityBean_CmpVersion(), this.getCmpVersionType(), "cmpVersion", "1.x", 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>-		initEAttribute(getEntityBean_AbstractSchemaName(), theJavaeePackage.getJavaIdentifier(), "abstractSchemaName", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_Home(), theJavaeePackage.getHome(), "home", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_Remote(), theJavaeePackage.getRemote(), "remote", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_LocalHome(), theJavaeePackage.getLocalHome(), "localHome", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_Local(), theJavaeePackage.getLocal(), "local", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_PersistenceType(), this.getPersistenceType(), "persistenceType", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_PrimKeyClass(), theJavaeePackage.getFullyQualifiedClassType(), "primKeyClass", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_Reentrant(), theJavaeePackage.getTrueFalseType(), "reentrant", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_CmpVersion(), this.getCmpVersionType(), "cmpVersion", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_AbstractSchemaName(), theJavaeePackage.getJavaIdentifier(), "abstractSchemaName", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEntityBean_CmpFields(), this.getCMPField(), null, "cmpFields", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEntityBean_PrimkeyField(), theXMLTypePackage.getToken(), "primkeyField", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_PrimkeyField(), theXMLTypePackage.getToken(), "primkeyField", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEntityBean_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEntityBean_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEntityBean_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>@@ -3551,44 +4417,46 @@
> 		initEReference(getEntityBean_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEntityBean_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEntityBean_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getEntityBean_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEntityBean_SecurityRoleRefs(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEntityBean_SecurityIdentity(), this.getSecurityIdentityType(), null, "securityIdentity", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getEntityBean_Queries(), this.getQuery(), null, "queries", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getEntityBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getEntityBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(excludeListEClass, ExcludeList.class, "ExcludeList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getExcludeList_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getExcludeList_Methods(), this.getMethodType(), null, "methods", null, 1, -1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getExcludeList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getExcludeList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(initMethodTypeEClass, InitMethodType.class, "InitMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getInitMethodType_CreateMethod(), this.getNamedMethodType(), null, "createMethod", null, 1, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getInitMethodType_BeanMethod(), this.getNamedMethodType(), null, "beanMethod", null, 1, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getInitMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getInitMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(interceptorBindingTypeEClass, InterceptorBindingType.class, "InterceptorBindingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getInterceptorBindingType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getInterceptorBindingType_EjbName(), theXMLTypePackage.getToken(), "ejbName", null, 1, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getInterceptorBindingType_EjbName(), theXMLTypePackage.getToken(), "ejbName", null, 1, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEAttribute(getInterceptorBindingType_InterceptorClasses(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClasses", null, 0, -1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getInterceptorBindingType_InterceptorOrder(), this.getInterceptorOrderType(), null, "interceptorOrder", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getInterceptorBindingType_ExcludeDefaultInterceptors(), theJavaeePackage.getTrueFalseType(), "excludeDefaultInterceptors", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getInterceptorBindingType_ExcludeClassInterceptors(), theJavaeePackage.getTrueFalseType(), "excludeClassInterceptors", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getInterceptorBindingType_ExcludeDefaultInterceptors(), theJavaeePackage.getTrueFalseType(), "excludeDefaultInterceptors", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getInterceptorBindingType_ExcludeClassInterceptors(), theJavaeePackage.getTrueFalseType(), "excludeClassInterceptors", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getInterceptorBindingType_Method(), this.getNamedMethodType(), null, "method", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getInterceptorBindingType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getInterceptorBindingType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(interceptorOrderTypeEClass, InterceptorOrderType.class, "InterceptorOrderType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEAttribute(getInterceptorOrderType_InterceptorClasses(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClasses", null, 1, -1, InterceptorOrderType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getInterceptorOrderType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorOrderType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getInterceptorOrderType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorOrderType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(interceptorsTypeEClass, InterceptorsType.class, "InterceptorsType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getInterceptorsType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getInterceptorsType_Interceptors(), this.getInterceptorType(), null, "interceptors", null, 1, -1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getInterceptorsType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getInterceptorsType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(interceptorTypeEClass, InterceptorType.class, "InterceptorType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getInterceptorType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getInterceptorType_InterceptorClass(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClass", null, 1, 1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getInterceptorType_InterceptorClass(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClass", null, 1, 1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getInterceptorType_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getInterceptorType_AroundTimeouts(), this.getAroundTimeoutType(), null, "aroundTimeouts", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getInterceptorType_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getInterceptorType_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getInterceptorType_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>@@ -3600,24 +4468,27 @@
> 		initEReference(getInterceptorType_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getInterceptorType_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getInterceptorType_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getInterceptorType_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getInterceptorType_PostActivates(), theJavaeePackage.getLifecycleCallback(), null, "postActivates", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getInterceptorType_PrePassivates(), theJavaeePackage.getLifecycleCallback(), null, "prePassivates", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getInterceptorType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getInterceptorType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(messageDrivenBeanEClass, MessageDrivenBean.class, "MessageDrivenBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getMessageDrivenBean_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMessageDrivenBean_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMessageDrivenBean_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMessageDrivenBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMessageDrivenBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMessageDrivenBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMessageDrivenBean_MessagingType(), theJavaeePackage.getFullyQualifiedClassType(), "messagingType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMessageDrivenBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMessageDrivenBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMessageDrivenBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMessageDrivenBean_MessagingType(), theJavaeePackage.getFullyQualifiedClassType(), "messagingType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMessageDrivenBean_TimeoutMethod(), this.getNamedMethodType(), null, "timeoutMethod", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMessageDrivenBean_TransactionType(), this.getTransactionType(), "transactionType", "Bean", 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>-		initEAttribute(getMessageDrivenBean_MessageDestinationType(), theJavaeePackage.getMessageDestinationTypeType(), "messageDestinationType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMessageDrivenBean_MessageDestinationLink(), theJavaeePackage.getMessageDestinationLink(), "messageDestinationLink", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getMessageDrivenBean_Timer(), this.getTimerType(), null, "timer", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMessageDrivenBean_TransactionType(), this.getTransactionType(), "transactionType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMessageDrivenBean_MessageDestinationType(), theJavaeePackage.getMessageDestinationTypeType(), "messageDestinationType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMessageDrivenBean_MessageDestinationLink(), theJavaeePackage.getMessageDestinationLink(), "messageDestinationLink", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMessageDrivenBean_ActivationConfig(), this.getActivationConfig(), null, "activationConfig", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMessageDrivenBean_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getMessageDrivenBean_AroundTimeouts(), this.getAroundTimeoutType(), null, "aroundTimeouts", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMessageDrivenBean_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMessageDrivenBean_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMessageDrivenBean_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>@@ -3629,86 +4500,100 @@
> 		initEReference(getMessageDrivenBean_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMessageDrivenBean_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMessageDrivenBean_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getMessageDrivenBean_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getMessageDrivenBean_SecurityRoleRef(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRef", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMessageDrivenBean_SecurityIdentity(), this.getSecurityIdentityType(), null, "securityIdentity", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMessageDrivenBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMessageDrivenBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(methodParamsEClass, MethodParams.class, "MethodParams", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEAttribute(getMethodParams_MethodParams(), theJavaeePackage.getJavaType(), "methodParams", null, 0, -1, MethodParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMethodParams_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMethodParams_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(methodPermissionEClass, MethodPermission.class, "MethodPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getMethodPermission_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEAttribute(getMethodPermission_RoleNames(), theJavaeePackage.getRoleName(), "roleNames", null, 0, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMethodPermission_Unchecked(), theJavaeePackage.getEmptyType(), null, "unchecked", null, 0, 1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMethodPermission_Methods(), this.getMethodType(), null, "methods", null, 1, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMethodPermission_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMethodPermission_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(methodTypeEClass, MethodType.class, "MethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getMethodType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMethodType_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMethodType_MethodIntf(), this.getMethodInterfaceType(), "methodIntf", "Home", 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>-		initEAttribute(getMethodType_MethodName(), this.getMethodNameType(), "methodName", null, 1, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMethodType_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMethodType_MethodIntf(), this.getMethodInterfaceType(), "methodIntf", null, 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMethodType_MethodName(), this.getMethodNameType(), "methodName", null, 1, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(namedMethodTypeEClass, NamedMethodType.class, "NamedMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getNamedMethodType_MethodName(), theXMLTypePackage.getToken(), "methodName", null, 1, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getNamedMethodType_MethodName(), theXMLTypePackage.getToken(), "methodName", null, 1, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getNamedMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getNamedMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getNamedMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(queryEClass, Query.class, "Query", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getQuery_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getQuery_QueryMethod(), this.getQueryMethod(), null, "queryMethod", null, 1, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getQuery_ResultTypeMapping(), this.getResultTypeMappingType(), "resultTypeMapping", "Local", 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>-		initEAttribute(getQuery_EjbQl(), theXMLTypePackage.getString(), "ejbQl", null, 1, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getQuery_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getQuery_ResultTypeMapping(), this.getResultTypeMappingType(), "resultTypeMapping", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getQuery_EjbQl(), theXMLTypePackage.getString(), "ejbQl", null, 1, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getQuery_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(queryMethodEClass, QueryMethod.class, "QueryMethod", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>-		initEAttribute(getQueryMethod_MethodName(), this.getMethodNameType(), "methodName", null, 1, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getQueryMethod_MethodName(), this.getMethodNameType(), "methodName", null, 1, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getQueryMethod_MethodParams(), this.getMethodParams(), null, "methodParams", null, 1, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getQueryMethod_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getQueryMethod_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(relationshipRoleSourceTypeEClass, RelationshipRoleSourceType.class, "RelationshipRoleSourceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getRelationshipRoleSourceType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getRelationshipRoleSourceType_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getRelationshipRoleSourceType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getRelationshipRoleSourceType_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getRelationshipRoleSourceType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(relationshipsEClass, Relationships.class, "Relationships", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getRelationships_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getRelationships_EjbRelations(), this.getEJBRelation(), null, "ejbRelations", null, 1, -1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getRelationships_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getRelationships_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(removeMethodTypeEClass, RemoveMethodType.class, "RemoveMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getRemoveMethodType_BeanMethod(), this.getNamedMethodType(), null, "beanMethod", null, 1, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getRemoveMethodType_RetainIfException(), theJavaeePackage.getTrueFalseType(), "retainIfException", null, 0, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getRemoveMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getRemoveMethodType_RetainIfException(), theJavaeePackage.getTrueFalseType(), "retainIfException", null, 0, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getRemoveMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(securityIdentityTypeEClass, SecurityIdentityType.class, "SecurityIdentityType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getSecurityIdentityType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSecurityIdentityType_UseCallerIdentity(), theJavaeePackage.getEmptyType(), null, "useCallerIdentity", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSecurityIdentityType_RunAs(), theJavaeePackage.getRunAs(), null, "runAs", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSecurityIdentityType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSecurityIdentityType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		initEClass(sessionBeanEClass, SessionBean.class, "SessionBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEReference(getSessionBean_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSessionBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSessionBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSessionBean_Home(), theJavaeePackage.getHome(), "home", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSessionBean_Remote(), theJavaeePackage.getRemote(), "remote", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSessionBean_LocalHome(), theJavaeePackage.getLocalHome(), "localHome", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSessionBean_Local(), theJavaeePackage.getLocal(), "local", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_Home(), theJavaeePackage.getHome(), "home", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_Remote(), theJavaeePackage.getRemote(), "remote", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_LocalHome(), theJavaeePackage.getLocalHome(), "localHome", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_Local(), theJavaeePackage.getLocal(), "local", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEAttribute(getSessionBean_BusinessLocals(), theJavaeePackage.getFullyQualifiedClassType(), "businessLocals", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEAttribute(getSessionBean_BusinessRemotes(), theJavaeePackage.getFullyQualifiedClassType(), "businessRemotes", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSessionBean_ServiceEndpoint(), theJavaeePackage.getFullyQualifiedClassType(), "serviceEndpoint", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSessionBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSessionBean_SessionType(), this.getSessionType(), "sessionType", "Stateful", 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>+		initEReference(getSessionBean_LocalBean(), theJavaeePackage.getEmptyType(), null, "localBean", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_ServiceEndpoint(), theJavaeePackage.getFullyQualifiedClassType(), "serviceEndpoint", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_SessionType(), this.getSessionType(), "sessionType", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSessionBean_StatefulTimeout(), this.getStatefulTimeoutType(), null, "statefulTimeout", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_TimeoutMethod(), this.getNamedMethodType(), null, "timeoutMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSessionBean_Timer(), this.getTimerType(), null, "timer", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_InitOnStartup(), theJavaeePackage.getTrueFalseType(), "initOnStartup", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_ConcurrencyManagementType(), this.getConcurrencyManagementTypeType(), "concurrencyManagementType", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSessionBean_ConcurrentMethod(), this.getConcurrentMethodType(), null, "concurrentMethod", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSessionBean_DependsOn(), this.getDependsOnType(), null, "dependsOn", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_InitMethods(), this.getInitMethodType(), null, "initMethods", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_RemoveMethods(), this.getRemoveMethodType(), null, "removeMethods", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSessionBean_TransactionType(), this.getTransactionType(), "transactionType", "Bean", 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
>+		initEReference(getSessionBean_AsyncMethod(), this.getAsyncMethodType(), null, "asyncMethod", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_TransactionType(), this.getTransactionType(), "transactionType", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSessionBean_AfterBeginMethod(), this.getNamedMethodType(), null, "afterBeginMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSessionBean_BeforeCompletionMethod(), this.getNamedMethodType(), null, "beforeCompletionMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSessionBean_AfterCompletionMethod(), this.getNamedMethodType(), null, "afterCompletionMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSessionBean_AroundTimeouts(), this.getAroundTimeoutType(), null, "aroundTimeouts", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>@@ -3720,11 +4605,38 @@
> 		initEReference(getSessionBean_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getSessionBean_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_PostActivates(), theJavaeePackage.getLifecycleCallback(), null, "postActivates", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_PrePassivates(), theJavaeePackage.getLifecycleCallback(), null, "prePassivates", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_SecurityRoleRefs(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 		initEReference(getSessionBean_SecurityIdentities(), this.getSecurityIdentityType(), null, "securityIdentities", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>-		initEAttribute(getSessionBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getSessionBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(statefulTimeoutTypeEClass, StatefulTimeoutType.class, "StatefulTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getStatefulTimeoutType_Timeout(), theXMLTypePackage.getPositiveInteger(), "timeout", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getStatefulTimeoutType_Unit(), this.getTimeUnitTypeType(), "unit", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getStatefulTimeoutType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(timerScheduleTypeEClass, TimerScheduleType.class, "TimerScheduleType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEAttribute(getTimerScheduleType_Second(), theXMLTypePackage.getToken(), "second", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerScheduleType_Minute(), theXMLTypePackage.getToken(), "minute", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerScheduleType_Hour(), theXMLTypePackage.getToken(), "hour", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerScheduleType_DayOfMonth(), theXMLTypePackage.getToken(), "dayOfMonth", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerScheduleType_Month(), theXMLTypePackage.getToken(), "month", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerScheduleType_DayOfWeek(), theXMLTypePackage.getToken(), "dayOfWeek", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerScheduleType_Year(), theXMLTypePackage.getToken(), "year", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerScheduleType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+
>+		initEClass(timerTypeEClass, TimerType.class, "TimerType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEReference(getTimerType_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getTimerType_Schedule(), this.getTimerScheduleType(), null, "schedule", null, 1, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerType_Start(), theXMLTypePackage.getDateTime(), "start", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerType_End(), theXMLTypePackage.getDateTime(), "end", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEReference(getTimerType_TimeoutMethod(), this.getNamedMethodType(), null, "timeoutMethod", null, 1, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerType_Persistent(), theJavaeePackage.getTrueFalseType(), "persistent", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerType_Timezone(), theXMLTypePackage.getToken(), "timezone", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerType_Info(), theXMLTypePackage.getToken(), "info", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
>+		initEAttribute(getTimerType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
> 
> 		// Initialize enums and add enum literals
> 		initEEnum(cmpVersionTypeEEnum, CmpVersionType.class, "CmpVersionType"); //$NON-NLS-1$
>@@ -3735,12 +4647,23 @@
> 		addEEnumLiteral(cmrFieldTypeEEnum, CMRFieldType.JAVA_UTIL_COLLECTION_LITERAL);
> 		addEEnumLiteral(cmrFieldTypeEEnum, CMRFieldType.JAVA_UTIL_SET_LITERAL);
> 
>+		initEEnum(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.class, "ConcurrencyManagementTypeType"); //$NON-NLS-1$
>+		addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.BEAN);
>+		addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.CONTAINER);
>+		addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.NOT_ALLOWED);
>+
>+		initEEnum(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.class, "ConcurrentLockTypeType"); //$NON-NLS-1$
>+		addEEnumLiteral(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.READ);
>+		addEEnumLiteral(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.WRITE);
>+
> 		initEEnum(methodInterfaceTypeEEnum, MethodInterfaceType.class, "MethodInterfaceType"); //$NON-NLS-1$
> 		addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.HOME_LITERAL);
> 		addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.REMOTE_LITERAL);
> 		addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.LOCAL_HOME_LITERAL);
> 		addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.LOCAL_LITERAL);
> 		addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.SERVICE_ENDPOINT_LITERAL);
>+		addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.TIMER_LITERAL);
>+		addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.MESSAGE_ENDPOINT_LITERAL);
> 
> 		initEEnum(multiplicityTypeEEnum, MultiplicityType.class, "MultiplicityType"); //$NON-NLS-1$
> 		addEEnumLiteral(multiplicityTypeEEnum, MultiplicityType.ONE_LITERAL);
>@@ -3755,9 +4678,19 @@
> 		addEEnumLiteral(resultTypeMappingTypeEEnum, ResultTypeMappingType.REMOTE_LITERAL);
> 
> 		initEEnum(sessionTypeEEnum, SessionType.class, "SessionType"); //$NON-NLS-1$
>+		addEEnumLiteral(sessionTypeEEnum, SessionType.SINGLETON_LITERAL);
> 		addEEnumLiteral(sessionTypeEEnum, SessionType.STATEFUL_LITERAL);
> 		addEEnumLiteral(sessionTypeEEnum, SessionType.STATELESS_LITERAL);
> 
>+		initEEnum(timeUnitTypeTypeEEnum, TimeUnitTypeType.class, "TimeUnitTypeType"); //$NON-NLS-1$
>+		addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.DAYS);
>+		addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.HOURS);
>+		addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.MINUTES);
>+		addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.SECONDS);
>+		addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.MILLISECONDS);
>+		addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.MICROSECONDS);
>+		addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.NANOSECONDS);
>+
> 		initEEnum(transactionAttributeTypeEEnum, TransactionAttributeType.class, "TransactionAttributeType"); //$NON-NLS-1$
> 		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.NOT_SUPPORTED_LITERAL);
> 		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.SUPPORTS_LITERAL);
>@@ -3773,6 +4706,8 @@
> 		// Initialize data types
> 		initEDataType(cmpVersionTypeObjectEDataType, CmpVersionType.class, "CmpVersionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEDataType(cmrFieldTypeObjectEDataType, CMRFieldType.class, "CMRFieldTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(concurrencyManagementTypeTypeObjectEDataType, ConcurrencyManagementTypeType.class, "ConcurrencyManagementTypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(concurrentLockTypeTypeObjectEDataType, ConcurrentLockTypeType.class, "ConcurrentLockTypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEDataType(ejbClassTypeEDataType, String.class, "EjbClassType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEDataType(ejbNameTypeEDataType, String.class, "EjbNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEDataType(methodInterfaceTypeObjectEDataType, MethodInterfaceType.class, "MethodInterfaceTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>@@ -3781,6 +4716,7 @@
> 		initEDataType(persistenceTypeObjectEDataType, PersistenceType.class, "PersistenceTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEDataType(resultTypeMappingTypeObjectEDataType, ResultTypeMappingType.class, "ResultTypeMappingTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEDataType(sessionTypeObjectEDataType, SessionType.class, "SessionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
>+		initEDataType(timeUnitTypeTypeObjectEDataType, TimeUnitTypeType.class, "TimeUnitTypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEDataType(transactionAttributeTypeObjectEDataType, TransactionAttributeType.class, "TransactionAttributeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 		initEDataType(transactionTypeObjectEDataType, TransactionType.class, "TransactionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
> 
>@@ -3801,6 +4737,36 @@
> 	protected void createExtendedMetaDataAnnotations() {
> 		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$				
> 		addAnnotation
>+		 (accessTimeoutTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "access-timeoutType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAccessTimeoutType_Timeout(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "timeout", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAccessTimeoutType_Unit(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "unit", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAccessTimeoutType_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (activationConfigEClass, 
> 		 source, 
> 		 new String[] {
>@@ -3882,6 +4848,14 @@
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "rollback", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getApplicationException_Inherited(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "inherited", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getApplicationException_Id(), 
>@@ -3914,6 +4888,29 @@
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>+		 (aroundTimeoutTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "around-timeoutType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAroundTimeoutType_Class(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "class", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAroundTimeoutType_MethodName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "method-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (assemblyDescriptorEClass, 
> 		 source, 
> 		 new String[] {
>@@ -3984,6 +4981,44 @@
> 			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>+		 (asyncMethodTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "async-methodType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAsyncMethodType_MethodName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "method-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAsyncMethodType_MethodParams(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "method-params", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAsyncMethodType_MethodIntf(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "method-intf", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getAsyncMethodType_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (cmpFieldEClass, 
> 		 source, 
> 		 new String[] {
>@@ -4078,6 +5113,70 @@
> 			 "baseType", "cmr-field-typeType" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>+		 (concurrencyManagementTypeTypeEEnum, 
>+		 source, 
>+		 new String[] {
>+			 "name", "concurrency-management-typeType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (concurrencyManagementTypeTypeObjectEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "concurrency-management-typeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "concurrency-management-typeType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (concurrentLockTypeTypeEEnum, 
>+		 source, 
>+		 new String[] {
>+			 "name", "concurrent-lock-typeType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (concurrentLockTypeTypeObjectEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "concurrent-lock-typeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "concurrent-lock-typeType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (concurrentMethodTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "concurrent-methodType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConcurrentMethodType_Method(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "method", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConcurrentMethodType_Lock(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "lock", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConcurrentMethodType_AccessTimeout(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "access-timeout", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getConcurrentMethodType_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (containerTransactionTypeEClass, 
> 		 source, 
> 		 new String[] {
>@@ -4116,6 +5215,28 @@
> 			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>+		 (dependsOnTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "depends-onType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getDependsOnType_EjbName(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "ejb-name", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getDependsOnType_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (ejbClassTypeEDataType, 
> 		 source, 
> 		 new String[] {
>@@ -4152,6 +5273,14 @@
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getEJBJar_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
> 		 (getEJBJar_EnterpriseBeans(), 
>@@ -4637,6 +5766,14 @@
> 			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>+		 (getEntityBean_DataSource(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "data-source", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
> 		 (getEntityBean_SecurityRoleRefs(), 
> 		 source, 
> 		 new String[] {
>@@ -4881,6 +6018,14 @@
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>+		 (getInterceptorType_AroundTimeouts(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "around-timeout", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
> 		 (getInterceptorType_EnvEntries(), 
> 		 source, 
> 		 new String[] {
>@@ -4961,11 +6106,19 @@
> 			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>-		 (getInterceptorType_PreDestroys(), 
>+		 (getInterceptorType_PreDestroys(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "pre-destroy", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getInterceptorType_DataSource(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>-			 "name", "pre-destroy", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "data-source", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>@@ -5053,7 +6206,7 @@
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "messaging-type", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });		
>+		 });			
> 		addAnnotation
> 		 (getMessageDrivenBean_TimeoutMethod(), 
> 		 source, 
>@@ -5063,6 +6216,14 @@
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>+		 (getMessageDrivenBean_Timer(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "timer", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
> 		 (getMessageDrivenBean_TransactionType(), 
> 		 source, 
> 		 new String[] {
>@@ -5103,6 +6264,14 @@
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>+		 (getMessageDrivenBean_AroundTimeouts(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "around-timeout", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
> 		 (getMessageDrivenBean_EnvEntries(), 
> 		 source, 
> 		 new String[] {
>@@ -5191,6 +6360,22 @@
> 			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>+		 (getMessageDrivenBean_DataSource(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "data-source", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getMessageDrivenBean_SecurityRoleRef(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "security-role-ref", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
> 		 (getMessageDrivenBean_SecurityIdentity(), 
> 		 source, 
> 		 new String[] {
>@@ -5210,7 +6395,7 @@
> 		 source, 
> 		 new String[] {
> 			 "name", "method-intfType" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });		
>+		 });				
> 		addAnnotation
> 		 (methodInterfaceTypeObjectEDataType, 
> 		 source, 
>@@ -5715,6 +6900,14 @@
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>+		 (getSessionBean_LocalBean(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "local-bean", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (getSessionBean_ServiceEndpoint(), 
> 		 source, 
> 		 new String[] {
>@@ -5739,12 +6932,60 @@
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>+		 (getSessionBean_StatefulTimeout(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "stateful-timeout", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (getSessionBean_TimeoutMethod(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "timeout-method", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getSessionBean_Timer(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "timer", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getSessionBean_InitOnStartup(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "init-on-startup", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getSessionBean_ConcurrencyManagementType(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "concurrency-management-type", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getSessionBean_ConcurrentMethod(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "concurrent-method", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getSessionBean_DependsOn(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "depends-on", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
> 		 (getSessionBean_InitMethods(), 
>@@ -5763,12 +7004,44 @@
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>+		 (getSessionBean_AsyncMethod(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "async-method", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
> 		 (getSessionBean_TransactionType(), 
> 		 source, 
> 		 new String[] {
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "transaction-type", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getSessionBean_AfterBeginMethod(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "after-begin-method", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getSessionBean_BeforeCompletionMethod(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "before-completion-method", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getSessionBean_AfterCompletionMethod(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "after-completion-method", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getSessionBean_AroundInvokes(), 
>@@ -5777,6 +7050,14 @@
> 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "name", "around-invoke", //$NON-NLS-1$ //$NON-NLS-2$
> 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (getSessionBean_AroundTimeouts(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "around-timeout", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
> 		 (getSessionBean_EnvEntries(), 
>@@ -5867,6 +7148,14 @@
> 			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });		
> 		addAnnotation
>+		 (getSessionBean_DataSource(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "data-source", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
> 		 (getSessionBean_PostActivates(), 
> 		 source, 
> 		 new String[] {
>@@ -5910,7 +7199,7 @@
> 		 source, 
> 		 new String[] {
> 			 "name", "session-typeType" //$NON-NLS-1$ //$NON-NLS-2$
>-		 });		
>+		 });			
> 		addAnnotation
> 		 (sessionTypeObjectEDataType, 
> 		 source, 
>@@ -5919,6 +7208,197 @@
> 			 "baseType", "session-typeType" //$NON-NLS-1$ //$NON-NLS-2$
> 		 });			
> 		addAnnotation
>+		 (statefulTimeoutTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "stateful-timeoutType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getStatefulTimeoutType_Timeout(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "timeout", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getStatefulTimeoutType_Unit(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "unit", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getStatefulTimeoutType_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (timerScheduleTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "timer-scheduleType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerScheduleType_Second(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "second", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerScheduleType_Minute(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "minute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerScheduleType_Hour(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "hour", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerScheduleType_DayOfMonth(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "day-of-month", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerScheduleType_Month(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "month", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerScheduleType_DayOfWeek(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "day-of-week", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerScheduleType_Year(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "year", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerScheduleType_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (timerTypeEClass, 
>+		 source, 
>+		 new String[] {
>+			 "name", "timerType", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerType_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
>+		 (getTimerType_Schedule(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "schedule", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerType_Start(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "start", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerType_End(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "end", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerType_TimeoutMethod(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "timeout-method", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerType_Persistent(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "persistent", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerType_Timezone(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "timezone", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerType_Info(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "info", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (getTimerType_Id(), 
>+		 source, 
>+		 new String[] {
>+			 "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
>+		 (timeUnitTypeTypeEEnum, 
>+		 source, 
>+		 new String[] {
>+			 "name", "time-unit-typeType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });		
>+		addAnnotation
>+		 (timeUnitTypeTypeObjectEDataType, 
>+		 source, 
>+		 new String[] {
>+			 "name", "time-unit-typeType:Object", //$NON-NLS-1$ //$NON-NLS-2$
>+			 "baseType", "time-unit-typeType" //$NON-NLS-1$ //$NON-NLS-2$
>+		 });			
>+		addAnnotation
> 		 (transactionAttributeTypeEEnum, 
> 		 source, 
> 		 new String[] {
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SecurityIdentityTypeImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SecurityIdentityTypeImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 SecurityIdentityTypeImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SecurityIdentityTypeImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SecurityIdentityTypeImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -60,7 +60,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getUseCallerIdentity() Use Caller Identity}' containment reference.
>@@ -70,7 +70,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EmptyType useCallerIdentity = null;
>+	protected EmptyType useCallerIdentity;
> 
> 	/**
> 	 * The cached value of the '{@link #getRunAs() Run As}' containment reference.
>@@ -80,7 +80,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected RunAs runAs = null;
>+	protected RunAs runAs;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -126,9 +126,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.SECURITY_IDENTITY_TYPE__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.SECURITY_IDENTITY_TYPE__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -249,7 +249,7 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.SECURITY_IDENTITY_TYPE__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY:
> 				return basicSetUseCallerIdentity(null, msgs);
> 			case EjbPackage.SECURITY_IDENTITY_TYPE__RUN_AS:
>@@ -283,12 +283,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.SECURITY_IDENTITY_TYPE__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.SECURITY_IDENTITY_TYPE__USE_CALLER_IDENTITY:
> 				setUseCallerIdentity((EmptyType)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ExcludeListImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ExcludeListImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ExcludeListImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ExcludeListImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ExcludeListImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -58,7 +58,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getMethods() Methods}' containment reference list.
>@@ -68,7 +68,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList methods = null;
>+	protected EList<MethodType> methods;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -114,9 +114,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EXCLUDE_LIST__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.EXCLUDE_LIST__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -126,9 +126,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMethods() {
>+	public List<MethodType> getMethods() {
> 		if (methods == null) {
>-			methods = new EObjectContainmentEList(MethodType.class, this, EjbPackage.EXCLUDE_LIST__METHODS);
>+			methods = new EObjectContainmentEList<MethodType>(MethodType.class, this, EjbPackage.EXCLUDE_LIST__METHODS);
> 		}
> 		return methods;
> 	}
>@@ -163,9 +163,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.EXCLUDE_LIST__METHODS:
>-				return ((InternalEList)getMethods()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMethods()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -193,16 +193,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.EXCLUDE_LIST__METHODS:
> 				getMethods().clear();
>-				getMethods().addAll((Collection)newValue);
>+				getMethods().addAll((Collection<? extends MethodType>)newValue);
> 				return;
> 			case EjbPackage.EXCLUDE_LIST__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ActivationConfigImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ActivationConfigImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ActivationConfigImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ActivationConfigImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ActivationConfigImpl.java	14 Oct 2009 21:48:07 -0000
>@@ -58,7 +58,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getActivationConfigProperties() Activation Config Properties}' containment reference list.
>@@ -68,7 +68,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList activationConfigProperties = null;
>+	protected EList<ActivationConfigProperty> activationConfigProperties;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -114,9 +114,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -126,9 +126,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getActivationConfigProperties() {
>+	public List<ActivationConfigProperty> getActivationConfigProperties() {
> 		if (activationConfigProperties == null) {
>-			activationConfigProperties = new EObjectContainmentEList(ActivationConfigProperty.class, this, EjbPackage.ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES);
>+			activationConfigProperties = new EObjectContainmentEList<ActivationConfigProperty>(ActivationConfigProperty.class, this, EjbPackage.ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES);
> 		}
> 		return activationConfigProperties;
> 	}
>@@ -163,9 +163,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES:
>-				return ((InternalEList)getActivationConfigProperties()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getActivationConfigProperties()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -193,16 +193,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.ACTIVATION_CONFIG__ACTIVATION_CONFIG_PROPERTIES:
> 				getActivationConfigProperties().clear();
>-				getActivationConfigProperties().addAll((Collection)newValue);
>+				getActivationConfigProperties().addAll((Collection<? extends ActivationConfigProperty>)newValue);
> 				return;
> 			case EjbPackage.ACTIVATION_CONFIG__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 QueryImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryImpl.java	9 Jun 2009 19:37:06 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/QueryImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -53,7 +53,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Description description = null;
>+	protected Description description;
> 
> 	/**
> 	 * The cached value of the '{@link #getQueryMethod() Query Method}' containment reference.
>@@ -63,7 +63,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected QueryMethod queryMethod = null;
>+	protected QueryMethod queryMethod;
> 
> 	/**
> 	 * The default value of the '{@link #getResultTypeMapping() Result Type Mapping}' attribute.
>@@ -92,7 +92,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean resultTypeMappingESet = false;
>+	protected boolean resultTypeMappingESet;
> 
> 	/**
> 	 * The default value of the '{@link #getEjbQl() Ejb Ql}' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorsTypeImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorsTypeImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 InterceptorsTypeImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorsTypeImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorsTypeImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -58,7 +58,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getInterceptors() Interceptors}' containment reference list.
>@@ -68,7 +68,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList interceptors = null;
>+	protected EList<InterceptorType> interceptors;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -114,9 +114,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.INTERCEPTORS_TYPE__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.INTERCEPTORS_TYPE__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -126,9 +126,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInterceptors() {
>+	public List<InterceptorType> getInterceptors() {
> 		if (interceptors == null) {
>-			interceptors = new EObjectContainmentEList(InterceptorType.class, this, EjbPackage.INTERCEPTORS_TYPE__INTERCEPTORS);
>+			interceptors = new EObjectContainmentEList<InterceptorType>(InterceptorType.class, this, EjbPackage.INTERCEPTORS_TYPE__INTERCEPTORS);
> 		}
> 		return interceptors;
> 	}
>@@ -163,9 +163,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.INTERCEPTORS_TYPE__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.INTERCEPTORS_TYPE__INTERCEPTORS:
>-				return ((InternalEList)getInterceptors()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInterceptors()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -193,16 +193,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.INTERCEPTORS_TYPE__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTORS_TYPE__INTERCEPTORS:
> 				getInterceptors().clear();
>-				getInterceptors().addAll((Collection)newValue);
>+				getInterceptors().addAll((Collection<? extends InterceptorType>)newValue);
> 				return;
> 			case EjbPackage.INTERCEPTORS_TYPE__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ContainerTransactionTypeImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ContainerTransactionTypeImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ContainerTransactionTypeImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ContainerTransactionTypeImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ContainerTransactionTypeImpl.java	14 Oct 2009 21:48:07 -0000
>@@ -60,7 +60,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getMethods() Methods}' containment reference list.
>@@ -70,7 +70,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList methods = null;
>+	protected EList<MethodType> methods;
> 
> 	/**
> 	 * The default value of the '{@link #getTransAttribute() Trans Attribute}' attribute.
>@@ -99,7 +99,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean transAttributeESet = false;
>+	protected boolean transAttributeESet;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -145,9 +145,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -157,9 +157,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMethods() {
>+	public List<MethodType> getMethods() {
> 		if (methods == null) {
>-			methods = new EObjectContainmentEList(MethodType.class, this, EjbPackage.CONTAINER_TRANSACTION_TYPE__METHODS);
>+			methods = new EObjectContainmentEList<MethodType>(MethodType.class, this, EjbPackage.CONTAINER_TRANSACTION_TYPE__METHODS);
> 		}
> 		return methods;
> 	}
>@@ -240,9 +240,9 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.CONTAINER_TRANSACTION_TYPE__METHODS:
>-				return ((InternalEList)getMethods()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMethods()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -272,16 +272,17 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.CONTAINER_TRANSACTION_TYPE__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.CONTAINER_TRANSACTION_TYPE__METHODS:
> 				getMethods().clear();
>-				getMethods().addAll((Collection)newValue);
>+				getMethods().addAll((Collection<? extends MethodType>)newValue);
> 				return;
> 			case EjbPackage.CONTAINER_TRANSACTION_TYPE__TRANS_ATTRIBUTE:
> 				setTransAttribute((TransactionAttributeType)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodParamsImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodParamsImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 MethodParamsImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodParamsImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/MethodParamsImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -51,7 +51,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList methodParams = null;
>+	protected EList<String> methodParams;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -97,9 +97,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMethodParams() {
>+	public List<String> getMethodParams() {
> 		if (methodParams == null) {
>-			methodParams = new EDataTypeEList(String.class, this, EjbPackage.METHOD_PARAMS__METHOD_PARAMS);
>+			methodParams = new EDataTypeEList<String>(String.class, this, EjbPackage.METHOD_PARAMS__METHOD_PARAMS);
> 		}
> 		return methodParams;
> 	}
>@@ -146,12 +146,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.METHOD_PARAMS__METHOD_PARAMS:
> 				getMethodParams().clear();
>-				getMethodParams().addAll((Collection)newValue);
>+				getMethodParams().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case EjbPackage.METHOD_PARAMS__ID:
> 				setId((String)newValue);
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SessionBeanImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SessionBeanImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 SessionBeanImpl.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SessionBeanImpl.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/SessionBeanImpl.java	14 Oct 2009 21:48:08 -0000
>@@ -28,10 +28,12 @@
> 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.DisplayName;
> import org.eclipse.jst.javaee.core.EjbLocalRef;
> import org.eclipse.jst.javaee.core.EjbRef;
>+import org.eclipse.jst.javaee.core.EmptyType;
> import org.eclipse.jst.javaee.core.EnvEntry;
> import org.eclipse.jst.javaee.core.Icon;
> import org.eclipse.jst.javaee.core.LifecycleCallback;
>@@ -44,12 +46,19 @@
> import org.eclipse.jst.javaee.core.ServiceRef;
> 
> import org.eclipse.jst.javaee.ejb.AroundInvokeType;
>+import org.eclipse.jst.javaee.ejb.AroundTimeoutType;
>+import org.eclipse.jst.javaee.ejb.AsyncMethodType;
>+import org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType;
>+import org.eclipse.jst.javaee.ejb.ConcurrentMethodType;
>+import org.eclipse.jst.javaee.ejb.DependsOnType;
> import org.eclipse.jst.javaee.ejb.InitMethodType;
> import org.eclipse.jst.javaee.ejb.NamedMethodType;
> import org.eclipse.jst.javaee.ejb.RemoveMethodType;
> import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
> import org.eclipse.jst.javaee.ejb.SessionBean;
> import org.eclipse.jst.javaee.ejb.SessionType;
>+import org.eclipse.jst.javaee.ejb.StatefulTimeoutType;
>+import org.eclipse.jst.javaee.ejb.TimerType;
> import org.eclipse.jst.javaee.ejb.TransactionType;
> 
> import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>@@ -72,14 +81,26 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getLocal Local}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getBusinessLocals Business Locals}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getBusinessRemotes Business Remotes}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getLocalBean Local Bean}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getServiceEndpoint Service Endpoint}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getEjbClass Ejb Class}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getSessionType Session Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getStatefulTimeout Stateful Timeout}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getTimeoutMethod Timeout Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getTimer Timer}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#isInitOnStartup Init On Startup}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getConcurrencyManagementType Concurrency Management Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getConcurrentMethod Concurrent Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getDependsOn Depends On}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getInitMethods Init Methods}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getRemoveMethods Remove Methods}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getAsyncMethod Async Method}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getTransactionType Transaction Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getAfterBeginMethod After Begin Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getBeforeCompletionMethod Before Completion Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getAfterCompletionMethod After Completion Method}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getAroundInvokes Around Invokes}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getAroundTimeouts Around Timeouts}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getEnvEntries Env Entries}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getEjbRefs Ejb Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getEjbLocalRefs Ejb Local Refs}</li>
>@@ -91,6 +112,7 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getPersistenceUnitRefs Persistence Unit Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getPostConstructs Post Constructs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getPreDestroys Pre Destroys}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getDataSource Data Source}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getPostActivates Post Activates}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getPrePassivates Pre Passivates}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.SessionBeanImpl#getSecurityRoleRefs Security Role Refs}</li>
>@@ -110,7 +132,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList descriptions = null;
>+	protected EList<Description> descriptions;
> 
> 	/**
> 	 * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list.
>@@ -120,7 +142,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList displayNames = null;
>+	protected EList<DisplayName> displayNames;
> 
> 	/**
> 	 * The cached value of the '{@link #getIcons() Icons}' containment reference list.
>@@ -130,7 +152,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList icons = null;
>+	protected EList<Icon> icons;
> 
> 	/**
> 	 * The default value of the '{@link #getEjbName() Ejb Name}' attribute.
>@@ -260,7 +282,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList businessLocals = null;
>+	protected EList<String> businessLocals;
> 
> 	/**
> 	 * The cached value of the '{@link #getBusinessRemotes() Business Remotes}' attribute list.
>@@ -270,7 +292,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList businessRemotes = null;
>+	protected EList<String> businessRemotes;
>+
>+	/**
>+	 * The cached value of the '{@link #getLocalBean() Local Bean}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getLocalBean()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EmptyType localBean;
> 
> 	/**
> 	 * The default value of the '{@link #getServiceEndpoint() Service Endpoint}' attribute.
>@@ -320,7 +352,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected static final SessionType SESSION_TYPE_EDEFAULT = SessionType.STATEFUL_LITERAL;
>+	protected static final SessionType SESSION_TYPE_EDEFAULT = SessionType.SINGLETON_LITERAL;
> 
> 	/**
> 	 * The cached value of the '{@link #getSessionType() Session Type}' attribute.
>@@ -339,7 +371,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean sessionTypeESet = false;
>+	protected boolean sessionTypeESet;
>+
>+	/**
>+	 * The cached value of the '{@link #getStatefulTimeout() Stateful Timeout}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getStatefulTimeout()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected StatefulTimeoutType statefulTimeout;
> 
> 	/**
> 	 * The cached value of the '{@link #getTimeoutMethod() Timeout Method}' containment reference.
>@@ -349,7 +391,95 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected NamedMethodType timeoutMethod = null;
>+	protected NamedMethodType timeoutMethod;
>+
>+	/**
>+	 * The cached value of the '{@link #getTimer() Timer}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getTimer()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<TimerType> timer;
>+
>+	/**
>+	 * The default value of the '{@link #isInitOnStartup() Init On Startup}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isInitOnStartup()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean INIT_ON_STARTUP_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isInitOnStartup() Init On Startup}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isInitOnStartup()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean initOnStartup = INIT_ON_STARTUP_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Init On Startup attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean initOnStartupESet;
>+
>+	/**
>+	 * The default value of the '{@link #getConcurrencyManagementType() Concurrency Management Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConcurrencyManagementType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final ConcurrencyManagementTypeType CONCURRENCY_MANAGEMENT_TYPE_EDEFAULT = ConcurrencyManagementTypeType.BEAN;
>+
>+	/**
>+	 * The cached value of the '{@link #getConcurrencyManagementType() Concurrency Management Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getConcurrencyManagementType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected ConcurrencyManagementTypeType concurrencyManagementType = CONCURRENCY_MANAGEMENT_TYPE_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Concurrency Management Type attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean concurrencyManagementTypeESet;
>+
>+	/**
>+	 * The cached value of the '{@link #getConcurrentMethod() Concurrent Method}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getConcurrentMethod()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ConcurrentMethodType> concurrentMethod;
>+
>+	/**
>+	 * The cached value of the '{@link #getDependsOn() Depends On}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getDependsOn()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected DependsOnType dependsOn;
> 
> 	/**
> 	 * The cached value of the '{@link #getInitMethods() Init Methods}' containment reference list.
>@@ -359,7 +489,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList initMethods = null;
>+	protected EList<InitMethodType> initMethods;
> 
> 	/**
> 	 * The cached value of the '{@link #getRemoveMethods() Remove Methods}' containment reference list.
>@@ -369,7 +499,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList removeMethods = null;
>+	protected EList<RemoveMethodType> removeMethods;
>+
>+	/**
>+	 * The cached value of the '{@link #getAsyncMethod() Async Method}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getAsyncMethod()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<AsyncMethodType> asyncMethod;
> 
> 	/**
> 	 * The default value of the '{@link #getTransactionType() Transaction Type}' attribute.
>@@ -398,7 +538,37 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected boolean transactionTypeESet = false;
>+	protected boolean transactionTypeESet;
>+
>+	/**
>+	 * The cached value of the '{@link #getAfterBeginMethod() After Begin Method}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getAfterBeginMethod()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected NamedMethodType afterBeginMethod;
>+
>+	/**
>+	 * The cached value of the '{@link #getBeforeCompletionMethod() Before Completion Method}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getBeforeCompletionMethod()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected NamedMethodType beforeCompletionMethod;
>+
>+	/**
>+	 * The cached value of the '{@link #getAfterCompletionMethod() After Completion Method}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getAfterCompletionMethod()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected NamedMethodType afterCompletionMethod;
> 
> 	/**
> 	 * The cached value of the '{@link #getAroundInvokes() Around Invokes}' containment reference list.
>@@ -408,7 +578,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList aroundInvokes = null;
>+	protected EList<AroundInvokeType> aroundInvokes;
>+
>+	/**
>+	 * The cached value of the '{@link #getAroundTimeouts() Around Timeouts}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getAroundTimeouts()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<AroundTimeoutType> aroundTimeouts;
> 
> 	/**
> 	 * The cached value of the '{@link #getEnvEntries() Env Entries}' containment reference list.
>@@ -418,7 +598,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList envEntries = null;
>+	protected EList<EnvEntry> envEntries;
> 
> 	/**
> 	 * The cached value of the '{@link #getEjbRefs() Ejb Refs}' containment reference list.
>@@ -428,7 +608,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList ejbRefs = null;
>+	protected EList<EjbRef> ejbRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getEjbLocalRefs() Ejb Local Refs}' containment reference list.
>@@ -438,7 +618,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList ejbLocalRefs = null;
>+	protected EList<EjbLocalRef> ejbLocalRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getServiceRefs() Service Refs}' containment reference list.
>@@ -448,7 +628,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList serviceRefs = null;
>+	protected EList<ServiceRef> serviceRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getResourceRefs() Resource Refs}' containment reference list.
>@@ -458,7 +638,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList resourceRefs = null;
>+	protected EList<ResourceRef> resourceRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getResourceEnvRefs() Resource Env Refs}' containment reference list.
>@@ -468,7 +648,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList resourceEnvRefs = null;
>+	protected EList<ResourceEnvRef> resourceEnvRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getMessageDestinationRefs() Message Destination Refs}' containment reference list.
>@@ -478,7 +658,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList messageDestinationRefs = null;
>+	protected EList<MessageDestinationRef> messageDestinationRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPersistenceContextRefs() Persistence Context Refs}' containment reference list.
>@@ -488,7 +668,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList persistenceContextRefs = null;
>+	protected EList<PersistenceContextRef> persistenceContextRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPersistenceUnitRefs() Persistence Unit Refs}' containment reference list.
>@@ -498,7 +678,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList persistenceUnitRefs = null;
>+	protected EList<PersistenceUnitRef> persistenceUnitRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPostConstructs() Post Constructs}' containment reference list.
>@@ -508,7 +688,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList postConstructs = null;
>+	protected EList<LifecycleCallback> postConstructs;
> 
> 	/**
> 	 * The cached value of the '{@link #getPreDestroys() Pre Destroys}' containment reference list.
>@@ -518,7 +698,17 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList preDestroys = null;
>+	protected EList<LifecycleCallback> preDestroys;
>+
>+	/**
>+	 * The cached value of the '{@link #getDataSource() Data Source}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDataSource()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<DataSourceType> dataSource;
> 
> 	/**
> 	 * The cached value of the '{@link #getPostActivates() Post Activates}' containment reference list.
>@@ -528,7 +718,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList postActivates = null;
>+	protected EList<LifecycleCallback> postActivates;
> 
> 	/**
> 	 * The cached value of the '{@link #getPrePassivates() Pre Passivates}' containment reference list.
>@@ -538,7 +728,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList prePassivates = null;
>+	protected EList<LifecycleCallback> prePassivates;
> 
> 	/**
> 	 * The cached value of the '{@link #getSecurityRoleRefs() Security Role Refs}' containment reference list.
>@@ -548,7 +738,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList securityRoleRefs = null;
>+	protected EList<SecurityRoleRef> securityRoleRefs;
> 
> 	/**
> 	 * The cached value of the '{@link #getSecurityIdentities() Security Identities}' containment reference.
>@@ -558,7 +748,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected SecurityIdentityType securityIdentities = null;
>+	protected SecurityIdentityType securityIdentities;
> 
> 	/**
> 	 * The default value of the '{@link #getId() Id}' attribute.
>@@ -604,9 +794,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDescriptions() {
>+	public List<Description> getDescriptions() {
> 		if (descriptions == null) {
>-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.SESSION_BEAN__DESCRIPTIONS);
>+			descriptions = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.SESSION_BEAN__DESCRIPTIONS);
> 		}
> 		return descriptions;
> 	}
>@@ -616,9 +806,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getDisplayNames() {
>+	public List<DisplayName> getDisplayNames() {
> 		if (displayNames == null) {
>-			displayNames = new EObjectContainmentEList(DisplayName.class, this, EjbPackage.SESSION_BEAN__DISPLAY_NAMES);
>+			displayNames = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, EjbPackage.SESSION_BEAN__DISPLAY_NAMES);
> 		}
> 		return displayNames;
> 	}
>@@ -628,9 +818,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getIcons() {
>+	public List<Icon> getIcons() {
> 		if (icons == null) {
>-			icons = new EObjectContainmentEList(Icon.class, this, EjbPackage.SESSION_BEAN__ICONS);
>+			icons = new EObjectContainmentEList<Icon>(Icon.class, this, EjbPackage.SESSION_BEAN__ICONS);
> 		}
> 		return icons;
> 	}
>@@ -766,9 +956,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getBusinessLocals() {
>+	public List<String> getBusinessLocals() {
> 		if (businessLocals == null) {
>-			businessLocals = new EDataTypeEList(String.class, this, EjbPackage.SESSION_BEAN__BUSINESS_LOCALS);
>+			businessLocals = new EDataTypeEList<String>(String.class, this, EjbPackage.SESSION_BEAN__BUSINESS_LOCALS);
> 		}
> 		return businessLocals;
> 	}
>@@ -778,9 +968,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getBusinessRemotes() {
>+	public List<String> getBusinessRemotes() {
> 		if (businessRemotes == null) {
>-			businessRemotes = new EDataTypeEList(String.class, this, EjbPackage.SESSION_BEAN__BUSINESS_REMOTES);
>+			businessRemotes = new EDataTypeEList<String>(String.class, this, EjbPackage.SESSION_BEAN__BUSINESS_REMOTES);
> 		}
> 		return businessRemotes;
> 	}
>@@ -790,6 +980,49 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EmptyType getLocalBean() {
>+		return localBean;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetLocalBean(EmptyType newLocalBean, NotificationChain msgs) {
>+		EmptyType oldLocalBean = localBean;
>+		localBean = newLocalBean;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__LOCAL_BEAN, oldLocalBean, newLocalBean);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLocalBean(EmptyType newLocalBean) {
>+		if (newLocalBean != localBean) {
>+			NotificationChain msgs = null;
>+			if (localBean != null)
>+				msgs = ((InternalEObject)localBean).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__LOCAL_BEAN, null, msgs);
>+			if (newLocalBean != null)
>+				msgs = ((InternalEObject)newLocalBean).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__LOCAL_BEAN, null, msgs);
>+			msgs = basicSetLocalBean(newLocalBean, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__LOCAL_BEAN, newLocalBean, newLocalBean));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public String getServiceEndpoint() {
> 		return serviceEndpoint;
> 	}
>@@ -878,6 +1111,49 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public StatefulTimeoutType getStatefulTimeout() {
>+		return statefulTimeout;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetStatefulTimeout(StatefulTimeoutType newStatefulTimeout, NotificationChain msgs) {
>+		StatefulTimeoutType oldStatefulTimeout = statefulTimeout;
>+		statefulTimeout = newStatefulTimeout;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__STATEFUL_TIMEOUT, oldStatefulTimeout, newStatefulTimeout);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setStatefulTimeout(StatefulTimeoutType newStatefulTimeout) {
>+		if (newStatefulTimeout != statefulTimeout) {
>+			NotificationChain msgs = null;
>+			if (statefulTimeout != null)
>+				msgs = ((InternalEObject)statefulTimeout).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__STATEFUL_TIMEOUT, null, msgs);
>+			if (newStatefulTimeout != null)
>+				msgs = ((InternalEObject)newStatefulTimeout).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__STATEFUL_TIMEOUT, null, msgs);
>+			msgs = basicSetStatefulTimeout(newStatefulTimeout, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__STATEFUL_TIMEOUT, newStatefulTimeout, newStatefulTimeout));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public NamedMethodType getTimeoutMethod() {
> 		return timeoutMethod;
> 	}
>@@ -921,9 +1197,168 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getInitMethods() {
>+	public List<TimerType> getTimer() {
>+		if (timer == null) {
>+			timer = new EObjectContainmentEList<TimerType>(TimerType.class, this, EjbPackage.SESSION_BEAN__TIMER);
>+		}
>+		return timer;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isInitOnStartup() {
>+		return initOnStartup;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setInitOnStartup(boolean newInitOnStartup) {
>+		boolean oldInitOnStartup = initOnStartup;
>+		initOnStartup = newInitOnStartup;
>+		boolean oldInitOnStartupESet = initOnStartupESet;
>+		initOnStartupESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__INIT_ON_STARTUP, oldInitOnStartup, initOnStartup, !oldInitOnStartupESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetInitOnStartup() {
>+		boolean oldInitOnStartup = initOnStartup;
>+		boolean oldInitOnStartupESet = initOnStartupESet;
>+		initOnStartup = INIT_ON_STARTUP_EDEFAULT;
>+		initOnStartupESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.SESSION_BEAN__INIT_ON_STARTUP, oldInitOnStartup, INIT_ON_STARTUP_EDEFAULT, oldInitOnStartupESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetInitOnStartup() {
>+		return initOnStartupESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ConcurrencyManagementTypeType getConcurrencyManagementType() {
>+		return concurrencyManagementType;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setConcurrencyManagementType(ConcurrencyManagementTypeType newConcurrencyManagementType) {
>+		ConcurrencyManagementTypeType oldConcurrencyManagementType = concurrencyManagementType;
>+		concurrencyManagementType = newConcurrencyManagementType == null ? CONCURRENCY_MANAGEMENT_TYPE_EDEFAULT : newConcurrencyManagementType;
>+		boolean oldConcurrencyManagementTypeESet = concurrencyManagementTypeESet;
>+		concurrencyManagementTypeESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__CONCURRENCY_MANAGEMENT_TYPE, oldConcurrencyManagementType, concurrencyManagementType, !oldConcurrencyManagementTypeESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetConcurrencyManagementType() {
>+		ConcurrencyManagementTypeType oldConcurrencyManagementType = concurrencyManagementType;
>+		boolean oldConcurrencyManagementTypeESet = concurrencyManagementTypeESet;
>+		concurrencyManagementType = CONCURRENCY_MANAGEMENT_TYPE_EDEFAULT;
>+		concurrencyManagementTypeESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.SESSION_BEAN__CONCURRENCY_MANAGEMENT_TYPE, oldConcurrencyManagementType, CONCURRENCY_MANAGEMENT_TYPE_EDEFAULT, oldConcurrencyManagementTypeESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetConcurrencyManagementType() {
>+		return concurrencyManagementTypeESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<ConcurrentMethodType> getConcurrentMethod() {
>+		if (concurrentMethod == null) {
>+			concurrentMethod = new EObjectContainmentEList<ConcurrentMethodType>(ConcurrentMethodType.class, this, EjbPackage.SESSION_BEAN__CONCURRENT_METHOD);
>+		}
>+		return concurrentMethod;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public DependsOnType getDependsOn() {
>+		return dependsOn;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetDependsOn(DependsOnType newDependsOn, NotificationChain msgs) {
>+		DependsOnType oldDependsOn = dependsOn;
>+		dependsOn = newDependsOn;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__DEPENDS_ON, oldDependsOn, newDependsOn);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setDependsOn(DependsOnType newDependsOn) {
>+		if (newDependsOn != dependsOn) {
>+			NotificationChain msgs = null;
>+			if (dependsOn != null)
>+				msgs = ((InternalEObject)dependsOn).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__DEPENDS_ON, null, msgs);
>+			if (newDependsOn != null)
>+				msgs = ((InternalEObject)newDependsOn).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__DEPENDS_ON, null, msgs);
>+			msgs = basicSetDependsOn(newDependsOn, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__DEPENDS_ON, newDependsOn, newDependsOn));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<InitMethodType> getInitMethods() {
> 		if (initMethods == null) {
>-			initMethods = new EObjectContainmentEList(InitMethodType.class, this, EjbPackage.SESSION_BEAN__INIT_METHODS);
>+			initMethods = new EObjectContainmentEList<InitMethodType>(InitMethodType.class, this, EjbPackage.SESSION_BEAN__INIT_METHODS);
> 		}
> 		return initMethods;
> 	}
>@@ -933,9 +1368,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getRemoveMethods() {
>+	public List<RemoveMethodType> getRemoveMethods() {
> 		if (removeMethods == null) {
>-			removeMethods = new EObjectContainmentEList(RemoveMethodType.class, this, EjbPackage.SESSION_BEAN__REMOVE_METHODS);
>+			removeMethods = new EObjectContainmentEList<RemoveMethodType>(RemoveMethodType.class, this, EjbPackage.SESSION_BEAN__REMOVE_METHODS);
> 		}
> 		return removeMethods;
> 	}
>@@ -945,6 +1380,18 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public List<AsyncMethodType> getAsyncMethod() {
>+		if (asyncMethod == null) {
>+			asyncMethod = new EObjectContainmentEList<AsyncMethodType>(AsyncMethodType.class, this, EjbPackage.SESSION_BEAN__ASYNC_METHOD);
>+		}
>+		return asyncMethod;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public TransactionType getTransactionType() {
> 		return transactionType;
> 	}
>@@ -991,9 +1438,138 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getAroundInvokes() {
>+	public NamedMethodType getAfterBeginMethod() {
>+		return afterBeginMethod;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetAfterBeginMethod(NamedMethodType newAfterBeginMethod, NotificationChain msgs) {
>+		NamedMethodType oldAfterBeginMethod = afterBeginMethod;
>+		afterBeginMethod = newAfterBeginMethod;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__AFTER_BEGIN_METHOD, oldAfterBeginMethod, newAfterBeginMethod);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setAfterBeginMethod(NamedMethodType newAfterBeginMethod) {
>+		if (newAfterBeginMethod != afterBeginMethod) {
>+			NotificationChain msgs = null;
>+			if (afterBeginMethod != null)
>+				msgs = ((InternalEObject)afterBeginMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__AFTER_BEGIN_METHOD, null, msgs);
>+			if (newAfterBeginMethod != null)
>+				msgs = ((InternalEObject)newAfterBeginMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__AFTER_BEGIN_METHOD, null, msgs);
>+			msgs = basicSetAfterBeginMethod(newAfterBeginMethod, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__AFTER_BEGIN_METHOD, newAfterBeginMethod, newAfterBeginMethod));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NamedMethodType getBeforeCompletionMethod() {
>+		return beforeCompletionMethod;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetBeforeCompletionMethod(NamedMethodType newBeforeCompletionMethod, NotificationChain msgs) {
>+		NamedMethodType oldBeforeCompletionMethod = beforeCompletionMethod;
>+		beforeCompletionMethod = newBeforeCompletionMethod;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__BEFORE_COMPLETION_METHOD, oldBeforeCompletionMethod, newBeforeCompletionMethod);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setBeforeCompletionMethod(NamedMethodType newBeforeCompletionMethod) {
>+		if (newBeforeCompletionMethod != beforeCompletionMethod) {
>+			NotificationChain msgs = null;
>+			if (beforeCompletionMethod != null)
>+				msgs = ((InternalEObject)beforeCompletionMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__BEFORE_COMPLETION_METHOD, null, msgs);
>+			if (newBeforeCompletionMethod != null)
>+				msgs = ((InternalEObject)newBeforeCompletionMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__BEFORE_COMPLETION_METHOD, null, msgs);
>+			msgs = basicSetBeforeCompletionMethod(newBeforeCompletionMethod, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__BEFORE_COMPLETION_METHOD, newBeforeCompletionMethod, newBeforeCompletionMethod));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NamedMethodType getAfterCompletionMethod() {
>+		return afterCompletionMethod;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetAfterCompletionMethod(NamedMethodType newAfterCompletionMethod, NotificationChain msgs) {
>+		NamedMethodType oldAfterCompletionMethod = afterCompletionMethod;
>+		afterCompletionMethod = newAfterCompletionMethod;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__AFTER_COMPLETION_METHOD, oldAfterCompletionMethod, newAfterCompletionMethod);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setAfterCompletionMethod(NamedMethodType newAfterCompletionMethod) {
>+		if (newAfterCompletionMethod != afterCompletionMethod) {
>+			NotificationChain msgs = null;
>+			if (afterCompletionMethod != null)
>+				msgs = ((InternalEObject)afterCompletionMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__AFTER_COMPLETION_METHOD, null, msgs);
>+			if (newAfterCompletionMethod != null)
>+				msgs = ((InternalEObject)newAfterCompletionMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.SESSION_BEAN__AFTER_COMPLETION_METHOD, null, msgs);
>+			msgs = basicSetAfterCompletionMethod(newAfterCompletionMethod, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION_BEAN__AFTER_COMPLETION_METHOD, newAfterCompletionMethod, newAfterCompletionMethod));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<AroundInvokeType> getAroundInvokes() {
> 		if (aroundInvokes == null) {
>-			aroundInvokes = new EObjectContainmentEList(AroundInvokeType.class, this, EjbPackage.SESSION_BEAN__AROUND_INVOKES);
>+			aroundInvokes = new EObjectContainmentEList<AroundInvokeType>(AroundInvokeType.class, this, EjbPackage.SESSION_BEAN__AROUND_INVOKES);
> 		}
> 		return aroundInvokes;
> 	}
>@@ -1003,9 +1579,21 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEnvEntries() {
>+	public List<AroundTimeoutType> getAroundTimeouts() {
>+		if (aroundTimeouts == null) {
>+			aroundTimeouts = new EObjectContainmentEList<AroundTimeoutType>(AroundTimeoutType.class, this, EjbPackage.SESSION_BEAN__AROUND_TIMEOUTS);
>+		}
>+		return aroundTimeouts;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<EnvEntry> getEnvEntries() {
> 		if (envEntries == null) {
>-			envEntries = new EObjectContainmentEList(EnvEntry.class, this, EjbPackage.SESSION_BEAN__ENV_ENTRIES);
>+			envEntries = new EObjectContainmentEList<EnvEntry>(EnvEntry.class, this, EjbPackage.SESSION_BEAN__ENV_ENTRIES);
> 		}
> 		return envEntries;
> 	}
>@@ -1015,9 +1603,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbRefs() {
>+	public List<EjbRef> getEjbRefs() {
> 		if (ejbRefs == null) {
>-			ejbRefs = new EObjectContainmentEList(EjbRef.class, this, EjbPackage.SESSION_BEAN__EJB_REFS);
>+			ejbRefs = new EObjectContainmentEList<EjbRef>(EjbRef.class, this, EjbPackage.SESSION_BEAN__EJB_REFS);
> 		}
> 		return ejbRefs;
> 	}
>@@ -1027,9 +1615,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getEjbLocalRefs() {
>+	public List<EjbLocalRef> getEjbLocalRefs() {
> 		if (ejbLocalRefs == null) {
>-			ejbLocalRefs = new EObjectContainmentEList(EjbLocalRef.class, this, EjbPackage.SESSION_BEAN__EJB_LOCAL_REFS);
>+			ejbLocalRefs = new EObjectContainmentEList<EjbLocalRef>(EjbLocalRef.class, this, EjbPackage.SESSION_BEAN__EJB_LOCAL_REFS);
> 		}
> 		return ejbLocalRefs;
> 	}
>@@ -1039,9 +1627,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getServiceRefs() {
>+	public List<ServiceRef> getServiceRefs() {
> 		if (serviceRefs == null) {
>-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, EjbPackage.SESSION_BEAN__SERVICE_REFS);
>+			serviceRefs = new EObjectContainmentEList<ServiceRef>(ServiceRef.class, this, EjbPackage.SESSION_BEAN__SERVICE_REFS);
> 		}
> 		return serviceRefs;
> 	}
>@@ -1051,9 +1639,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getResourceRefs() {
>+	public List<ResourceRef> getResourceRefs() {
> 		if (resourceRefs == null) {
>-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, EjbPackage.SESSION_BEAN__RESOURCE_REFS);
>+			resourceRefs = new EObjectContainmentEList<ResourceRef>(ResourceRef.class, this, EjbPackage.SESSION_BEAN__RESOURCE_REFS);
> 		}
> 		return resourceRefs;
> 	}
>@@ -1063,9 +1651,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getResourceEnvRefs() {
>+	public List<ResourceEnvRef> getResourceEnvRefs() {
> 		if (resourceEnvRefs == null) {
>-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, EjbPackage.SESSION_BEAN__RESOURCE_ENV_REFS);
>+			resourceEnvRefs = new EObjectContainmentEList<ResourceEnvRef>(ResourceEnvRef.class, this, EjbPackage.SESSION_BEAN__RESOURCE_ENV_REFS);
> 		}
> 		return resourceEnvRefs;
> 	}
>@@ -1075,9 +1663,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getMessageDestinationRefs() {
>+	public List<MessageDestinationRef> getMessageDestinationRefs() {
> 		if (messageDestinationRefs == null) {
>-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, EjbPackage.SESSION_BEAN__MESSAGE_DESTINATION_REFS);
>+			messageDestinationRefs = new EObjectContainmentEList<MessageDestinationRef>(MessageDestinationRef.class, this, EjbPackage.SESSION_BEAN__MESSAGE_DESTINATION_REFS);
> 		}
> 		return messageDestinationRefs;
> 	}
>@@ -1087,9 +1675,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPersistenceContextRefs() {
>+	public List<PersistenceContextRef> getPersistenceContextRefs() {
> 		if (persistenceContextRefs == null) {
>-			persistenceContextRefs = new EObjectContainmentEList(PersistenceContextRef.class, this, EjbPackage.SESSION_BEAN__PERSISTENCE_CONTEXT_REFS);
>+			persistenceContextRefs = new EObjectContainmentEList<PersistenceContextRef>(PersistenceContextRef.class, this, EjbPackage.SESSION_BEAN__PERSISTENCE_CONTEXT_REFS);
> 		}
> 		return persistenceContextRefs;
> 	}
>@@ -1099,9 +1687,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPersistenceUnitRefs() {
>+	public List<PersistenceUnitRef> getPersistenceUnitRefs() {
> 		if (persistenceUnitRefs == null) {
>-			persistenceUnitRefs = new EObjectContainmentEList(PersistenceUnitRef.class, this, EjbPackage.SESSION_BEAN__PERSISTENCE_UNIT_REFS);
>+			persistenceUnitRefs = new EObjectContainmentEList<PersistenceUnitRef>(PersistenceUnitRef.class, this, EjbPackage.SESSION_BEAN__PERSISTENCE_UNIT_REFS);
> 		}
> 		return persistenceUnitRefs;
> 	}
>@@ -1111,9 +1699,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPostConstructs() {
>+	public List<LifecycleCallback> getPostConstructs() {
> 		if (postConstructs == null) {
>-			postConstructs = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.SESSION_BEAN__POST_CONSTRUCTS);
>+			postConstructs = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.SESSION_BEAN__POST_CONSTRUCTS);
> 		}
> 		return postConstructs;
> 	}
>@@ -1123,9 +1711,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPreDestroys() {
>+	public List<LifecycleCallback> getPreDestroys() {
> 		if (preDestroys == null) {
>-			preDestroys = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.SESSION_BEAN__PRE_DESTROYS);
>+			preDestroys = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.SESSION_BEAN__PRE_DESTROYS);
> 		}
> 		return preDestroys;
> 	}
>@@ -1135,9 +1723,21 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPostActivates() {
>+	public List<DataSourceType> getDataSource() {
>+		if (dataSource == null) {
>+			dataSource = new EObjectContainmentEList<DataSourceType>(DataSourceType.class, this, EjbPackage.SESSION_BEAN__DATA_SOURCE);
>+		}
>+		return dataSource;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<LifecycleCallback> getPostActivates() {
> 		if (postActivates == null) {
>-			postActivates = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.SESSION_BEAN__POST_ACTIVATES);
>+			postActivates = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.SESSION_BEAN__POST_ACTIVATES);
> 		}
> 		return postActivates;
> 	}
>@@ -1147,9 +1747,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getPrePassivates() {
>+	public List<LifecycleCallback> getPrePassivates() {
> 		if (prePassivates == null) {
>-			prePassivates = new EObjectContainmentEList(LifecycleCallback.class, this, EjbPackage.SESSION_BEAN__PRE_PASSIVATES);
>+			prePassivates = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.SESSION_BEAN__PRE_PASSIVATES);
> 		}
> 		return prePassivates;
> 	}
>@@ -1159,9 +1759,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public List getSecurityRoleRefs() {
>+	public List<SecurityRoleRef> getSecurityRoleRefs() {
> 		if (securityRoleRefs == null) {
>-			securityRoleRefs = new EObjectContainmentEList(SecurityRoleRef.class, this, EjbPackage.SESSION_BEAN__SECURITY_ROLE_REFS);
>+			securityRoleRefs = new EObjectContainmentEList<SecurityRoleRef>(SecurityRoleRef.class, this, EjbPackage.SESSION_BEAN__SECURITY_ROLE_REFS);
> 		}
> 		return securityRoleRefs;
> 	}
>@@ -1239,47 +1839,69 @@
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
> 			case EjbPackage.SESSION_BEAN__DESCRIPTIONS:
>-				return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDescriptions()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__DISPLAY_NAMES:
>-				return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getDisplayNames()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__ICONS:
>-				return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getIcons()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.SESSION_BEAN__LOCAL_BEAN:
>+				return basicSetLocalBean(null, msgs);
>+			case EjbPackage.SESSION_BEAN__STATEFUL_TIMEOUT:
>+				return basicSetStatefulTimeout(null, msgs);
> 			case EjbPackage.SESSION_BEAN__TIMEOUT_METHOD:
> 				return basicSetTimeoutMethod(null, msgs);
>+			case EjbPackage.SESSION_BEAN__TIMER:
>+				return ((InternalEList<?>)getTimer()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.SESSION_BEAN__CONCURRENT_METHOD:
>+				return ((InternalEList<?>)getConcurrentMethod()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.SESSION_BEAN__DEPENDS_ON:
>+				return basicSetDependsOn(null, msgs);
> 			case EjbPackage.SESSION_BEAN__INIT_METHODS:
>-				return ((InternalEList)getInitMethods()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getInitMethods()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__REMOVE_METHODS:
>-				return ((InternalEList)getRemoveMethods()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getRemoveMethods()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.SESSION_BEAN__ASYNC_METHOD:
>+				return ((InternalEList<?>)getAsyncMethod()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.SESSION_BEAN__AFTER_BEGIN_METHOD:
>+				return basicSetAfterBeginMethod(null, msgs);
>+			case EjbPackage.SESSION_BEAN__BEFORE_COMPLETION_METHOD:
>+				return basicSetBeforeCompletionMethod(null, msgs);
>+			case EjbPackage.SESSION_BEAN__AFTER_COMPLETION_METHOD:
>+				return basicSetAfterCompletionMethod(null, msgs);
> 			case EjbPackage.SESSION_BEAN__AROUND_INVOKES:
>-				return ((InternalEList)getAroundInvokes()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getAroundInvokes()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.SESSION_BEAN__AROUND_TIMEOUTS:
>+				return ((InternalEList<?>)getAroundTimeouts()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__ENV_ENTRIES:
>-				return ((InternalEList)getEnvEntries()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEnvEntries()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__EJB_REFS:
>-				return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__EJB_LOCAL_REFS:
>-				return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__SERVICE_REFS:
>-				return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getServiceRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__RESOURCE_REFS:
>-				return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getResourceRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__RESOURCE_ENV_REFS:
>-				return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__MESSAGE_DESTINATION_REFS:
>-				return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__PERSISTENCE_CONTEXT_REFS:
>-				return ((InternalEList)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPersistenceContextRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__PERSISTENCE_UNIT_REFS:
>-				return ((InternalEList)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPersistenceUnitRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__POST_CONSTRUCTS:
>-				return ((InternalEList)getPostConstructs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPostConstructs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__PRE_DESTROYS:
>-				return ((InternalEList)getPreDestroys()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPreDestroys()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.SESSION_BEAN__DATA_SOURCE:
>+				return ((InternalEList<?>)getDataSource()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__POST_ACTIVATES:
>-				return ((InternalEList)getPostActivates()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPostActivates()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__PRE_PASSIVATES:
>-				return ((InternalEList)getPrePassivates()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getPrePassivates()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__SECURITY_ROLE_REFS:
>-				return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
>+				return ((InternalEList<?>)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
> 			case EjbPackage.SESSION_BEAN__SECURITY_IDENTITIES:
> 				return basicSetSecurityIdentities(null, msgs);
> 		}
>@@ -1316,22 +1938,46 @@
> 				return getBusinessLocals();
> 			case EjbPackage.SESSION_BEAN__BUSINESS_REMOTES:
> 				return getBusinessRemotes();
>+			case EjbPackage.SESSION_BEAN__LOCAL_BEAN:
>+				return getLocalBean();
> 			case EjbPackage.SESSION_BEAN__SERVICE_ENDPOINT:
> 				return getServiceEndpoint();
> 			case EjbPackage.SESSION_BEAN__EJB_CLASS:
> 				return getEjbClass();
> 			case EjbPackage.SESSION_BEAN__SESSION_TYPE:
> 				return getSessionType();
>+			case EjbPackage.SESSION_BEAN__STATEFUL_TIMEOUT:
>+				return getStatefulTimeout();
> 			case EjbPackage.SESSION_BEAN__TIMEOUT_METHOD:
> 				return getTimeoutMethod();
>+			case EjbPackage.SESSION_BEAN__TIMER:
>+				return getTimer();
>+			case EjbPackage.SESSION_BEAN__INIT_ON_STARTUP:
>+				return isInitOnStartup();
>+			case EjbPackage.SESSION_BEAN__CONCURRENCY_MANAGEMENT_TYPE:
>+				return getConcurrencyManagementType();
>+			case EjbPackage.SESSION_BEAN__CONCURRENT_METHOD:
>+				return getConcurrentMethod();
>+			case EjbPackage.SESSION_BEAN__DEPENDS_ON:
>+				return getDependsOn();
> 			case EjbPackage.SESSION_BEAN__INIT_METHODS:
> 				return getInitMethods();
> 			case EjbPackage.SESSION_BEAN__REMOVE_METHODS:
> 				return getRemoveMethods();
>+			case EjbPackage.SESSION_BEAN__ASYNC_METHOD:
>+				return getAsyncMethod();
> 			case EjbPackage.SESSION_BEAN__TRANSACTION_TYPE:
> 				return getTransactionType();
>+			case EjbPackage.SESSION_BEAN__AFTER_BEGIN_METHOD:
>+				return getAfterBeginMethod();
>+			case EjbPackage.SESSION_BEAN__BEFORE_COMPLETION_METHOD:
>+				return getBeforeCompletionMethod();
>+			case EjbPackage.SESSION_BEAN__AFTER_COMPLETION_METHOD:
>+				return getAfterCompletionMethod();
> 			case EjbPackage.SESSION_BEAN__AROUND_INVOKES:
> 				return getAroundInvokes();
>+			case EjbPackage.SESSION_BEAN__AROUND_TIMEOUTS:
>+				return getAroundTimeouts();
> 			case EjbPackage.SESSION_BEAN__ENV_ENTRIES:
> 				return getEnvEntries();
> 			case EjbPackage.SESSION_BEAN__EJB_REFS:
>@@ -1354,6 +2000,8 @@
> 				return getPostConstructs();
> 			case EjbPackage.SESSION_BEAN__PRE_DESTROYS:
> 				return getPreDestroys();
>+			case EjbPackage.SESSION_BEAN__DATA_SOURCE:
>+				return getDataSource();
> 			case EjbPackage.SESSION_BEAN__POST_ACTIVATES:
> 				return getPostActivates();
> 			case EjbPackage.SESSION_BEAN__PRE_PASSIVATES:
>@@ -1373,20 +2021,21 @@
> 	 * 
> 	 * @generated
> 	 */
>+	@SuppressWarnings("unchecked")
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
> 			case EjbPackage.SESSION_BEAN__DESCRIPTIONS:
> 				getDescriptions().clear();
>-				getDescriptions().addAll((Collection)newValue);
>+				getDescriptions().addAll((Collection<? extends Description>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__DISPLAY_NAMES:
> 				getDisplayNames().clear();
>-				getDisplayNames().addAll((Collection)newValue);
>+				getDisplayNames().addAll((Collection<? extends DisplayName>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__ICONS:
> 				getIcons().clear();
>-				getIcons().addAll((Collection)newValue);
>+				getIcons().addAll((Collection<? extends Icon>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__EJB_NAME:
> 				setEjbName((String)newValue);
>@@ -1408,11 +2057,14 @@
> 				return;
> 			case EjbPackage.SESSION_BEAN__BUSINESS_LOCALS:
> 				getBusinessLocals().clear();
>-				getBusinessLocals().addAll((Collection)newValue);
>+				getBusinessLocals().addAll((Collection<? extends String>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__BUSINESS_REMOTES:
> 				getBusinessRemotes().clear();
>-				getBusinessRemotes().addAll((Collection)newValue);
>+				getBusinessRemotes().addAll((Collection<? extends String>)newValue);
>+				return;
>+			case EjbPackage.SESSION_BEAN__LOCAL_BEAN:
>+				setLocalBean((EmptyType)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__SERVICE_ENDPOINT:
> 				setServiceEndpoint((String)newValue);
>@@ -1423,79 +2075,120 @@
> 			case EjbPackage.SESSION_BEAN__SESSION_TYPE:
> 				setSessionType((SessionType)newValue);
> 				return;
>+			case EjbPackage.SESSION_BEAN__STATEFUL_TIMEOUT:
>+				setStatefulTimeout((StatefulTimeoutType)newValue);
>+				return;
> 			case EjbPackage.SESSION_BEAN__TIMEOUT_METHOD:
> 				setTimeoutMethod((NamedMethodType)newValue);
> 				return;
>+			case EjbPackage.SESSION_BEAN__TIMER:
>+				getTimer().clear();
>+				getTimer().addAll((Collection<? extends TimerType>)newValue);
>+				return;
>+			case EjbPackage.SESSION_BEAN__INIT_ON_STARTUP:
>+				setInitOnStartup((Boolean)newValue);
>+				return;
>+			case EjbPackage.SESSION_BEAN__CONCURRENCY_MANAGEMENT_TYPE:
>+				setConcurrencyManagementType((ConcurrencyManagementTypeType)newValue);
>+				return;
>+			case EjbPackage.SESSION_BEAN__CONCURRENT_METHOD:
>+				getConcurrentMethod().clear();
>+				getConcurrentMethod().addAll((Collection<? extends ConcurrentMethodType>)newValue);
>+				return;
>+			case EjbPackage.SESSION_BEAN__DEPENDS_ON:
>+				setDependsOn((DependsOnType)newValue);
>+				return;
> 			case EjbPackage.SESSION_BEAN__INIT_METHODS:
> 				getInitMethods().clear();
>-				getInitMethods().addAll((Collection)newValue);
>+				getInitMethods().addAll((Collection<? extends InitMethodType>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__REMOVE_METHODS:
> 				getRemoveMethods().clear();
>-				getRemoveMethods().addAll((Collection)newValue);
>+				getRemoveMethods().addAll((Collection<? extends RemoveMethodType>)newValue);
>+				return;
>+			case EjbPackage.SESSION_BEAN__ASYNC_METHOD:
>+				getAsyncMethod().clear();
>+				getAsyncMethod().addAll((Collection<? extends AsyncMethodType>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__TRANSACTION_TYPE:
> 				setTransactionType((TransactionType)newValue);
> 				return;
>+			case EjbPackage.SESSION_BEAN__AFTER_BEGIN_METHOD:
>+				setAfterBeginMethod((NamedMethodType)newValue);
>+				return;
>+			case EjbPackage.SESSION_BEAN__BEFORE_COMPLETION_METHOD:
>+				setBeforeCompletionMethod((NamedMethodType)newValue);
>+				return;
>+			case EjbPackage.SESSION_BEAN__AFTER_COMPLETION_METHOD:
>+				setAfterCompletionMethod((NamedMethodType)newValue);
>+				return;
> 			case EjbPackage.SESSION_BEAN__AROUND_INVOKES:
> 				getAroundInvokes().clear();
>-				getAroundInvokes().addAll((Collection)newValue);
>+				getAroundInvokes().addAll((Collection<? extends AroundInvokeType>)newValue);
>+				return;
>+			case EjbPackage.SESSION_BEAN__AROUND_TIMEOUTS:
>+				getAroundTimeouts().clear();
>+				getAroundTimeouts().addAll((Collection<? extends AroundTimeoutType>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__ENV_ENTRIES:
> 				getEnvEntries().clear();
>-				getEnvEntries().addAll((Collection)newValue);
>+				getEnvEntries().addAll((Collection<? extends EnvEntry>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__EJB_REFS:
> 				getEjbRefs().clear();
>-				getEjbRefs().addAll((Collection)newValue);
>+				getEjbRefs().addAll((Collection<? extends EjbRef>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__EJB_LOCAL_REFS:
> 				getEjbLocalRefs().clear();
>-				getEjbLocalRefs().addAll((Collection)newValue);
>+				getEjbLocalRefs().addAll((Collection<? extends EjbLocalRef>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__SERVICE_REFS:
> 				getServiceRefs().clear();
>-				getServiceRefs().addAll((Collection)newValue);
>+				getServiceRefs().addAll((Collection<? extends ServiceRef>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__RESOURCE_REFS:
> 				getResourceRefs().clear();
>-				getResourceRefs().addAll((Collection)newValue);
>+				getResourceRefs().addAll((Collection<? extends ResourceRef>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__RESOURCE_ENV_REFS:
> 				getResourceEnvRefs().clear();
>-				getResourceEnvRefs().addAll((Collection)newValue);
>+				getResourceEnvRefs().addAll((Collection<? extends ResourceEnvRef>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__MESSAGE_DESTINATION_REFS:
> 				getMessageDestinationRefs().clear();
>-				getMessageDestinationRefs().addAll((Collection)newValue);
>+				getMessageDestinationRefs().addAll((Collection<? extends MessageDestinationRef>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__PERSISTENCE_CONTEXT_REFS:
> 				getPersistenceContextRefs().clear();
>-				getPersistenceContextRefs().addAll((Collection)newValue);
>+				getPersistenceContextRefs().addAll((Collection<? extends PersistenceContextRef>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__PERSISTENCE_UNIT_REFS:
> 				getPersistenceUnitRefs().clear();
>-				getPersistenceUnitRefs().addAll((Collection)newValue);
>+				getPersistenceUnitRefs().addAll((Collection<? extends PersistenceUnitRef>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__POST_CONSTRUCTS:
> 				getPostConstructs().clear();
>-				getPostConstructs().addAll((Collection)newValue);
>+				getPostConstructs().addAll((Collection<? extends LifecycleCallback>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__PRE_DESTROYS:
> 				getPreDestroys().clear();
>-				getPreDestroys().addAll((Collection)newValue);
>+				getPreDestroys().addAll((Collection<? extends LifecycleCallback>)newValue);
>+				return;
>+			case EjbPackage.SESSION_BEAN__DATA_SOURCE:
>+				getDataSource().clear();
>+				getDataSource().addAll((Collection<? extends DataSourceType>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__POST_ACTIVATES:
> 				getPostActivates().clear();
>-				getPostActivates().addAll((Collection)newValue);
>+				getPostActivates().addAll((Collection<? extends LifecycleCallback>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__PRE_PASSIVATES:
> 				getPrePassivates().clear();
>-				getPrePassivates().addAll((Collection)newValue);
>+				getPrePassivates().addAll((Collection<? extends LifecycleCallback>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__SECURITY_ROLE_REFS:
> 				getSecurityRoleRefs().clear();
>-				getSecurityRoleRefs().addAll((Collection)newValue);
>+				getSecurityRoleRefs().addAll((Collection<? extends SecurityRoleRef>)newValue);
> 				return;
> 			case EjbPackage.SESSION_BEAN__SECURITY_IDENTITIES:
> 				setSecurityIdentities((SecurityIdentityType)newValue);
>@@ -1548,6 +2241,9 @@
> 			case EjbPackage.SESSION_BEAN__BUSINESS_REMOTES:
> 				getBusinessRemotes().clear();
> 				return;
>+			case EjbPackage.SESSION_BEAN__LOCAL_BEAN:
>+				setLocalBean((EmptyType)null);
>+				return;
> 			case EjbPackage.SESSION_BEAN__SERVICE_ENDPOINT:
> 				setServiceEndpoint(SERVICE_ENDPOINT_EDEFAULT);
> 				return;
>@@ -1557,21 +2253,54 @@
> 			case EjbPackage.SESSION_BEAN__SESSION_TYPE:
> 				unsetSessionType();
> 				return;
>+			case EjbPackage.SESSION_BEAN__STATEFUL_TIMEOUT:
>+				setStatefulTimeout((StatefulTimeoutType)null);
>+				return;
> 			case EjbPackage.SESSION_BEAN__TIMEOUT_METHOD:
> 				setTimeoutMethod((NamedMethodType)null);
> 				return;
>+			case EjbPackage.SESSION_BEAN__TIMER:
>+				getTimer().clear();
>+				return;
>+			case EjbPackage.SESSION_BEAN__INIT_ON_STARTUP:
>+				unsetInitOnStartup();
>+				return;
>+			case EjbPackage.SESSION_BEAN__CONCURRENCY_MANAGEMENT_TYPE:
>+				unsetConcurrencyManagementType();
>+				return;
>+			case EjbPackage.SESSION_BEAN__CONCURRENT_METHOD:
>+				getConcurrentMethod().clear();
>+				return;
>+			case EjbPackage.SESSION_BEAN__DEPENDS_ON:
>+				setDependsOn((DependsOnType)null);
>+				return;
> 			case EjbPackage.SESSION_BEAN__INIT_METHODS:
> 				getInitMethods().clear();
> 				return;
> 			case EjbPackage.SESSION_BEAN__REMOVE_METHODS:
> 				getRemoveMethods().clear();
> 				return;
>+			case EjbPackage.SESSION_BEAN__ASYNC_METHOD:
>+				getAsyncMethod().clear();
>+				return;
> 			case EjbPackage.SESSION_BEAN__TRANSACTION_TYPE:
> 				unsetTransactionType();
> 				return;
>+			case EjbPackage.SESSION_BEAN__AFTER_BEGIN_METHOD:
>+				setAfterBeginMethod((NamedMethodType)null);
>+				return;
>+			case EjbPackage.SESSION_BEAN__BEFORE_COMPLETION_METHOD:
>+				setBeforeCompletionMethod((NamedMethodType)null);
>+				return;
>+			case EjbPackage.SESSION_BEAN__AFTER_COMPLETION_METHOD:
>+				setAfterCompletionMethod((NamedMethodType)null);
>+				return;
> 			case EjbPackage.SESSION_BEAN__AROUND_INVOKES:
> 				getAroundInvokes().clear();
> 				return;
>+			case EjbPackage.SESSION_BEAN__AROUND_TIMEOUTS:
>+				getAroundTimeouts().clear();
>+				return;
> 			case EjbPackage.SESSION_BEAN__ENV_ENTRIES:
> 				getEnvEntries().clear();
> 				return;
>@@ -1605,6 +2334,9 @@
> 			case EjbPackage.SESSION_BEAN__PRE_DESTROYS:
> 				getPreDestroys().clear();
> 				return;
>+			case EjbPackage.SESSION_BEAN__DATA_SOURCE:
>+				getDataSource().clear();
>+				return;
> 			case EjbPackage.SESSION_BEAN__POST_ACTIVATES:
> 				getPostActivates().clear();
> 				return;
>@@ -1654,22 +2386,46 @@
> 				return businessLocals != null && !businessLocals.isEmpty();
> 			case EjbPackage.SESSION_BEAN__BUSINESS_REMOTES:
> 				return businessRemotes != null && !businessRemotes.isEmpty();
>+			case EjbPackage.SESSION_BEAN__LOCAL_BEAN:
>+				return localBean != null;
> 			case EjbPackage.SESSION_BEAN__SERVICE_ENDPOINT:
> 				return SERVICE_ENDPOINT_EDEFAULT == null ? serviceEndpoint != null : !SERVICE_ENDPOINT_EDEFAULT.equals(serviceEndpoint);
> 			case EjbPackage.SESSION_BEAN__EJB_CLASS:
> 				return EJB_CLASS_EDEFAULT == null ? ejbClass != null : !EJB_CLASS_EDEFAULT.equals(ejbClass);
> 			case EjbPackage.SESSION_BEAN__SESSION_TYPE:
> 				return isSetSessionType();
>+			case EjbPackage.SESSION_BEAN__STATEFUL_TIMEOUT:
>+				return statefulTimeout != null;
> 			case EjbPackage.SESSION_BEAN__TIMEOUT_METHOD:
> 				return timeoutMethod != null;
>+			case EjbPackage.SESSION_BEAN__TIMER:
>+				return timer != null && !timer.isEmpty();
>+			case EjbPackage.SESSION_BEAN__INIT_ON_STARTUP:
>+				return isSetInitOnStartup();
>+			case EjbPackage.SESSION_BEAN__CONCURRENCY_MANAGEMENT_TYPE:
>+				return isSetConcurrencyManagementType();
>+			case EjbPackage.SESSION_BEAN__CONCURRENT_METHOD:
>+				return concurrentMethod != null && !concurrentMethod.isEmpty();
>+			case EjbPackage.SESSION_BEAN__DEPENDS_ON:
>+				return dependsOn != null;
> 			case EjbPackage.SESSION_BEAN__INIT_METHODS:
> 				return initMethods != null && !initMethods.isEmpty();
> 			case EjbPackage.SESSION_BEAN__REMOVE_METHODS:
> 				return removeMethods != null && !removeMethods.isEmpty();
>+			case EjbPackage.SESSION_BEAN__ASYNC_METHOD:
>+				return asyncMethod != null && !asyncMethod.isEmpty();
> 			case EjbPackage.SESSION_BEAN__TRANSACTION_TYPE:
> 				return isSetTransactionType();
>+			case EjbPackage.SESSION_BEAN__AFTER_BEGIN_METHOD:
>+				return afterBeginMethod != null;
>+			case EjbPackage.SESSION_BEAN__BEFORE_COMPLETION_METHOD:
>+				return beforeCompletionMethod != null;
>+			case EjbPackage.SESSION_BEAN__AFTER_COMPLETION_METHOD:
>+				return afterCompletionMethod != null;
> 			case EjbPackage.SESSION_BEAN__AROUND_INVOKES:
> 				return aroundInvokes != null && !aroundInvokes.isEmpty();
>+			case EjbPackage.SESSION_BEAN__AROUND_TIMEOUTS:
>+				return aroundTimeouts != null && !aroundTimeouts.isEmpty();
> 			case EjbPackage.SESSION_BEAN__ENV_ENTRIES:
> 				return envEntries != null && !envEntries.isEmpty();
> 			case EjbPackage.SESSION_BEAN__EJB_REFS:
>@@ -1692,6 +2448,8 @@
> 				return postConstructs != null && !postConstructs.isEmpty();
> 			case EjbPackage.SESSION_BEAN__PRE_DESTROYS:
> 				return preDestroys != null && !preDestroys.isEmpty();
>+			case EjbPackage.SESSION_BEAN__DATA_SOURCE:
>+				return dataSource != null && !dataSource.isEmpty();
> 			case EjbPackage.SESSION_BEAN__POST_ACTIVATES:
> 				return postActivates != null && !postActivates.isEmpty();
> 			case EjbPackage.SESSION_BEAN__PRE_PASSIVATES:
>@@ -1738,6 +2496,10 @@
> 		result.append(ejbClass);
> 		result.append(", sessionType: "); //$NON-NLS-1$
> 		if (sessionTypeESet) result.append(sessionType); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", initOnStartup: "); //$NON-NLS-1$
>+		if (initOnStartupESet) result.append(initOnStartup); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", concurrencyManagementType: "); //$NON-NLS-1$
>+		if (concurrencyManagementTypeESet) result.append(concurrencyManagementType); else result.append("<unset>"); //$NON-NLS-1$
> 		result.append(", transactionType: "); //$NON-NLS-1$
> 		if (transactionTypeESet) result.append(transactionType); else result.append("<unset>"); //$NON-NLS-1$
> 		result.append(", id: "); //$NON-NLS-1$
>Index: jee-models/org/eclipse/jst/javaee/ejb/SessionType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/SessionType.java,v
>retrieving revision 1.2
>diff -u -r1.2 SessionType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/SessionType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/SessionType.java	14 Oct 2009 21:48:07 -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,68 +24,93 @@
> * 
> * 
> * 
>- * 	The session-typeType describes whether the session bean is a
>- * 	stateful session or stateless session. It is used by
>- * 	session-type elements.
>- * 
>- * 	The value must be one of the two following:
>- * 
>- * 	 Stateful
>- * 	 Stateless
>- * 
>+ * The session-typeType describes whether the session bean is a
>+ * singleton, stateful or stateless session. It is used by
>+ * session-type elements.
>+ * 
>+ * The value must be one of the three following:
>+ * 
>+ * Singleton
>+ * Stateful
>+ * Stateless
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionType()
> * @generated
> */
>-public final class SessionType extends AbstractEnumerator {
>+public enum SessionType implements Enumerator
>+{
> 	/**
>-	 * The 'Stateful' literal value.
>+	 * The 'Singleton' literal object.
> 	 * 
>-	 * 
>-	 * If the meaning of 'Stateful' literal object isn't clear,
>-	 * there really should be more of a description here...
>-	 * 
> 	 * 
>-	 * @see #STATEFUL_LITERAL
>+	 * @see #SINGLETON
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final int STATEFUL = 0;
>-
>+	SINGLETON_LITERAL(0, "Singleton", "Singleton"), //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
>-	 * The 'Stateless' literal value.
>+	 * The 'Stateful' literal object.
> 	 * 
>-	 * 
>-	 * If the meaning of 'Stateless' literal object isn't clear,
>-	 * there really should be more of a description here...
>-	 * 
> 	 * 
>-	 * @see #STATELESS_LITERAL
>+	 * @see #STATEFUL
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final int STATELESS = 1;
>+	STATEFUL_LITERAL(1, "Stateful", "Stateful"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Stateless' literal object.
>+	 * 
>+	 * 
>+	 * @see #STATELESS
>+	 * @generated
>+	 * @ordered
>+	 */
>+	STATELESS_LITERAL(2, "Stateless", "Stateless"); //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Singleton' literal value.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, EJB 3.1
>+	 * 
>+	 * 
>+	 * @see #SINGLETON_LITERAL
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int SINGLETON = 0;
> 
> 	/**
>-	 * The 'Stateful' literal object.
>+	 * The 'Stateful' literal value.
> 	 * 
>+	 * 
>+	 * If the meaning of 'Stateful' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
> 	 * 
>-	 * @see #STATEFUL
>+	 * @see #STATEFUL_LITERAL
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final SessionType STATEFUL_LITERAL = new SessionType(STATEFUL, "Stateful", "Stateful"); //$NON-NLS-1$ //$NON-NLS-2$
>+	public static final int STATEFUL = 1;
> 
> 	/**
>-	 * The 'Stateless' literal object.
>+	 * The 'Stateless' literal value.
> 	 * 
>+	 * 
>+	 * If the meaning of 'Stateless' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
> 	 * 
>-	 * @see #STATELESS
>+	 * @see #STATELESS_LITERAL
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final SessionType STATELESS_LITERAL = new SessionType(STATELESS, "Stateless", "Stateless"); //$NON-NLS-1$ //$NON-NLS-2$
>+	public static final int STATELESS = 2;
> 
> 	/**
> 	 * An array of all the 'Session Type' enumerators.
>@@ -95,6 +120,7 @@
> 	 */
> 	private static final SessionType[] VALUES_ARRAY =
> 		new SessionType[] {
>+			SINGLETON_LITERAL,
> 			STATEFUL_LITERAL,
> 			STATELESS_LITERAL,
> 		};
>@@ -105,7 +131,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<SessionType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Session Type' literal with the specified literal value.
>@@ -147,20 +173,81 @@
> 	 */
> 	public static SessionType get(int value) {
> 		switch (value) {
>+			case SINGLETON: return SINGLETON_LITERAL;
> 			case STATEFUL: return STATEFUL_LITERAL;
> 			case STATELESS: return STATELESS_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 SessionType(int value, String name, String literal) {
>-		super(value, name, literal);
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
> 	}
> 
>-} //SessionType
>+	/**
>+	 * 
>+	 * 
>+	 * @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/ejb/MethodPermission.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodPermission.java,v
>retrieving revision 1.2
>diff -u -r1.2 MethodPermission.java
>--- jee-models/org/eclipse/jst/javaee/ejb/MethodPermission.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/MethodPermission.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.EmptyType;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
>@@ -23,19 +24,20 @@
> * 
> * 
> * 
>- * 	The method-permissionType specifies that one or more
>- * 	security roles are allowed to invoke one or more enterprise
>- * 	bean methods. The method-permissionType consists of an
>- * 	optional description, a list of security role names or an
>- * 	indicator to state that the method is unchecked for
>- * 	authorization, and a list of method elements.
>- * 
>- * 	The security roles used in the method-permissionType
>- * 	must be defined in the security-role elements of the
>- * 	deployment descriptor, and the methods must be methods
>- * 	defined in the enterprise bean's business, home, component
>+ * The method-permissionType specifies that one or more
>+ * security roles are allowed to invoke one or more enterprise
>+ * bean methods. The method-permissionType consists of an
>+ * optional description, a list of security role names or an
>+ * indicator to state that the method is unchecked for
>+ * authorization, and a list of method elements.
>+ * 
>+ * The security roles used in the method-permissionType
>+ * must be defined in the security-role elements of the
>+ * deployment descriptor, and the methods must be methods
>+ * defined in the enterprise bean's business, home, component 
> * and/or web service endpoint interfaces.
>- * 
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -68,7 +70,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodPermission_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Role Names' attribute list.
>@@ -83,7 +85,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodPermission_RoleNames()
> 	 * @generated
> 	 */
>-	List getRoleNames();
>+	List<String> getRoleNames();
> 
> 	/**
> 	 * Returns the value of the 'Unchecked' containment reference.
>@@ -92,11 +94,12 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The unchecked element specifies that a method is
>-	 * 	 not checked for authorization by the container
>-	 * 	 prior to invocation of the method.
>-	 * 
>-	 * 	 
>+	 * The unchecked element specifies that a method is
>+	 * not checked for authorization by the container
>+	 * prior to invocation of the method.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Unchecked' containment reference.
> 	 * @see #setUnchecked(EmptyType)
>@@ -128,7 +131,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodPermission_Methods()
> 	 * @generated
> 	 */
>-	List getMethods();
>+	List<MethodType> getMethods();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/InterceptorType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorType.java,v
>retrieving revision 1.2
>diff -u -r1.2 InterceptorType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/InterceptorType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/InterceptorType.java	14 Oct 2009 21:48:07 -0000
>@@ -12,7 +12,19 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.DataSourceType;
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.EjbLocalRef;
>+import org.eclipse.jst.javaee.core.EjbRef;
>+import org.eclipse.jst.javaee.core.EnvEntry;
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.LifecycleCallback;
>+import org.eclipse.jst.javaee.core.MessageDestinationRef;
>+import org.eclipse.jst.javaee.core.PersistenceContextRef;
>+import org.eclipse.jst.javaee.core.PersistenceUnitRef;
>+import org.eclipse.jst.javaee.core.ResourceEnvRef;
>+import org.eclipse.jst.javaee.core.ResourceRef;
>+import org.eclipse.jst.javaee.core.ServiceRef;
> 
> /**
> * 
>@@ -24,18 +36,21 @@
> * 
> * The interceptorType element declares information about a single
> * interceptor class. It consists of :
>- * 
>- * - An optional description.
>- * - The fully-qualified name of the interceptor class.
>- * - An optional list of around invoke methods declared on the
>- * interceptor class and/or its super-classes.
>- * - An optional list environment dependencies for the interceptor
>- * class and/or its super-classes.
>- * - An optional list of post-activate methods declared on the
>- * interceptor class and/or its super-classes.
>- * - An optional list of pre-passivate methods declared on the
>- * interceptor class and/or its super-classes.
>- * 
>+ * 
>+ * - An optional description.
>+ * - The fully-qualified name of the interceptor class.
>+ * - An optional list of around invoke methods declared on the
>+ * interceptor class and/or its super-classes.
>+ * - An optional list of around timeout methods declared on the
>+ * interceptor class and/or its super-classes.
>+ * - An optional list environment dependencies for the interceptor
>+ * class and/or its super-classes.
>+ * - An optional list of post-activate methods declared on the
>+ * interceptor class and/or its super-classes.
>+ * - An optional list of pre-passivate methods declared on the
>+ * interceptor class and/or its super-classes.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -45,6 +60,7 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getDescriptions Descriptions}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getInterceptorClass Interceptor Class}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundInvokes Around Invokes}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundTimeouts Around Timeouts}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries Env Entries}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbRefs Ejb Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbLocalRefs Ejb Local Refs}</li>
>@@ -56,6 +72,7 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceUnitRefs Persistence Unit Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPostConstructs Post Constructs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPreDestroys Pre Destroys}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getDataSource Data Source}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPostActivates Post Activates}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPrePassivates Pre Passivates}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getId Id}</li>
>@@ -80,7 +97,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Interceptor Class' attribute.
>@@ -120,7 +137,22 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_AroundInvokes()
> 	 * @generated
> 	 */
>-	List getAroundInvokes();
>+	List<AroundInvokeType> getAroundInvokes();
>+
>+	/**
>+	 * Returns the value of the 'Around Timeouts' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.AroundTimeoutType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Around Timeouts' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Around Timeouts' containment reference list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_AroundTimeouts()
>+	 * @generated
>+	 */
>+	List<AroundTimeoutType> getAroundTimeouts();
> 
> 	/**
> 	 * Returns the value of the 'Env Entries' containment reference list.
>@@ -135,7 +167,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_EnvEntries()
> 	 * @generated
> 	 */
>-	List getEnvEntries();
>+	List<EnvEntry> getEnvEntries();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Refs' containment reference list.
>@@ -150,7 +182,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_EjbRefs()
> 	 * @generated
> 	 */
>-	List getEjbRefs();
>+	List<EjbRef> getEjbRefs();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Local Refs' containment reference list.
>@@ -165,7 +197,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_EjbLocalRefs()
> 	 * @generated
> 	 */
>-	List getEjbLocalRefs();
>+	List<EjbLocalRef> getEjbLocalRefs();
> 
> 	/**
> 	 * Returns the value of the 'Service Refs' containment reference list.
>@@ -180,7 +212,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_ServiceRefs()
> 	 * @generated
> 	 */
>-	List getServiceRefs();
>+	List<ServiceRef> getServiceRefs();
> 
> 	/**
> 	 * Returns the value of the 'Resource Refs' containment reference list.
>@@ -195,7 +227,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_ResourceRefs()
> 	 * @generated
> 	 */
>-	List getResourceRefs();
>+	List<ResourceRef> getResourceRefs();
> 
> 	/**
> 	 * Returns the value of the 'Resource Env Refs' containment reference list.
>@@ -210,7 +242,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_ResourceEnvRefs()
> 	 * @generated
> 	 */
>-	List getResourceEnvRefs();
>+	List<ResourceEnvRef> getResourceEnvRefs();
> 
> 	/**
> 	 * Returns the value of the 'Message Destination Refs' containment reference list.
>@@ -225,7 +257,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_MessageDestinationRefs()
> 	 * @generated
> 	 */
>-	List getMessageDestinationRefs();
>+	List<MessageDestinationRef> getMessageDestinationRefs();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Context Refs' containment reference list.
>@@ -240,7 +272,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_PersistenceContextRefs()
> 	 * @generated
> 	 */
>-	List getPersistenceContextRefs();
>+	List<PersistenceContextRef> getPersistenceContextRefs();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Unit Refs' containment reference list.
>@@ -255,7 +287,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_PersistenceUnitRefs()
> 	 * @generated
> 	 */
>-	List getPersistenceUnitRefs();
>+	List<PersistenceUnitRef> getPersistenceUnitRefs();
> 
> 	/**
> 	 * Returns the value of the 'Post Constructs' containment reference list.
>@@ -270,7 +302,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_PostConstructs()
> 	 * @generated
> 	 */
>-	List getPostConstructs();
>+	List<LifecycleCallback> getPostConstructs();
> 
> 	/**
> 	 * Returns the value of the 'Pre Destroys' containment reference list.
>@@ -285,7 +317,22 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_PreDestroys()
> 	 * @generated
> 	 */
>-	List getPreDestroys();
>+	List<LifecycleCallback> getPreDestroys();
>+
>+	/**
>+	 * Returns the value of the 'Data Source' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DataSourceType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Data Source' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Data Source' containment reference list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_DataSource()
>+	 * @generated
>+	 */
>+	List<DataSourceType> getDataSource();
> 
> 	/**
> 	 * Returns the value of the 'Post Activates' containment reference list.
>@@ -300,7 +347,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_PostActivates()
> 	 * @generated
> 	 */
>-	List getPostActivates();
>+	List<LifecycleCallback> getPostActivates();
> 
> 	/**
> 	 * Returns the value of the 'Pre Passivates' containment reference list.
>@@ -315,7 +362,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_PrePassivates()
> 	 * @generated
> 	 */
>-	List getPrePassivates();
>+	List<LifecycleCallback> getPrePassivates();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/ApplicationException.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ApplicationException.java,v
>retrieving revision 1.2
>diff -u -r1.2 ApplicationException.java
>--- jee-models/org/eclipse/jst/javaee/ejb/ApplicationException.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/ApplicationException.java	14 Oct 2009 21:48:07 -0000
>@@ -22,17 +22,26 @@
> * 
> * The application-exceptionType declares an application
> * exception. The declaration consists of:
>- * 
>- * - the exception class. When the container receives
>- * an exception of this type, it is required to
>- * forward this exception as an applcation exception
>- * to the client regardless of whether it is a checked
>- * or unchecked exception.
>- * - an optional rollback element. If this element is
>- * set to true, the container must rollback the current
>- * transaction before forwarding the exception to the
>- * client. If not specified, it defaults to false.
>- * 
>+ * 
>+ * - the exception class. When the container receives
>+ * an exception of this type, it is required to 
>+ * forward this exception as an applcation exception 
>+ * to the client regardless of whether it is a checked
>+ * or unchecked exception.
>+ * - an optional rollback element. If this element is 
>+ * set to true, the container must rollback the current 
>+ * transaction before forwarding the exception to the
>+ * client. If not specified, it defaults to false.
>+ * - an optional inherited element. If this element is 
>+ * set to true, subclasses of the exception class type
>+ * are also automatically considered application 
>+ * exceptions (unless overriden at a lower level).
>+ * If set to false, only the exception class type is
>+ * considered an application-exception, not its
>+ * exception subclasses. If not specified, this
>+ * value defaults to true.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -41,6 +50,7 @@
> * <ul>
> * <li>{@link org.eclipse.jst.javaee.ejb.ApplicationException#getExceptionClass Exception Class}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.ApplicationException#isRollback Rollback}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.ApplicationException#isInherited Inherited}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.ApplicationException#getId Id}</li>
> * </ul>
> * 
>@@ -128,6 +138,59 @@
> 	boolean isSetRollback();
> 
> 	/**
>+	 * Returns the value of the 'Inherited' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, EJB 3.1
>+	 * 
>+	 * 
>+	 * @return the value of the 'Inherited' attribute.
>+	 * @see #isSetInherited()
>+	 * @see #unsetInherited()
>+	 * @see #setInherited(boolean)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getApplicationException_Inherited()
>+	 * @generated
>+	 */
>+	boolean isInherited();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ApplicationException#isInherited Inherited}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Inherited' attribute.
>+	 * @see #isSetInherited()
>+	 * @see #unsetInherited()
>+	 * @see #isInherited()
>+	 * @generated
>+	 */
>+	void setInherited(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.ApplicationException#isInherited Inherited}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetInherited()
>+	 * @see #isInherited()
>+	 * @see #setInherited(boolean)
>+	 * @generated
>+	 */
>+	void unsetInherited();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.ApplicationException#isInherited Inherited}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Inherited' attribute is set.
>+	 * @see #unsetInherited()
>+	 * @see #isInherited()
>+	 * @see #setInherited(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetInherited();
>+
>+	/**
> 	 * Returns the value of the 'Id' attribute.
> 	 * 
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/ejb/AroundInvokeType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/AroundInvokeType.java,v
>retrieving revision 1.2
>diff -u -r1.2 AroundInvokeType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/AroundInvokeType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/AroundInvokeType.java	14 Oct 2009 21:48:07 -0000
>@@ -21,17 +21,18 @@
> * 
> * 
> * The around-invoke type specifies a method on a
>- * class to be called during the around invoke portion of an
>+ * class to be called during the around invoke portion of an 
> * ejb invocation. Note that each class may have only one
> * around invoke method and that the method may not be
> * overloaded.
>- * 
>+ * 
> * If the class element is missing then
> * the class defining the callback is assumed to be the
> * interceptor class or component class in scope at the
> * location in the descriptor in which the around invoke
> * definition appears.
>- * 
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>Index: jee-models/org/eclipse/jst/javaee/ejb/EJBJar.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBJar.java,v
>retrieving revision 1.2
>diff -u -r1.2 EJBJar.java
>--- jee-models/org/eclipse/jst/javaee/ejb/EJBJar.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/EJBJar.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,9 @@
> 
> 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;
> 
> /**
>@@ -22,23 +25,26 @@
> * 
> * 
> * 
>- * 	The ejb-jarType defines the root element of the EJB
>- * 	deployment descriptor. It contains
>- * 
>- * 	 - an optional description of the ejb-jar file
>- * 	 - an optional display name
>- * 	 - an optional icon that contains a small and a large
>- * 	 icon file name
>- * 	 - structural information about all included
>- * 	 enterprise beans that is not specified through
>- * annotations
>- * - structural information about interceptor classes
>- * 	 - a descriptor for container managed relationships,
>- * 	 if any.
>- * 	 - an optional application-assembly descriptor
>- * 	 - an optional name of an ejb-client-jar file for the
>- * 	 ejb-jar.
>- * 
>+ * The ejb-jarType defines the root element of the EJB
>+ * deployment descriptor. It contains
>+ * 
>+ * - an optional description of the ejb-jar file
>+ * - an optional display name
>+ * - an optional icon that contains a small and a large
>+ * icon file name
>+ * - an optional module name. Only applicable to
>+ * stand-alone ejb-jars or ejb-jars packaged in an ear.
>+ * - structural information about all included
>+ * enterprise beans that is not specified through
>+ * annotations
>+ * - structural information about interceptor classes
>+ * - a descriptor for container managed relationships, 
>+ * if any. 
>+ * - an optional application-assembly descriptor
>+ * - an optional name of an ejb-client-jar file for the 
>+ * ejb-jar.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -48,6 +54,7 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getDescriptions Descriptions}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getDisplayNames Display Names}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getIcons Icons}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getModuleName Module Name}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getEnterpriseBeans Enterprise Beans}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getInterceptors Interceptors}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getRelationships Relationships}</li>
>@@ -77,7 +84,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -92,7 +99,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -107,7 +114,33 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
>+
>+	/**
>+	 * Returns the value of the 'Module Name' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, EJB 3.1
>+	 * 
>+	 * 
>+	 * @return the value of the 'Module Name' attribute.
>+	 * @see #setModuleName(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJar_ModuleName()
>+	 * @generated
>+	 */
>+	String getModuleName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.EJBJar#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 'Enterprise Beans' containment reference.
>@@ -191,11 +224,12 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 Providing an assembly-descriptor in the deployment
>-	 * 	 descriptor is optional for the ejb-jar file
>-	 * 	 producer.
>-	 * 
>-	 * 	 
>+	 * Providing an assembly-descriptor in the deployment
>+	 * descriptor is optional for the ejb-jar file
>+	 * producer.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Assembly Descriptor' containment reference.
> 	 * @see #setAssemblyDescriptor(AssemblyDescriptor)
>@@ -220,20 +254,20 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 
>-	 * 
>-	 * 	 The optional ejb-client-jar element specifies a JAR
>-	 * 	 file that contains the class files necessary for a
>-	 * 	 client program to access the
>-	 * 	 enterprise beans in the ejb-jar file.
>-	 * 
>-	 * 	 Example:
>-	 * 
>-	 * 		 &lt;ejb-client-jar&gt;employee_service_client.jar
>-	 * 		 &lt;/ejb-client-jar&gt;
>-	 * 
>-	 * 	 
>-	 * 	 
>+	 * <![CDATA[[
>+	 * The optional ejb-client-jar element specifies a JAR
>+	 * file that contains the class files necessary for a
>+	 * client program to access the
>+	 * enterprise beans in the ejb-jar file.
>+	 * 
>+	 * Example:
>+	 * 
>+	 * 	 <ejb-client-jar>employee_service_client.jar
>+	 * 	 </ejb-client-jar>
>+	 * 
>+	 * ]]>
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Ejb Client Jar' attribute.
> 	 * @see #setEjbClientJar(String)
>@@ -284,25 +318,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, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Metadata Complete' attribute.
> 	 * @see #isSetMetadataComplete()
>@@ -350,20 +385,21 @@
> 
> 	/**
> 	 * Returns the value of the 'Version' attribute.
>-	 * The default value is <code>"3.0"</code>.
>+	 * The default value is <code>"3.1"</code>.
> 	 * 
> 	 * 
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The version specifies the version of the
>-	 * 	 EJB specification that the instance document must
>-	 * 	 comply with. This information enables deployment tools
>-	 * 	 to validate a particular EJB Deployment
>-	 * 	 Descriptor with respect to a specific version of the EJB
>-	 * 	 schema.
>-	 * 
>-	 * 	
>+	 * The version specifies the version of the
>+	 * EJB specification that the instance document must 
>+	 * comply with. This information enables deployment tools
>+	 * to validate a particular EJB Deployment
>+	 * Descriptor with respect to a specific version of the EJB
>+	 * schema. 
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Version' attribute.
> 	 * @see #isSetVersion()
>Index: jee-models/org/eclipse/jst/javaee/ejb/EjbFactory.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EjbFactory.java,v
>retrieving revision 1.2
>diff -u -r1.2 EjbFactory.java
>--- jee-models/org/eclipse/jst/javaee/ejb/EjbFactory.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/EjbFactory.java	14 Oct 2009 21:48:07 -0000
>@@ -11,6 +11,7 @@
> package org.eclipse.jst.javaee.ejb;
> 
> import org.eclipse.emf.ecore.EFactory;
>+
> import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
> 
> /**
>@@ -31,6 +32,15 @@
> 	EjbFactory eINSTANCE = org.eclipse.jst.javaee.ejb.internal.impl.EjbFactoryImpl.init();
> 
> 	/**
>+	 * Returns a new object of class 'Access Timeout Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Access Timeout Type'.
>+	 * @generated
>+	 */
>+	AccessTimeoutType createAccessTimeoutType();
>+
>+	/**
> 	 * Returns a new object of class 'Activation Config'.
> 	 * 
> 	 * 
>@@ -67,6 +77,15 @@
> 	AroundInvokeType createAroundInvokeType();
> 
> 	/**
>+	 * Returns a new object of class 'Around Timeout Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Around Timeout Type'.
>+	 * @generated
>+	 */
>+	AroundTimeoutType createAroundTimeoutType();
>+
>+	/**
> 	 * Returns a new object of class 'Assembly Descriptor'.
> 	 * 
> 	 * 
>@@ -76,6 +95,15 @@
> 	AssemblyDescriptor createAssemblyDescriptor();
> 
> 	/**
>+	 * Returns a new object of class 'Async Method Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Async Method Type'.
>+	 * @generated
>+	 */
>+	AsyncMethodType createAsyncMethodType();
>+
>+	/**
> 	 * Returns a new object of class 'CMP Field'.
> 	 * 
> 	 * 
>@@ -94,6 +122,15 @@
> 	CMRField createCMRField();
> 
> 	/**
>+	 * Returns a new object of class 'Concurrent Method Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Concurrent Method Type'.
>+	 * @generated
>+	 */
>+	ConcurrentMethodType createConcurrentMethodType();
>+
>+	/**
> 	 * Returns a new object of class 'Container Transaction Type'.
> 	 * 
> 	 * 
>@@ -103,6 +140,15 @@
> 	ContainerTransactionType createContainerTransactionType();
> 
> 	/**
>+	 * Returns a new object of class 'Depends On Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Depends On Type'.
>+	 * @generated
>+	 */
>+	DependsOnType createDependsOnType();
>+
>+	/**
> 	 * Returns a new object of class 'EJB Jar'.
> 	 * 
> 	 * 
>@@ -319,6 +365,33 @@
> 	SessionBean createSessionBean();
> 
> 	/**
>+	 * Returns a new object of class 'Stateful Timeout Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Stateful Timeout Type'.
>+	 * @generated
>+	 */
>+	StatefulTimeoutType createStatefulTimeoutType();
>+
>+	/**
>+	 * Returns a new object of class 'Timer Schedule Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Timer Schedule Type'.
>+	 * @generated
>+	 */
>+	TimerScheduleType createTimerScheduleType();
>+
>+	/**
>+	 * Returns a new object of class 'Timer Type'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Timer Type'.
>+	 * @generated
>+	 */
>+	TimerType createTimerType();
>+
>+	/**
> 	 * Returns the package supported by this factory.
> 	 * 
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/ejb/ActivationConfigProperty.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ActivationConfigProperty.java,v
>retrieving revision 1.2
>diff -u -r1.2 ActivationConfigProperty.java
>--- jee-models/org/eclipse/jst/javaee/ejb/ActivationConfigProperty.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/ActivationConfigProperty.java	14 Oct 2009 21:48:07 -0000
>@@ -20,12 +20,13 @@
> * 
> * 
> * 
>- * 	The activation-config-propertyType contains a name/value
>- * 	configuration property pair for a message-driven bean.
>- * 
>- * 	The properties that are recognized for a particular
>- * 	message-driven bean are determined by the messaging type.
>- * 
>+ * The activation-config-propertyType contains a name/value
>+ * configuration property pair for a message-driven bean.
>+ * 
>+ * The properties that are recognized for a particular
>+ * message-driven bean are determined by the messaging type.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -50,15 +51,16 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The activation-config-property-name element contains
>-	 * 	 the name for an activation configuration property of
>-	 * 	 a message-driven bean.
>-	 * 
>-	 * 	 For JMS message-driven beans, the following property
>-	 * 	 names are recognized: acknowledgeMode,
>-	 * 	 messageSelector, destinationType, subscriptionDurability
>-	 * 
>-	 * 	 
>+	 * The activation-config-property-name element contains
>+	 * the name for an activation configuration property of
>+	 * a message-driven bean.
>+	 * 
>+	 * For JMS message-driven beans, the following property
>+	 * names are recognized: acknowledgeMode,
>+	 * messageSelector, destinationType, subscriptionDurability
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Activation Config Property Name' attribute.
> 	 * @see #setActivationConfigPropertyName(String)
>@@ -84,11 +86,12 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The activation-config-property-value element
>-	 * 	 contains the value for an activation configuration
>-	 * 	 property of a message-driven bean.
>-	 * 
>-	 * 	 
>+	 * The activation-config-property-value element
>+	 * contains the value for an activation configuration
>+	 * property of a message-driven bean.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Activation Config Property Value' attribute.
> 	 * @see #setActivationConfigPropertyValue(String)
>Index: jee-models/org/eclipse/jst/javaee/ejb/CMRFieldType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CMRFieldType.java,v
>retrieving revision 1.2
>diff -u -r1.2 CMRFieldType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/CMRFieldType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/CMRFieldType.java	14 Oct 2009 21:48:07 -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,17 +24,37 @@
> * 
> * 
> * 
>- * 	The cmr-field-type element specifies the class of a
>- * 	collection-valued logical relationship field in the entity
>- * 	bean class. The value of an element using cmr-field-typeType
>- * 	must be either: java.util.Collection or java.util.Set.
>- * 
>+ * The cmr-field-type element specifies the class of a
>+ * collection-valued logical relationship field in the entity
>+ * bean class. The value of an element using cmr-field-typeType
>+ * must be either: java.util.Collection or java.util.Set.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMRFieldType()
> * @generated
> */
>-public final class CMRFieldType extends AbstractEnumerator {
>+public enum CMRFieldType implements Enumerator
>+{
>+	/**
>+	 * The 'Java Util Collection' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVA_UTIL_COLLECTION
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVA_UTIL_COLLECTION_LITERAL(0, "javaUtilCollection", "java.util.Collection"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Java Util Set' literal object.
>+	 * 
>+	 * 
>+	 * @see #JAVA_UTIL_SET
>+	 * @generated
>+	 * @ordered
>+	 */
>+	JAVA_UTIL_SET_LITERAL(1, "javaUtilSet", "java.util.Set"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The 'Java Util Collection' literal value.
> 	 * 
>@@ -64,26 +84,6 @@
> 	public static final int JAVA_UTIL_SET = 1;
> 
> 	/**
>-	 * The 'Java Util Collection' literal object.
>-	 * 
>-	 * 
>-	 * @see #JAVA_UTIL_COLLECTION
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final CMRFieldType JAVA_UTIL_COLLECTION_LITERAL = new CMRFieldType(JAVA_UTIL_COLLECTION, "javaUtilCollection", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Java Util Set' literal object.
>-	 * 
>-	 * 
>-	 * @see #JAVA_UTIL_SET
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final CMRFieldType JAVA_UTIL_SET_LITERAL = new CMRFieldType(JAVA_UTIL_SET, "javaUtilSet", "java.util.Set"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
> 	 * An array of all the 'CMR Field Type' enumerators.
> 	 * 
> 	 * 
>@@ -101,7 +101,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<CMRFieldType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'CMR Field Type' literal with the specified literal value.
>@@ -146,17 +146,77 @@
> 			case JAVA_UTIL_COLLECTION: return JAVA_UTIL_COLLECTION_LITERAL;
> 			case JAVA_UTIL_SET: return JAVA_UTIL_SET_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 CMRFieldType(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;
> 	}
> 
>-} //CMRFieldType
>+	/**
>+	 * 
>+	 * 
>+	 * @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/ejb/CmpVersionType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CmpVersionType.java,v
>retrieving revision 1.2
>diff -u -r1.2 CmpVersionType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/CmpVersionType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/CmpVersionType.java	14 Oct 2009 21:48:07 -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 cmp-versionType specifies the version of an entity bean
>- * 	with container-managed persistence. It is used by
>- * 	cmp-version elements.
>- * 
>- * 	The value must be one of the two following:
>- * 
>- * 	 1.x
>- * 	 2.x
>- * 
>+ * The cmp-versionType specifies the version of an entity bean
>+ * with container-managed persistence. It is used by
>+ * cmp-version elements.
>+ * 
>+ * The value must be one of the two following:
>+ * 
>+ * 1.x
>+ * 2.x
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCmpVersionType()
> * @generated
> */
>-public final class CmpVersionType extends AbstractEnumerator {
>+public enum CmpVersionType implements Enumerator
>+{
>+	/**
>+	 * The '1X' literal object.
>+	 * 
>+	 * 
>+	 * @see #_1X
>+	 * @generated
>+	 * @ordered
>+	 */
>+	_1X_LITERAL(0, "_1X", "1.x"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The '2X' literal object.
>+	 * 
>+	 * 
>+	 * @see #_2X
>+	 * @generated
>+	 * @ordered
>+	 */
>+	_2X_LITERAL(1, "_2X", "2.x"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The '1X' literal value.
> 	 * 
>@@ -68,26 +88,6 @@
> 	public static final int _2X = 1;
> 
> 	/**
>-	 * The '1X' literal object.
>-	 * 
>-	 * 
>-	 * @see #_1X
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final CmpVersionType _1X_LITERAL = new CmpVersionType(_1X, "_1X", "1.x"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The '2X' literal object.
>-	 * 
>-	 * 
>-	 * @see #_2X
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final CmpVersionType _2X_LITERAL = new CmpVersionType(_2X, "_2X", "2.x"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
> 	 * An array of all the 'Cmp Version Type' enumerators.
> 	 * 
> 	 * 
>@@ -105,7 +105,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<CmpVersionType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Cmp Version Type' literal with the specified literal value.
>@@ -150,17 +150,77 @@
> 			case _1X: return _1X_LITERAL;
> 			case _2X: return _2X_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 CmpVersionType(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;
> 	}
> 
>-} //CmpVersionType
>+	/**
>+	 * 
>+	 * 
>+	 * @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/ejb/EJBRelationshipRole.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBRelationshipRole.java,v
>retrieving revision 1.2
>diff -u -r1.2 EJBRelationshipRole.java
>--- jee-models/org/eclipse/jst/javaee/ejb/EJBRelationshipRole.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/EJBRelationshipRole.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.EmptyType;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
>@@ -22,46 +23,46 @@
> *
> * 
> * 
>- * 	
>- * 
>- * 	 The ejb-relationship-roleType describes a role within a
>- * 	 relationship. There are two roles in each relationship.
>- * 
>- * 	 The ejb-relationship-roleType contains an optional
>- * 	 description; an optional name for the relationship role; a
>- * 	 specification of the multiplicity of the role; an optional
>- * 	 specification of cascade-delete functionality for the role;
>- * 	 the role source; and a declaration of the cmr-field, if any,
>- * 	 by means of which the other side of the relationship is
>- * 	 accessed from the perspective of the role source.
>- * 
>- * 	 The multiplicity and role-source element are mandatory.
>- * 
>- * 	 The relationship-role-source element designates an entity
>- * 	 bean by means of an ejb-name element. For bidirectional
>- * 	 relationships, both roles of a relationship must declare a
>- * 	 relationship-role-source element that specifies a cmr-field
>- * 	 in terms of which the relationship is accessed. The lack of
>- * 	 a cmr-field element in an ejb-relationship-role specifies
>- * 	 that the relationship is unidirectional in navigability and
>- * 	 the entity bean that participates in the relationship is
>- * 	 "not aware" of the relationship.
>- * 
>- * 	 Example:
>- * 
>- * 	 &lt;ejb-relation&gt;
>- * 	 &lt;ejb-relation-name&gt;Product-LineItem&lt;/ejb-relation-name&gt;
>- * 	 &lt;ejb-relationship-role&gt;
>- * 		 &lt;ejb-relationship-role-name&gt;product-has-lineitems
>- * 		 &lt;/ejb-relationship-role-name&gt;
>- * 		 &lt;multiplicity&gt;One&lt;/multiplicity&gt;
>- * 		 &lt;relationship-role-source&gt;
>- * 		 &lt;ejb-name&gt;ProductEJB&lt;/ejb-name&gt;
>- * 		 &lt;/relationship-role-source&gt;
>- * 	 &lt;/ejb-relationship-role&gt;
>- * 	 &lt;/ejb-relation&gt;
>- * 
>- * 	 
>+ * <![CDATA[[
>+ * The ejb-relationship-roleType describes a role within a
>+ * relationship. There are two roles in each relationship.
>+ * 
>+ * The ejb-relationship-roleType contains an optional
>+ * description; an optional name for the relationship role; a
>+ * specification of the multiplicity of the role; an optional
>+ * specification of cascade-delete functionality for the role;
>+ * the role source; and a declaration of the cmr-field, if any,
>+ * by means of which the other side of the relationship is
>+ * accessed from the perspective of the role source.
>+ * 
>+ * The multiplicity and role-source element are mandatory.
>+ * 
>+ * The relationship-role-source element designates an entity
>+ * bean by means of an ejb-name element. For bidirectional
>+ * relationships, both roles of a relationship must declare a
>+ * relationship-role-source element that specifies a cmr-field
>+ * in terms of which the relationship is accessed. The lack of
>+ * a cmr-field element in an ejb-relationship-role specifies
>+ * that the relationship is unidirectional in navigability and
>+ * the entity bean that participates in the relationship is
>+ * "not aware" of the relationship.
>+ * 
>+ * Example:
>+ * 
>+ * <ejb-relation>
>+ * <ejb-relation-name>Product-LineItem</ejb-relation-name>
>+ * <ejb-relationship-role>
>+ * 	 <ejb-relationship-role-name>product-has-lineitems
>+ * 	 </ejb-relationship-role-name>
>+ * 	 <multiplicity>One</multiplicity>
>+ * 	 <relationship-role-source>
>+ * 	 <ejb-name>ProductEJB</ejb-name>
>+ * 	 </relationship-role-source>
>+ * </ejb-relationship-role>
>+ * </ejb-relation>
>+ * 
>+ * ]]>
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -96,7 +97,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelationshipRole_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Relationship Role Name' attribute.
>@@ -105,12 +106,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The ejb-relationship-role-name element defines a
>-	 * 	 name for a role that is unique within an
>-	 * 	 ejb-relation. Different relationships can use the
>-	 * 	 same name for a role.
>-	 * 
>-	 * 	 
>+	 * The ejb-relationship-role-name element defines a
>+	 * name for a role that is unique within an
>+	 * ejb-relation. Different relationships can use the
>+	 * same name for a role.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Ejb Relationship Role Name' attribute.
> 	 * @see #setEjbRelationshipRoleName(String)
>@@ -131,7 +133,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Multiplicity' attribute.
>-	 * The default value is <code>"One"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.MultiplicityType}.
> 	 * 
> 	 * 
>@@ -192,16 +193,17 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The cascade-delete element specifies that, within a
>-	 * 	 particular relationship, the lifetime of one or more
>-	 * 	 entity beans is dependent upon the lifetime of
>-	 * 	 another entity bean. The cascade-delete element can
>-	 * 	 only be specified for an ejb-relationship-role
>-	 * 	 element contained in an ejb-relation element in
>-	 * 	 which the other ejb-relationship-role
>-	 * 	 element specifies a multiplicity of One.
>-	 * 
>-	 * 	 
>+	 * The cascade-delete element specifies that, within a
>+	 * particular relationship, the lifetime of one or more
>+	 * entity beans is dependent upon the lifetime of
>+	 * another entity bean. The cascade-delete element can
>+	 * only be specified for an ejb-relationship-role
>+	 * element contained in an ejb-relation element in
>+	 * which the other ejb-relationship-role
>+	 * element specifies a multiplicity of One.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Cascade Delete' containment reference.
> 	 * @see #setCascadeDelete(EmptyType)
>Index: jee-models/org/eclipse/jst/javaee/ejb/MethodType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodType.java,v
>retrieving revision 1.2
>diff -u -r1.2 MethodType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/MethodType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/MethodType.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -21,184 +22,184 @@
> *
> * 
> * 
>- * 	
>- * 
>- * 	 The methodType is used to denote a method of an enterprise
>- * 	 bean's business, home, component, and/or web service endpoint
>- * 	 interface, or, in the case of a message-driven bean, the
>- * 	 bean's message listener method, or a set of such
>- * 	 methods. The ejb-name element must be the name of one of the
>- * 	 enterprise beans declared in the deployment descriptor; the
>- * 	 optional method-intf element allows to distinguish between a
>- * 	 method with the same signature that is multiply defined
>- * 	 across the business, home, component, and/or web service
>- * endpoint nterfaces; the method-name element specifies the
>- * method name; and the optional method-params elements identify
>- * a single method among multiple methods with an overloaded
>- * 	 method name.
>- * 
>- * 	 There are three possible styles of using methodType element
>- * 	 within a method element:
>- * 
>- * 	 1.
>- * 	 &lt;method&gt;
>- * 	 &lt;ejb-name&gt;EJBNAME&lt;/ejb-name&gt;
>- * 	 &lt;method-name&gt;*&lt;/method-name&gt;
>- * 	 &lt;/method&gt;
>- * 
>- * 	 This style is used to refer to all the methods of the
>- * 	 specified enterprise bean's business, home, component,
>- * and/or web service endpoint interfaces.
>- * 
>- * 	 2.
>- * 	 &lt;method&gt;
>- * 	 &lt;ejb-name&gt;EJBNAME&lt;/ejb-name&gt;
>- * 	 &lt;method-name&gt;METHOD&lt;/method-name&gt;
>- * 	 &lt;/method&gt;
>- * 
>- * 	 This style is used to refer to the specified method of
>- * 	 the specified enterprise bean. If there are multiple
>- * 	 methods with the same overloaded name, the element of
>- * 	 this style refers to all the methods with the overloaded
>- * 	 name.
>- * 
>- * 	 3.
>- * 	 &lt;method&gt;
>- * 	 &lt;ejb-name&gt;EJBNAME&lt;/ejb-name&gt;
>- * 	 &lt;method-name&gt;METHOD&lt;/method-name&gt;
>- * 	 &lt;method-params&gt;
>- * 		 &lt;method-param&gt;PARAM-1&lt;/method-param&gt;
>- * 		 &lt;method-param&gt;PARAM-2&lt;/method-param&gt;
>- * 		 ...
>- * 		 &lt;method-param&gt;PARAM-n&lt;/method-param&gt;
>- * 	 &lt;/method-params&gt;
>- * 	 &lt;/method&gt;
>- * 
>- * 	 This style is used to refer to a single method within a
>- * 	 set of methods with an overloaded name. PARAM-1 through
>- * 	 PARAM-n are the fully-qualified Java types of the
>- * 	 method's input parameters (if the method has no input
>- * 	 arguments, the method-params element contains no
>- * 	 method-param elements). Arrays are specified by the
>- * 	 array element's type, followed by one or more pair of
>- * 	 square brackets (e.g. int[][]). If there are multiple
>- * 	 methods with the same overloaded name, this style refers
>- * 	 to all of the overloaded methods.
>- * 
>- * 	 Examples:
>- * 
>- * 	 Style 1: The following method element refers to all the
>- * 	 methods of the EmployeeService bean's business, home,
>- * component, and/or web service endpoint interfaces:
>- * 
>- * 	 &lt;method&gt;
>- * 	 &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
>- * 	 &lt;method-name&gt;*&lt;/method-name&gt;
>- * 	 &lt;/method&gt;
>- * 
>- * 	 Style 2: The following method element refers to all the
>- * 	 create methods of the EmployeeService bean's home
>- * 	 interface(s).
>- * 
>- * 	 &lt;method&gt;
>- * 	 &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
>- * 	 &lt;method-name&gt;create&lt;/method-name&gt;
>- * 	 &lt;/method&gt;
>- * 
>- * 	 Style 3: The following method element refers to the
>- * 	 create(String firstName, String LastName) method of the
>- * 	 EmployeeService bean's home interface(s).
>- * 
>- * 	 &lt;method&gt;
>- * 	 &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
>- * 	 &lt;method-name&gt;create&lt;/method-name&gt;
>- * 	 &lt;method-params&gt;
>- * 		 &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
>- * 		 &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
>- * 	 &lt;/method-params&gt;
>- * 	 &lt;/method&gt;
>- * 
>- * 	 The following example illustrates a Style 3 element with
>- * 	 more complex parameter types. The method
>- * 	 foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
>- * 	 mypackage.MyClass[][] myclaar) would be specified as:
>- * 
>- * 	 &lt;method&gt;
>- * 	 &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
>- * 	 &lt;method-name&gt;foobar&lt;/method-name&gt;
>- * 	 &lt;method-params&gt;
>- * 		 &lt;method-param&gt;char&lt;/method-param&gt;
>- * 		 &lt;method-param&gt;int&lt;/method-param&gt;
>- * 		 &lt;method-param&gt;int[]&lt;/method-param&gt;
>- * 		 &lt;method-param&gt;mypackage.MyClass&lt;/method-param&gt;
>- * 		 &lt;method-param&gt;mypackage.MyClass[][]&lt;/method-param&gt;
>- * 	 &lt;/method-params&gt;
>- * 	 &lt;/method&gt;
>- * 
>- * 	 The optional method-intf element can be used when it becomes
>- * 	 necessary to differentiate between a method that is multiply
>- * 	 defined across the enterprise bean's business, home, component,
>- * and/or web service endpoint interfaces with the same name and
>- * 	 signature. However, if the same method is a method of both the
>- * local business interface, and the local component interface,
>- * the same attribute applies to the method for both interfaces.
>- * Likewise, if the same method is a method of both the remote
>- * business interface and the remote component interface, the same
>- * attribute applies to the method for both interfaces.
>- * 
>- * 	 For example, the method element
>- * 
>- * 	 &lt;method&gt;
>- * 	 &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
>- * 	 &lt;method-intf&gt;Remote&lt;/method-intf&gt;
>- * 	 &lt;method-name&gt;create&lt;/method-name&gt;
>- * 	 &lt;method-params&gt;
>- * 		 &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
>- * 		 &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
>- * 	 &lt;/method-params&gt;
>- * 	 &lt;/method&gt;
>- * 
>- * 	 can be used to differentiate the create(String, String)
>- * 	 method defined in the remote interface from the
>- * 	 create(String, String) method defined in the remote home
>- * 	 interface, which would be defined as
>- * 
>- * 	 &lt;method&gt;
>- * 	 &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
>- * 	 &lt;method-intf&gt;Home&lt;/method-intf&gt;
>- * 	 &lt;method-name&gt;create&lt;/method-name&gt;
>- * 	 &lt;method-params&gt;
>- * 		 &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
>- * 		 &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
>- * 	 &lt;/method-params&gt;
>- * 	 &lt;/method&gt;
>- * 
>- * 	 and the create method that is defined in the local home
>- * 	 interface which would be defined as
>- * 
>- * 	 &lt;method&gt;
>- * 	 &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
>- * 	 &lt;method-intf&gt;LocalHome&lt;/method-intf&gt;
>- * 	 &lt;method-name&gt;create&lt;/method-name&gt;
>- * 	 &lt;method-params&gt;
>- * 		 &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
>- * 		 &lt;method-param&gt;java.lang.String&lt;/method-param&gt;
>- * 	 &lt;/method-params&gt;
>- * 	 &lt;/method&gt;
>- * 
>- * 	 The method-intf element can be used with all three Styles
>- * 	 of the method element usage. For example, the following
>- * 	 method element example could be used to refer to all the
>- * 	 methods of the EmployeeService bean's remote home interface
>- * and the remote business interface.
>- * 
>- * 	 &lt;method&gt;
>- * 	 &lt;ejb-name&gt;EmployeeService&lt;/ejb-name&gt;
>- * 	 &lt;method-intf&gt;Home&lt;/method-intf&gt;
>- * 	 &lt;method-name&gt;*&lt;/method-name&gt;
>- * 	 &lt;/method&gt;
>- * 
>- * 	 
>+ * <![CDATA[[
>+ * The methodType is used to denote a method of an enterprise
>+ * bean's business, home, component, and/or web service endpoint
>+ * interface, or, in the case of a message-driven bean, the
>+ * bean's message listener method, or a set of such
>+ * methods. The ejb-name element must be the name of one of the
>+ * enterprise beans declared in the deployment descriptor; the
>+ * optional method-intf element allows to distinguish between a
>+ * method with the same signature that is multiply defined
>+ * across the business, home, component, and/or web service 
>+ * endpoint nterfaces; the method-name element specifies the 
>+ * method name; and the optional method-params elements identify 
>+ * a single method among multiple methods with an overloaded
>+ * method name.
>+ * 
>+ * There are three possible styles of using methodType element
>+ * within a method element:
>+ * 
>+ * 1.
>+ * <method>
>+ * <ejb-name>EJBNAME</ejb-name>
>+ * <method-name>*</method-name>
>+ * </method>
>+ * 
>+ * This style is used to refer to all the methods of the
>+ * specified enterprise bean's business, home, component, 
>+ * and/or web service endpoint interfaces.
>+ * 
>+ * 2.
>+ * <method>
>+ * <ejb-name>EJBNAME</ejb-name>
>+ * <method-name>METHOD</method-name>
>+ * </method>
>+ * 
>+ * This style is used to refer to the specified method of
>+ * the specified enterprise bean. If there are multiple
>+ * methods with the same overloaded name, the element of
>+ * this style refers to all the methods with the overloaded
>+ * name.
>+ * 
>+ * 3.
>+ * <method>
>+ * <ejb-name>EJBNAME</ejb-name>
>+ * <method-name>METHOD</method-name>
>+ * <method-params>
>+ * 	 <method-param>PARAM-1</method-param>
>+ * 	 <method-param>PARAM-2</method-param>
>+ * 	 ...
>+ * 	 <method-param>PARAM-n</method-param>
>+ * </method-params>
>+ * </method>
>+ * 
>+ * This style is used to refer to a single method within a
>+ * set of methods with an overloaded name. PARAM-1 through
>+ * PARAM-n are the fully-qualified Java types of the
>+ * method's input parameters (if the method has no input
>+ * arguments, the method-params element contains no
>+ * method-param elements). Arrays are specified by the
>+ * array element's type, followed by one or more pair of
>+ * square brackets (e.g. int[][]). If there are multiple
>+ * methods with the same overloaded name, this style refers
>+ * to all of the overloaded methods. 
>+ * 
>+ * Examples:
>+ * 
>+ * Style 1: The following method element refers to all the
>+ * methods of the EmployeeService bean's business, home, 
>+ * component, and/or web service endpoint interfaces:
>+ * 
>+ * <method>
>+ * <ejb-name>EmployeeService</ejb-name>
>+ * <method-name>*</method-name>
>+ * </method>
>+ * 
>+ * Style 2: The following method element refers to all the
>+ * create methods of the EmployeeService bean's home
>+ * interface(s).
>+ * 
>+ * <method>
>+ * <ejb-name>EmployeeService</ejb-name>
>+ * <method-name>create</method-name>
>+ * </method>
>+ * 
>+ * Style 3: The following method element refers to the
>+ * create(String firstName, String LastName) method of the
>+ * EmployeeService bean's home interface(s).
>+ * 
>+ * <method>
>+ * <ejb-name>EmployeeService</ejb-name>
>+ * <method-name>create</method-name>
>+ * <method-params>
>+ * 	 <method-param>java.lang.String</method-param>
>+ * 	 <method-param>java.lang.String</method-param>
>+ * </method-params>
>+ * </method>
>+ * 
>+ * The following example illustrates a Style 3 element with
>+ * more complex parameter types. The method 
>+ * foobar(char s, int i, int[] iar, mypackage.MyClass mycl, 
>+ * mypackage.MyClass[][] myclaar) would be specified as:
>+ * 
>+ * <method>
>+ * <ejb-name>EmployeeService</ejb-name>
>+ * <method-name>foobar</method-name>
>+ * <method-params>
>+ * 	 <method-param>char</method-param>
>+ * 	 <method-param>int</method-param>
>+ * 	 <method-param>int[]</method-param>
>+ * 	 <method-param>mypackage.MyClass</method-param>
>+ * 	 <method-param>mypackage.MyClass[][]</method-param>
>+ * </method-params>
>+ * </method>
>+ * 
>+ * The optional method-intf element can be used when it becomes
>+ * necessary to differentiate between a method that is multiply
>+ * defined across the enterprise bean's business, home, component,
>+ * and/or web service endpoint interfaces with the same name and
>+ * signature. However, if the same method is a method of both the
>+ * local business interface, and the local component interface, 
>+ * the same attribute applies to the method for both interfaces.
>+ * Likewise, if the same method is a method of both the remote 
>+ * business interface and the remote component interface, the same
>+ * attribute applies to the method for both interfaces.
>+ * 
>+ * For example, the method element
>+ * 
>+ * <method>
>+ * <ejb-name>EmployeeService</ejb-name>
>+ * <method-intf>Remote</method-intf>
>+ * <method-name>create</method-name>
>+ * <method-params>
>+ * 	 <method-param>java.lang.String</method-param>
>+ * 	 <method-param>java.lang.String</method-param>
>+ * </method-params>
>+ * </method>
>+ * 
>+ * can be used to differentiate the create(String, String)
>+ * method defined in the remote interface from the
>+ * create(String, String) method defined in the remote home
>+ * interface, which would be defined as
>+ * 
>+ * <method>
>+ * <ejb-name>EmployeeService</ejb-name>
>+ * <method-intf>Home</method-intf>
>+ * <method-name>create</method-name>
>+ * <method-params>
>+ * 	 <method-param>java.lang.String</method-param>
>+ * 	 <method-param>java.lang.String</method-param>
>+ * </method-params>
>+ * </method>
>+ * 
>+ * and the create method that is defined in the local home
>+ * interface which would be defined as
>+ * 
>+ * <method>
>+ * <ejb-name>EmployeeService</ejb-name>
>+ * <method-intf>LocalHome</method-intf>
>+ * <method-name>create</method-name>
>+ * <method-params>
>+ * 	 <method-param>java.lang.String</method-param>
>+ * 	 <method-param>java.lang.String</method-param>
>+ * </method-params>
>+ * </method>
>+ * 
>+ * The method-intf element can be used with all three Styles
>+ * of the method element usage. For example, the following
>+ * method element example could be used to refer to all the
>+ * methods of the EmployeeService bean's remote home interface
>+ * and the remote business interface.
>+ * 
>+ * <method>
>+ * <ejb-name>EmployeeService</ejb-name>
>+ * <method-intf>Home</method-intf>
>+ * <method-name>*</method-name>
>+ * </method>
>+ * 
>+ * ]]>
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -232,7 +233,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodType_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Name' attribute.
>@@ -261,7 +262,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Method Intf' attribute.
>-	 * The default value is <code>"Home"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.MethodInterfaceType}.
> 	 * 
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/ejb/Relationships.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/Relationships.java,v
>retrieving revision 1.2
>diff -u -r1.2 Relationships.java
>--- jee-models/org/eclipse/jst/javaee/ejb/Relationships.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/Relationships.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -22,12 +23,13 @@
> * 
> * 
> * 
>- * 	The relationshipsType describes the relationships in
>- * 	which entity beans with container-managed persistence
>- * 	participate. The relationshipsType contains an optional
>- * 	description; and a list of ejb-relation elements, which
>- * 	specify the container managed relationships.
>- * 
>+ * The relationshipsType describes the relationships in
>+ * which entity beans with container-managed persistence
>+ * participate. The relationshipsType contains an optional
>+ * description; and a list of ejb-relation elements, which
>+ * specify the container managed relationships.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -58,7 +60,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRelationships_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Relations' containment reference list.
>@@ -73,7 +75,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRelationships_EjbRelations()
> 	 * @generated
> 	 */
>-	List getEjbRelations();
>+	List<EJBRelation> getEjbRelations();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/MessageDrivenBean.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MessageDrivenBean.java,v
>retrieving revision 1.2
>diff -u -r1.2 MessageDrivenBean.java
>--- jee-models/org/eclipse/jst/javaee/ejb/MessageDrivenBean.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/MessageDrivenBean.java	14 Oct 2009 21:48:07 -0000
>@@ -12,7 +12,22 @@
> 
> 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.Icon;
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.LifecycleCallback;
>+import org.eclipse.jst.javaee.core.MessageDestinationRef;
>+import org.eclipse.jst.javaee.core.PersistenceContextRef;
>+import org.eclipse.jst.javaee.core.PersistenceUnitRef;
>+import org.eclipse.jst.javaee.core.ResourceEnvRef;
>+import org.eclipse.jst.javaee.core.ResourceRef;
>+import org.eclipse.jst.javaee.core.SecurityRoleRef;
>+import org.eclipse.jst.javaee.core.ServiceRef;
> 
> /**
> * 
>@@ -22,52 +37,60 @@
> * 
> * 
> * 
>- * 	The message-driven element declares a message-driven
>- * 	bean. The declaration consists of:
>- * 
>- * 	 - an optional description
>- * 	 - an optional display name
>- * 	 - an optional icon element that contains a small and a large
>- * 	 icon file name.
>- * 	 - a name assigned to the enterprise bean in
>- * 	 the deployment descriptor
>- * - an optional mapped-name element that can be used to provide
>- * vendor-specific deployment information such as the physical
>- * jndi-name of destination from which this message-driven bean
>- * should consume. This element is not required to be supported
>- * by all implementations. Any use of this element is non-portable.
>- * 	 - the message-driven bean's implementation class
>- * 	 - an optional declaration of the bean's messaging
>- * 	 type
>- * - an optional declaration of the bean's timeout method.
>- * 	 - the optional message-driven bean's transaction management
>- * type. If it is not defined, it is defaulted to Container.
>- * 	 - an optional declaration of the bean's
>- * 	 message-destination-type
>- * 	 - an optional declaration of the bean's
>- * 	 message-destination-link
>- * 	 - an optional declaration of the message-driven bean's
>- * 	 activation configuration properties
>- * - an optional list of the message-driven bean class and/or
>- * superclass around-invoke methods.
>- * 	 - an optional declaration of the bean's environment
>- * 	 entries
>- * 	 - an optional declaration of the bean's EJB references
>- * 	 - an optional declaration of the bean's local EJB
>- * 	 references
>- * 	 - an optional declaration of the bean's web service
>- * 	 references
>- * 	 - an optional declaration of the security
>- * 	 identity to be used for the execution of the bean's
>- * 	 methods
>- * 	 - an optional declaration of the bean's
>- * 	 resource manager connection factory
>- * 	 references
>- * 	 - an optional declaration of the bean's resource
>- * 	 environment references.
>- * 	 - an optional declaration of the bean's message
>- * 	 destination references
>- * 
>+ * The message-driven element declares a message-driven
>+ * bean. The declaration consists of:
>+ * 
>+ * - an optional description
>+ * - an optional display name
>+ * - an optional icon element that contains a small and a large 
>+ * icon file name. 
>+ * - a name assigned to the enterprise bean in
>+ * the deployment descriptor
>+ * - an optional mapped-name element that can be used to provide
>+ * vendor-specific deployment information such as the physical
>+ * jndi-name of destination from which this message-driven bean
>+ * should consume. This element is not required to be supported 
>+ * by all implementations. Any use of this element is non-portable.
>+ * - the message-driven bean's implementation class
>+ * - an optional declaration of the bean's messaging 
>+ * type 
>+ * - an optional declaration of the bean's timeout method for
>+ * handling programmatically created timers
>+ * - an optional declaration of timers to be automatically created at
>+ * deployment time
>+ * - the optional message-driven bean's transaction management 
>+ * type. If it is not defined, it is defaulted to Container.
>+ * - an optional declaration of the bean's 
>+ * message-destination-type
>+ * - an optional declaration of the bean's 
>+ * message-destination-link
>+ * - an optional declaration of the message-driven bean's
>+ * activation configuration properties
>+ * - an optional list of the message-driven bean class and/or
>+ * superclass around-invoke methods.
>+ * - an optional list of the message-driven bean class and/or
>+ * superclass around-timeout methods.
>+ * - an optional declaration of the bean's environment
>+ * entries
>+ * - an optional declaration of the bean's EJB references
>+ * - an optional declaration of the bean's local EJB
>+ * references
>+ * - an optional declaration of the bean's web service
>+ * references
>+ * - an optional declaration of the security role 
>+ * references
>+ * - an optional declaration of the security
>+ * identity to be used for the execution of the bean's
>+ * methods
>+ * - an optional declaration of the bean's 
>+ * resource manager connection factory 
>+ * references
>+ * - an optional declaration of the bean's resource
>+ * environment references.
>+ * - an optional declaration of the bean's message 
>+ * destination references
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -82,11 +105,13 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbClass Ejb Class}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessagingType Messaging Type}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTimeoutMethod Timeout Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTimer Timer}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTransactionType Transaction Type}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationType Message Destination Type}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationLink Message Destination Link}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getActivationConfig Activation Config}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getAroundInvokes Around Invokes}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getAroundTimeouts Around Timeouts}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEnvEntries Env Entries}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbRefs Ejb Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbLocalRefs Ejb Local Refs}</li>
>@@ -98,6 +123,8 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceUnitRefs Persistence Unit Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPostConstructs Post Constructs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPreDestroys Pre Destroys}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDataSource Data Source}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getSecurityRoleRef Security Role Ref}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getSecurityIdentity Security Identity}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getId Id}</li>
> * </ul>
>@@ -121,7 +148,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -136,7 +163,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -151,7 +178,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Name' attribute.
>@@ -210,11 +237,12 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * The ejb-class element specifies the fully qualified name
>-	 * of the bean class for this ejb. It is required unless
>-	 * there is a component-defining annotation for the same
>-	 * ejb-name.
>-	 * 
>+	 * The ejb-class element specifies the fully qualified name
>+	 * of the bean class for this ejb. It is required unless
>+	 * there is a component-defining annotation for the same
>+	 * ejb-name.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
> 	 * 
> 	 * 
> 	 * @return the value of the 'Ejb Class' attribute.
>@@ -241,10 +269,11 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The messaging-type element specifies the message
>-	 * 	 listener interface of the message-driven bean.
>-	 * 
>-	 * 	 
>+	 * The messaging-type element specifies the message
>+	 * listener interface of the message-driven bean. 
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Messaging Type' attribute.
> 	 * @see #setMessagingType(String)
>@@ -271,6 +300,16 @@
> 	 * there really should be more of a description here...
> 	 * 
> 	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The timeout-method element specifies the method that
>+	 * will receive callbacks for programmatically
>+	 * created timers.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
>+	 * 
> 	 * @return the value of the 'Timeout Method' containment reference.
> 	 * @see #setTimeoutMethod(NamedMethodType)
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_TimeoutMethod()
>@@ -289,8 +328,22 @@
> 	void setTimeoutMethod(NamedMethodType value);
> 
> 	/**
>+	 * Returns the value of the 'Timer' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.TimerType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Timer' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Timer' containment reference list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_Timer()
>+	 * @generated
>+	 */
>+	List<TimerType> getTimer();
>+
>+	/**
> 	 * Returns the value of the 'Transaction Type' attribute.
>-	 * The default value is <code>"Bean"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.TransactionType}.
> 	 * 
> 	 * 
>@@ -432,7 +485,22 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_AroundInvokes()
> 	 * @generated
> 	 */
>-	List getAroundInvokes();
>+	List<AroundInvokeType> getAroundInvokes();
>+
>+	/**
>+	 * Returns the value of the 'Around Timeouts' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.AroundTimeoutType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Around Timeouts' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Around Timeouts' containment reference list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_AroundTimeouts()
>+	 * @generated
>+	 */
>+	List<AroundTimeoutType> getAroundTimeouts();
> 
> 	/**
> 	 * Returns the value of the 'Env Entries' containment reference list.
>@@ -447,7 +515,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_EnvEntries()
> 	 * @generated
> 	 */
>-	List getEnvEntries();
>+	List<EnvEntry> getEnvEntries();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Refs' containment reference list.
>@@ -462,7 +530,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_EjbRefs()
> 	 * @generated
> 	 */
>-	List getEjbRefs();
>+	List<EjbRef> getEjbRefs();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Local Refs' containment reference list.
>@@ -477,7 +545,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_EjbLocalRefs()
> 	 * @generated
> 	 */
>-	List getEjbLocalRefs();
>+	List<EjbLocalRef> getEjbLocalRefs();
> 
> 	/**
> 	 * Returns the value of the 'Service Refs' containment reference list.
>@@ -492,7 +560,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_ServiceRefs()
> 	 * @generated
> 	 */
>-	List getServiceRefs();
>+	List<ServiceRef> getServiceRefs();
> 
> 	/**
> 	 * Returns the value of the 'Resource Refs' containment reference list.
>@@ -507,7 +575,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_ResourceRefs()
> 	 * @generated
> 	 */
>-	List getResourceRefs();
>+	List<ResourceRef> getResourceRefs();
> 
> 	/**
> 	 * Returns the value of the 'Resource Env Refs' containment reference list.
>@@ -522,7 +590,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_ResourceEnvRefs()
> 	 * @generated
> 	 */
>-	List getResourceEnvRefs();
>+	List<ResourceEnvRef> getResourceEnvRefs();
> 
> 	/**
> 	 * Returns the value of the 'Message Destination Refs' containment reference list.
>@@ -537,7 +605,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_MessageDestinationRefs()
> 	 * @generated
> 	 */
>-	List getMessageDestinationRefs();
>+	List<MessageDestinationRef> getMessageDestinationRefs();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Context Refs' containment reference list.
>@@ -552,7 +620,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_PersistenceContextRefs()
> 	 * @generated
> 	 */
>-	List getPersistenceContextRefs();
>+	List<PersistenceContextRef> getPersistenceContextRefs();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Unit Refs' containment reference list.
>@@ -567,7 +635,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_PersistenceUnitRefs()
> 	 * @generated
> 	 */
>-	List getPersistenceUnitRefs();
>+	List<PersistenceUnitRef> getPersistenceUnitRefs();
> 
> 	/**
> 	 * Returns the value of the 'Post Constructs' containment reference list.
>@@ -582,7 +650,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_PostConstructs()
> 	 * @generated
> 	 */
>-	List getPostConstructs();
>+	List<LifecycleCallback> getPostConstructs();
> 
> 	/**
> 	 * Returns the value of the 'Pre Destroys' containment reference list.
>@@ -597,7 +665,38 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_PreDestroys()
> 	 * @generated
> 	 */
>-	List getPreDestroys();
>+	List<LifecycleCallback> getPreDestroys();
>+
>+	/**
>+	 * Returns the value of the 'Data Source' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DataSourceType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Data Source' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Data Source' containment reference list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_DataSource()
>+	 * @generated
>+	 */
>+	List<DataSourceType> getDataSource();
>+
>+	/**
>+	 * Returns the value of the 'Security Role Ref' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.SecurityRoleRef}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, EJB 3.1
>+	 * 
>+	 * 
>+	 * @return the value of the 'Security Role Ref' containment reference list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMessageDrivenBean_SecurityRoleRef()
>+	 * @generated
>+	 */
>+	List<SecurityRoleRef> getSecurityRoleRef();
> 
> 	/**
> 	 * Returns the value of the 'Security Identity' containment reference.
>Index: jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java,v
>retrieving revision 1.2
>diff -u -r1.2 InterceptorBindingType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -21,101 +22,103 @@
> *
> * 
> * 
>- * 
>+ * <![CDATA[[
> * The interceptor-bindingType element describes the binding of
> * interceptor classes to beans within the ejb-jar.
> * It consists of :
>- * 
>- * - An optional description.
>- * - The name of an ejb within the ejb-jar or the wildcard value "*",
>- * which is used to define interceptors that are bound to all
>- * beans in the ejb-jar.
>- * - A list of interceptor classes that are bound to the contents of
>- * the ejb-name element or a specification of the total ordering
>- * over the interceptors defined for the given level and above.
>- * - An optional exclude-default-interceptors element. If set to true,
>- * specifies that default interceptors are not to be applied to
>- * a bean-class and/or business method.
>- * - An optional exclude-class-interceptors element. If set to true,
>- * specifies that class interceptors are not to be applied to
>- * a business method.
>- * - An optional set of method elements for describing the name/params
>- * of a method-level interceptor.
>- * 
>- * Interceptors bound to all classes using the wildcard syntax
>- * "*" are default interceptors for the components in the ejb-jar.
>- * In addition, interceptors may be bound at the level of the bean
>- * class (class-level interceptors) or business methods (method-level
>- * interceptors ).
>- * 
>- * The binding of interceptors to classes is additive. If interceptors
>- * are bound at the class-level and/or default-level as well as the
>- * method-level, both class-level and/or default-level as well as
>- * method-level will apply.
>- * 
>- * There are four possible styles of the interceptor element syntax :
>- * 
>- * 1.
>- * <interceptor-binding xmlns="http://www.w3.org/2001/XMLSchema">
>- * <ejb-name>*</ejb-name>
>- * <interceptor-class>INTERCEPTOR</interceptor-class>
>- * </interceptor-binding>
>- * 
>- * Specifying the ejb-name as the wildcard value "*" designates
>- * default interceptors (interceptors that apply to all session and
>- * message-driven beans contained in the ejb-jar).
>- * 
>- * 2.
>- * <interceptor-binding xmlns="http://www.w3.org/2001/XMLSchema">
>- * <ejb-name>EJBNAME</ejb-name>
>- * <interceptor-class>INTERCEPTOR</interceptor-class>
>- * </interceptor-binding>
>- * 
>- * This style is used to refer to interceptors associated with the
>- * specified enterprise bean(class-level interceptors).
>- * 
>- * 3.
>- * <interceptor-binding xmlns="http://www.w3.org/2001/XMLSchema">
>- * <ejb-name>EJBNAME</ejb-name>
>- * <interceptor-class>INTERCEPTOR</interceptor-class>
>- * <method>
>- * <method-name>METHOD</method-name>
>- * </method>
>- * </interceptor-binding>
>- * 
>- * This style is used to associate a method-level interceptor with
>- * the specified enterprise bean. If there are multiple methods
>- * with the same overloaded name, the element of this style refers
>- * to all the methods with the overloaded name. Method-level
>- * interceptors can only be associated with business methods of the
>- * bean class. Note that the wildcard value "*" cannot be used
>- * to specify method-level interceptors.
>- * 
>- * 4.
>- * <interceptor-binding xmlns="http://www.w3.org/2001/XMLSchema">
>- * <ejb-name>EJBNAME</ejb-name>
>- * <interceptor-class>INTERCEPTOR</interceptor-class>
>- * <method>
>- * <method-name>METHOD</method-name>
>- * <method-params>
>- * <method-param>PARAM-1</method-param>
>- * <method-param>PARAM-2</method-param>
>- * ...
>- * <method-param>PARAM-N</method-param>
>- * </method-params>
>- * </method>
>- * </interceptor-binding>
>- * 
>- * This style is used to associate a method-level interceptor with
>- * the specified method of the specified enterprise bean. This
>- * style is used to refer to a single method within a set of methods
>- * with an overloaded name. The values PARAM-1 through PARAM-N
>- * are the fully-qualified Java types of the method's input parameters
>- * (if the method has no input arguments, the method-params element
>- * contains no method-param elements). Arrays are specified by the
>- * array element's type, followed by one or more pair of square
>- * brackets (e.g. int[][]).
>- * 
>+ * 
>+ * - An optional description.
>+ * - The name of an ejb within the ejb-jar or the wildcard value "*",
>+ * which is used to define interceptors that are bound to all
>+ * beans in the ejb-jar.
>+ * - A list of interceptor classes that are bound to the contents of
>+ * the ejb-name element or a specification of the total ordering
>+ * over the interceptors defined for the given level and above.
>+ * - An optional exclude-default-interceptors element. If set to true,
>+ * specifies that default interceptors are not to be applied to 
>+ * a bean-class and/or business method.
>+ * - An optional exclude-class-interceptors element. If set to true,
>+ * specifies that class interceptors are not to be applied to 
>+ * a business method.
>+ * - An optional set of method elements for describing the name/params
>+ * of a method-level interceptor.
>+ * 
>+ * Interceptors bound to all classes using the wildcard syntax
>+ * "*" are default interceptors for the components in the ejb-jar. 
>+ * In addition, interceptors may be bound at the level of the bean
>+ * class (class-level interceptors) or business methods (method-level
>+ * interceptors ).
>+ * 
>+ * The binding of interceptors to classes is additive. If interceptors
>+ * are bound at the class-level and/or default-level as well as the
>+ * method-level, both class-level and/or default-level as well as
>+ * method-level will apply. 
>+ * 
>+ * There are four possible styles of the interceptor element syntax :
>+ * 
>+ * 1.
>+ * <interceptor-binding>
>+ * <ejb-name>*</ejb-name>
>+ * <interceptor-class>INTERCEPTOR</interceptor-class>
>+ * </interceptor-binding>
>+ * 
>+ * Specifying the ejb-name as the wildcard value "*" designates
>+ * default interceptors (interceptors that apply to all session and
>+ * message-driven beans contained in the ejb-jar).
>+ * 
>+ * 2. 
>+ * <interceptor-binding>
>+ * <ejb-name>EJBNAME</ejb-name>
>+ * <interceptor-class>INTERCEPTOR</interceptor-class>
>+ * </interceptor-binding>
>+ * 
>+ * This style is used to refer to interceptors associated with the
>+ * specified enterprise bean(class-level interceptors).
>+ * 
>+ * 3. 
>+ * <interceptor-binding>
>+ * <ejb-name>EJBNAME</ejb-name>
>+ * <interceptor-class>INTERCEPTOR</interceptor-class>
>+ * <method>
>+ * <method-name>METHOD</method-name>
>+ * </method>
>+ * </interceptor-binding>
>+ * 
>+ * This style is used to associate a method-level interceptor with 
>+ * the specified enterprise bean. If there are multiple methods
>+ * with the same overloaded name, the element of this style refers
>+ * to all the methods with the overloaded name. Method-level
>+ * interceptors can only be associated with business methods of the
>+ * bean class. Note that the wildcard value "*" cannot be used
>+ * to specify method-level interceptors.
>+ * 
>+ * 4. 
>+ * <interceptor-binding>
>+ * <ejb-name>EJBNAME</ejb-name>
>+ * <interceptor-class>INTERCEPTOR</interceptor-class>
>+ * <method>
>+ * <method-name>METHOD</method-name>
>+ * <method-params>
>+ * <method-param>PARAM-1</method-param>
>+ * <method-param>PARAM-2</method-param>
>+ * ...
>+ * <method-param>PARAM-N</method-param>
>+ * </method-params>
>+ * </method>
>+ * </interceptor-binding>
>+ * 
>+ * This style is used to associate a method-level interceptor with 
>+ * the specified method of the specified enterprise bean. This 
>+ * style is used to refer to a single method within a set of methods
>+ * with an overloaded name. The values PARAM-1 through PARAM-N
>+ * are the fully-qualified Java types of the method's input parameters
>+ * (if the method has no input arguments, the method-params element
>+ * contains no method-param elements). Arrays are specified by the
>+ * array element's type, followed by one or more pair of square 
>+ * brackets (e.g. int[][]).
>+ * 
>+ * ]]>
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -151,7 +154,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorBindingType_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Name' attribute.
>@@ -191,7 +194,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorBindingType_InterceptorClasses()
> 	 * @generated
> 	 */
>-	List getInterceptorClasses();
>+	List<String> getInterceptorClasses();
> 
> 	/**
> 	 * Returns the value of the 'Interceptor Order' containment reference.
>Index: jee-models/org/eclipse/jst/javaee/ejb/QueryMethod.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/QueryMethod.java,v
>retrieving revision 1.2
>diff -u -r1.2 QueryMethod.java
>--- jee-models/org/eclipse/jst/javaee/ejb/QueryMethod.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/QueryMethod.java	14 Oct 2009 21:48:07 -0000
>@@ -19,34 +19,34 @@
> *
> * 
> * 
>- * 	
>- * 
>- * 	 The query-method specifies the method for a finder or select
>- * 	 query.
>- * 
>- * 	 The method-name element specifies the name of a finder or select
>- * 	 method in the entity bean's implementation class.
>- * 
>- * 	 Each method-param must be defined for a query-method using the
>- * 	 method-params element.
>- * 
>- * 	 It is used by the query-method element.
>- * 
>- * 	 Example:
>- * 
>- * 	 &lt;query&gt;
>- * 	 &lt;description&gt;Method finds large orders&lt;/description&gt;
>- * 	 &lt;query-method&gt;
>- * 		 &lt;method-name&gt;findLargeOrders&lt;/method-name&gt;
>- * 		 &lt;method-params&gt;&lt;/method-params&gt;
>- * 	 &lt;/query-method&gt;
>- * 	 &lt;ejb-ql&gt;
>- * 		SELECT OBJECT(o) FROM Order o
>- * 		 WHERE o.amount &amp;gt; 1000
>- * 	 &lt;/ejb-ql&gt;
>- * 	 &lt;/query&gt;
>- * 
>- * 	 
>+ * <![CDATA[[
>+ * The query-method specifies the method for a finder or select
>+ * query.
>+ * 
>+ * The method-name element specifies the name of a finder or select
>+ * method in the entity bean's implementation class.
>+ * 
>+ * Each method-param must be defined for a query-method using the
>+ * method-params element.
>+ * 
>+ * It is used by the query-method element. 
>+ * 
>+ * Example:
>+ * 
>+ * <query>
>+ * <description>Method finds large orders</description>
>+ * <query-method>
>+ * 	 <method-name>findLargeOrders</method-name>
>+ * 	 <method-params></method-params>
>+ * </query-method>
>+ * <ejb-ql>
>+ * 	SELECT OBJECT(o) FROM Order o
>+ * 	 WHERE o.amount &gt; 1000
>+ * </ejb-ql>
>+ * </query>
>+ * 
>+ * ]]>
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>Index: jee-models/org/eclipse/jst/javaee/ejb/PersistenceType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/PersistenceType.java,v
>retrieving revision 1.2
>diff -u -r1.2 PersistenceType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/PersistenceType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/PersistenceType.java	14 Oct 2009 21:48:07 -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-typeType specifies an entity bean's persistence
>- * 	management type.
>- * 
>- * 	The persistence-type element must be one of the two following:
>- * 
>- * 	 Bean
>- * 	 Container
>- * 
>+ * The persistence-typeType specifies an entity bean's persistence
>+ * management type.
>+ * 
>+ * The persistence-type element must be one of the two following:
>+ * 
>+ * Bean
>+ * Container
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getPersistenceType()
> * @generated
> */
>-public final class PersistenceType extends AbstractEnumerator {
>+public enum PersistenceType implements Enumerator
>+{
>+	/**
>+	 * The 'Bean' literal object.
>+	 * 
>+	 * 
>+	 * @see #BEAN
>+	 * @generated
>+	 * @ordered
>+	 */
>+	BEAN_LITERAL(0, "Bean", "Bean"), //$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 'Bean' literal value.
> 	 * 
>@@ -67,26 +87,6 @@
> 	public static final int CONTAINER = 1;
> 
> 	/**
>-	 * The 'Bean' literal object.
>-	 * 
>-	 * 
>-	 * @see #BEAN
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final PersistenceType BEAN_LITERAL = new PersistenceType(BEAN, "Bean", "Bean"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Container' literal object.
>-	 * 
>-	 * 
>-	 * @see #CONTAINER
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final PersistenceType CONTAINER_LITERAL = new PersistenceType(CONTAINER, "Container", "Container"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
> 	 * An array of all the 'Persistence Type' enumerators.
> 	 * 
> 	 * 
>@@ -104,7 +104,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<PersistenceType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Persistence Type' literal with the specified literal value.
>@@ -149,17 +149,77 @@
> 			case BEAN: return BEAN_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 PersistenceType(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;
> 	}
> 
>-} //PersistenceType
>+	/**
>+	 * 
>+	 * 
>+	 * @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/ejb/MultiplicityType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MultiplicityType.java,v
>retrieving revision 1.2
>diff -u -r1.2 MultiplicityType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/MultiplicityType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/MultiplicityType.java	14 Oct 2009 21:48:07 -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 multiplicityType describes the multiplicity of the
>- * 	role that participates in a relation.
>- * 
>- * 	The value must be one of the two following:
>- * 
>- * 	 One
>- * 	 Many
>- * 
>+ * The multiplicityType describes the multiplicity of the
>+ * role that participates in a relation.
>+ * 
>+ * The value must be one of the two following:
>+ * 
>+ * One
>+ * Many
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMultiplicityType()
> * @generated
> */
>-public final class MultiplicityType extends AbstractEnumerator {
>+public enum MultiplicityType implements Enumerator
>+{
>+	/**
>+	 * The 'One' literal object.
>+	 * 
>+	 * 
>+	 * @see #ONE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	ONE_LITERAL(0, "One", "One"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Many' literal object.
>+	 * 
>+	 * 
>+	 * @see #MANY
>+	 * @generated
>+	 * @ordered
>+	 */
>+	MANY_LITERAL(1, "Many", "Many"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The 'One' literal value.
> 	 * 
>@@ -67,26 +87,6 @@
> 	public static final int MANY = 1;
> 
> 	/**
>-	 * The 'One' literal object.
>-	 * 
>-	 * 
>-	 * @see #ONE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final MultiplicityType ONE_LITERAL = new MultiplicityType(ONE, "One", "One"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Many' literal object.
>-	 * 
>-	 * 
>-	 * @see #MANY
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final MultiplicityType MANY_LITERAL = new MultiplicityType(MANY, "Many", "Many"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
> 	 * An array of all the 'Multiplicity Type' enumerators.
> 	 * 
> 	 * 
>@@ -104,7 +104,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<MultiplicityType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Multiplicity Type' literal with the specified literal value.
>@@ -149,17 +149,77 @@
> 			case ONE: return ONE_LITERAL;
> 			case MANY: return MANY_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 MultiplicityType(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;
> 	}
> 
>-} //MultiplicityType
>+	/**
>+	 * 
>+	 * 
>+	 * @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/ejb/EJBRelation.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBRelation.java,v
>retrieving revision 1.2
>diff -u -r1.2 EJBRelation.java
>--- jee-models/org/eclipse/jst/javaee/ejb/EJBRelation.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/EJBRelation.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -22,15 +23,16 @@
> * 
> * 
> * 
>- * 	The ejb-relationType describes a relationship between two
>- * 	entity beans with container-managed persistence. It is used
>- * 	by ejb-relation elements. It contains a description; an
>- * 	optional ejb-relation-name element; and exactly two
>- * 	relationship role declarations, defined by the
>- * 	ejb-relationship-role elements. The name of the
>- * 	relationship, if specified, is unique within the ejb-jar
>- * 	file.
>- * 
>+ * The ejb-relationType describes a relationship between two
>+ * entity beans with container-managed persistence. It is used
>+ * by ejb-relation elements. It contains a description; an
>+ * optional ejb-relation-name element; and exactly two
>+ * relationship role declarations, defined by the
>+ * ejb-relationship-role elements. The name of the
>+ * relationship, if specified, is unique within the ejb-jar
>+ * file.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -62,7 +64,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelation_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Relation Name' attribute.
>@@ -71,10 +73,11 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The ejb-relation-name element provides a unique name
>-	 * 	 within the ejb-jar file for a relationship.
>-	 * 
>-	 * 	 
>+	 * The ejb-relation-name element provides a unique name
>+	 * within the ejb-jar file for a relationship.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Ejb Relation Name' attribute.
> 	 * @see #setEjbRelationName(String)
>@@ -106,7 +109,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBRelation_EjbRelationshipRoles()
> 	 * @generated
> 	 */
>-	List getEjbRelationshipRoles();
>+	List<EJBRelationshipRole> getEjbRelationshipRoles();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/Query.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/Query.java,v
>retrieving revision 1.2
>diff -u -r1.2 Query.java
>--- jee-models/org/eclipse/jst/javaee/ejb/Query.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/Query.java	14 Oct 2009 21:48:07 -0000
>@@ -21,27 +21,28 @@
> * 
> * 
> * 
>- * 	The queryType defines a finder or select
>- * 	query. It contains
>- * 	 - an optional description of the query
>- * 	 - the specification of the finder or select
>- * 	 method it is used by
>- * 		- an optional specification of the result type
>- * 		 mapping, if the query is for a select method
>- * 		 and entity objects are returned.
>- * 		- the EJB QL query string that defines the query.
>- * 
>- * 	Queries that are expressible in EJB QL must use the ejb-ql
>- * 	element to specify the query. If a query is not expressible
>- * 	in EJB QL, the description element should be used to
>- * 	describe the semantics of the query and the ejb-ql element
>- * 	should be empty.
>- * 
>- * 	The result-type-mapping is an optional element. It can only
>- * 	be present if the query-method specifies a select method
>- * 	that returns entity objects. The default value for the
>- * 	result-type-mapping element is "Local".
>- * 
>+ * The queryType defines a finder or select
>+ * query. It contains
>+ * - an optional description of the query
>+ * - the specification of the finder or select
>+ * method it is used by
>+ * 	- an optional specification of the result type 
>+ * 	 mapping, if the query is for a select method 
>+ * 	 and entity objects are returned.
>+ * 	- the EJB QL query string that defines the query.
>+ * 
>+ * Queries that are expressible in EJB QL must use the ejb-ql
>+ * element to specify the query. If a query is not expressible
>+ * in EJB QL, the description element should be used to
>+ * describe the semantics of the query and the ejb-ql element
>+ * should be empty.
>+ * 
>+ * The result-type-mapping is an optional element. It can only
>+ * be present if the query-method specifies a select method
>+ * that returns entity objects. The default value for the
>+ * result-type-mapping element is "Local".
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -113,7 +114,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Result Type Mapping' attribute.
>-	 * The default value is <code>"Local"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.ResultTypeMappingType}.
> 	 * 
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/ejb/InterceptorsType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorsType.java,v
>retrieving revision 1.2
>diff -u -r1.2 InterceptorsType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/InterceptorsType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/InterceptorsType.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -25,10 +26,11 @@
> * The interceptorsType element declares one or more interceptor
> * classes used by components within this ejb-jar. The declaration
> * consists of :
>- * 
>- * - An optional description.
>- * - One or more interceptor elements.
>- * 
>+ * 
>+ * - An optional description.
>+ * - One or more interceptor elements.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -59,7 +61,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorsType_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Interceptors' containment reference list.
>@@ -74,7 +76,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorsType_Interceptors()
> 	 * @generated
> 	 */
>-	List getInterceptors();
>+	List<InterceptorType> getInterceptors();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/TransactionAttributeType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/TransactionAttributeType.java,v
>retrieving revision 1.2
>diff -u -r1.2 TransactionAttributeType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/TransactionAttributeType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/TransactionAttributeType.java	14 Oct 2009 21:48:07 -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,81 @@
> * 
> * 
> * 
>- * 	The trans-attributeType specifies how the container must
>- * 	manage the transaction boundaries when delegating a method
>- * 	invocation to an enterprise bean's business method.
>- * 
>- * 	The value must be one of the following:
>- * 
>- * 	 NotSupported
>- * 	 Supports
>- * 	 Required
>- * 	 RequiresNew
>- * 	 Mandatory
>- * 	 Never
>- * 
>+ * The trans-attributeType specifies how the container must
>+ * manage the transaction boundaries when delegating a method 
>+ * invocation to an enterprise bean's business method. 
>+ * 
>+ * The value must be one of the following: 
>+ * 
>+ * NotSupported 
>+ * Supports 
>+ * Required 
>+ * RequiresNew 
>+ * Mandatory 
>+ * Never 
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTransactionAttributeType()
> * @generated
> */
>-public final class TransactionAttributeType extends AbstractEnumerator {
>+public enum TransactionAttributeType implements Enumerator
>+{
>+	/**
>+	 * The 'Not Supported' literal object.
>+	 * 
>+	 * 
>+	 * @see #NOT_SUPPORTED
>+	 * @generated
>+	 * @ordered
>+	 */
>+	NOT_SUPPORTED_LITERAL(0, "NotSupported", "NotSupported"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Supports' literal object.
>+	 * 
>+	 * 
>+	 * @see #SUPPORTS
>+	 * @generated
>+	 * @ordered
>+	 */
>+	SUPPORTS_LITERAL(1, "Supports", "Supports"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Required' literal object.
>+	 * 
>+	 * 
>+	 * @see #REQUIRED
>+	 * @generated
>+	 * @ordered
>+	 */
>+	REQUIRED_LITERAL(2, "Required", "Required"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Requires New' literal object.
>+	 * 
>+	 * 
>+	 * @see #REQUIRES_NEW
>+	 * @generated
>+	 * @ordered
>+	 */
>+	REQUIRES_NEW_LITERAL(3, "RequiresNew", "RequiresNew"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Mandatory' literal object.
>+	 * 
>+	 * 
>+	 * @see #MANDATORY
>+	 * @generated
>+	 * @ordered
>+	 */
>+	MANDATORY_LITERAL(4, "Mandatory", "Mandatory"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Never' literal object.
>+	 * 
>+	 * 
>+	 * @see #NEVER
>+	 * @generated
>+	 * @ordered
>+	 */
>+	NEVER_LITERAL(5, "Never", "Never"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The 'Not Supported' literal value.
> 	 * 
>@@ -128,66 +184,6 @@
> 	public static final int NEVER = 5;
> 
> 	/**
>-	 * The 'Not Supported' literal object.
>-	 * 
>-	 * 
>-	 * @see #NOT_SUPPORTED
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final TransactionAttributeType NOT_SUPPORTED_LITERAL = new TransactionAttributeType(NOT_SUPPORTED, "NotSupported", "NotSupported"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Supports' literal object.
>-	 * 
>-	 * 
>-	 * @see #SUPPORTS
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final TransactionAttributeType SUPPORTS_LITERAL = new TransactionAttributeType(SUPPORTS, "Supports", "Supports"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Required' literal object.
>-	 * 
>-	 * 
>-	 * @see #REQUIRED
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final TransactionAttributeType REQUIRED_LITERAL = new TransactionAttributeType(REQUIRED, "Required", "Required"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Requires New' literal object.
>-	 * 
>-	 * 
>-	 * @see #REQUIRES_NEW
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final TransactionAttributeType REQUIRES_NEW_LITERAL = new TransactionAttributeType(REQUIRES_NEW, "RequiresNew", "RequiresNew"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Mandatory' literal object.
>-	 * 
>-	 * 
>-	 * @see #MANDATORY
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final TransactionAttributeType MANDATORY_LITERAL = new TransactionAttributeType(MANDATORY, "Mandatory", "Mandatory"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Never' literal object.
>-	 * 
>-	 * 
>-	 * @see #NEVER
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final TransactionAttributeType NEVER_LITERAL = new TransactionAttributeType(NEVER, "Never", "Never"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
> 	 * An array of all the 'Transaction Attribute Type' enumerators.
> 	 * 
> 	 * 
>@@ -209,7 +205,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<TransactionAttributeType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Transaction Attribute Type' literal with the specified literal value.
>@@ -258,17 +254,77 @@
> 			case MANDATORY: return MANDATORY_LITERAL;
> 			case NEVER: return NEVER_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 TransactionAttributeType(int value, String name, String literal) {
>-		super(value, name, literal);
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
> 	}
> 
>-} //TransactionAttributeType
>+	/**
>+	 * 
>+	 * 
>+	 * @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/ejb/SecurityIdentityType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/SecurityIdentityType.java,v
>retrieving revision 1.2
>diff -u -r1.2 SecurityIdentityType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/SecurityIdentityType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/SecurityIdentityType.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.EmptyType;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> import org.eclipse.jst.javaee.core.RunAs;
>@@ -24,12 +25,13 @@
> * 
> * 
> * 
>- * 	The security-identityType specifies whether the caller's
>- * 	security identity is to be used for the execution of the
>- * 	methods of the enterprise bean or whether a specific run-as
>- * 	identity is to be used. It contains an optional description
>- * 	and a specification of the security identity to be used.
>- * 
>+ * The security-identityType specifies whether the caller's
>+ * security identity is to be used for the execution of the
>+ * methods of the enterprise bean or whether a specific run-as
>+ * identity is to be used. It contains an optional description
>+ * and a specification of the security identity to be used.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -61,7 +63,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSecurityIdentityType_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Use Caller Identity' containment reference.
>@@ -70,12 +72,13 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The use-caller-identity element specifies that
>-	 * 	 the caller's security identity be used as the
>-	 * 	 security identity for the execution of the
>-	 * 	 enterprise bean's methods.
>-	 * 
>-	 * 	 
>+	 * The use-caller-identity element specifies that
>+	 * the caller's security identity be used as the
>+	 * security identity for the execution of the
>+	 * enterprise bean's methods.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Use Caller Identity' containment reference.
> 	 * @see #setUseCallerIdentity(EmptyType)
>Index: jee-models/org/eclipse/jst/javaee/ejb/ActivationConfig.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ActivationConfig.java,v
>retrieving revision 1.2
>diff -u -r1.2 ActivationConfig.java
>--- jee-models/org/eclipse/jst/javaee/ejb/ActivationConfig.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/ActivationConfig.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -22,18 +23,19 @@
> * 
> * 
> * 
>- * 	The activation-configType defines information about the
>- * 	expected configuration properties of the message-driven bean
>- * 	in its operational environment. This may include information
>- * 	about message acknowledgement, message selector, expected
>- * 	destination type, etc.
>- * 
>- * 	The configuration information is expressed in terms of
>- * 	name/value configuration properties.
>- * 
>- * 	The properties that are recognized for a particular
>- * 	message-driven bean are determined by the messaging type.
>- * 
>+ * The activation-configType defines information about the
>+ * expected configuration properties of the message-driven bean
>+ * in its operational environment. This may include information
>+ * about message acknowledgement, message selector, expected
>+ * destination type, etc.
>+ * 
>+ * The configuration information is expressed in terms of
>+ * name/value configuration properties.
>+ * 
>+ * The properties that are recognized for a particular
>+ * message-driven bean are determined by the messaging type.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -64,7 +66,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getActivationConfig_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Activation Config Properties' containment reference list.
>@@ -79,7 +81,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getActivationConfig_ActivationConfigProperties()
> 	 * @generated
> 	 */
>-	List getActivationConfigProperties();
>+	List<ActivationConfigProperty> getActivationConfigProperties();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/ExcludeList.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ExcludeList.java,v
>retrieving revision 1.2
>diff -u -r1.2 ExcludeList.java
>--- jee-models/org/eclipse/jst/javaee/ejb/ExcludeList.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/ExcludeList.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -22,13 +23,14 @@
> * 
> * 
> * 
>- * 	The exclude-listType specifies one or more methods which
>- * 	the Assembler marks to be uncallable.
>- * 
>- * 	If the method permission relation contains methods that are
>- * 	in the exclude list, the Deployer should consider those
>- * 	methods to be uncallable.
>- * 
>+ * The exclude-listType specifies one or more methods which
>+ * the Assembler marks to be uncallable.
>+ * 
>+ * If the method permission relation contains methods that are
>+ * in the exclude list, the Deployer should consider those
>+ * methods to be uncallable.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -59,7 +61,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getExcludeList_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Methods' containment reference list.
>@@ -74,7 +76,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getExcludeList_Methods()
> 	 * @generated
> 	 */
>-	List getMethods();
>+	List<MethodType> getMethods();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/TransactionType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/TransactionType.java,v
>retrieving revision 1.2
>diff -u -r1.2 TransactionType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/TransactionType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/TransactionType.java	14 Oct 2009 21:48:07 -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 transaction-typeType specifies an enterprise bean's
>- * 	transaction management type.
>- * 
>- * 	The transaction-type must be one of the two following:
>- * 
>- * 	 Bean
>- * 	 Container
>- * 
>+ * The transaction-typeType specifies an enterprise bean's
>+ * transaction management type.
>+ * 
>+ * The transaction-type must be one of the two following:
>+ * 
>+ * Bean
>+ * Container
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTransactionType()
> * @generated
> */
>-public final class TransactionType extends AbstractEnumerator {
>+public enum TransactionType implements Enumerator
>+{
>+	/**
>+	 * The 'Bean' literal object.
>+	 * 
>+	 * 
>+	 * @see #BEAN
>+	 * @generated
>+	 * @ordered
>+	 */
>+	BEAN_LITERAL(0, "Bean", "Bean"), //$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 'Bean' literal value.
> 	 * 
>@@ -67,26 +87,6 @@
> 	public static final int CONTAINER = 1;
> 
> 	/**
>-	 * The 'Bean' literal object.
>-	 * 
>-	 * 
>-	 * @see #BEAN
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final TransactionType BEAN_LITERAL = new TransactionType(BEAN, "Bean", "Bean"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Container' literal object.
>-	 * 
>-	 * 
>-	 * @see #CONTAINER
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final TransactionType CONTAINER_LITERAL = new TransactionType(CONTAINER, "Container", "Container"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
> 	 * An array of all the 'Transaction Type' enumerators.
> 	 * 
> 	 * 
>@@ -104,7 +104,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<TransactionType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Transaction Type' literal with the specified literal value.
>@@ -149,17 +149,77 @@
> 			case BEAN: return BEAN_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 TransactionType(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;
> 	}
> 
>-} //TransactionType
>+	/**
>+	 * 
>+	 * 
>+	 * @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/ejb/MethodParams.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodParams.java,v
>retrieving revision 1.2
>diff -u -r1.2 MethodParams.java
>--- jee-models/org/eclipse/jst/javaee/ejb/MethodParams.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/MethodParams.java	14 Oct 2009 21:48:07 -0000
>@@ -22,9 +22,10 @@
> * 
> * 
> * 
>- * 	The method-paramsType defines a list of the
>- * 	fully-qualified Java type names of the method parameters.
>- * 
>+ * The method-paramsType defines a list of the
>+ * fully-qualified Java type names of the method parameters.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -49,17 +50,18 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The method-param element contains a primitive
>-	 * 	 or a fully-qualified Java type name of a method
>-	 * 	 parameter.
>-	 * 
>-	 * 	 
>+	 * The method-param element contains a primitive
>+	 * or a fully-qualified Java type name of a method
>+	 * parameter.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Method Params' attribute list.
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodParams_MethodParams()
> 	 * @generated
> 	 */
>-	List getMethodParams();
>+	List<String> getMethodParams();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/ContainerTransactionType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ContainerTransactionType.java,v
>retrieving revision 1.2
>diff -u -r1.2 ContainerTransactionType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/ContainerTransactionType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/ContainerTransactionType.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -22,13 +23,14 @@
> * 
> * 
> * 
>- * 	The container-transactionType specifies how the container
>- * 	must manage transaction scopes for the enterprise bean's
>- * 	method invocations. It defines an optional description, a
>- * 	list of method elements, and a transaction attribute. The
>- * 	transaction attribute is to be applied to all the specified
>- * 	methods.
>- * 
>+ * The container-transactionType specifies how the container
>+ * must manage transaction scopes for the enterprise bean's
>+ * method invocations. It defines an optional description, a
>+ * list of method elements, and a transaction attribute. The
>+ * transaction attribute is to be applied to all the specified
>+ * methods.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -60,7 +62,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getContainerTransactionType_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Methods' containment reference list.
>@@ -75,11 +77,10 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getContainerTransactionType_Methods()
> 	 * @generated
> 	 */
>-	List getMethods();
>+	List<MethodType> getMethods();
> 
> 	/**
> 	 * Returns the value of the 'Trans Attribute' attribute.
>-	 * The default value is <code>"NotSupported"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.TransactionAttributeType}.
> 	 * 
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/ejb/SessionBean.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/SessionBean.java,v
>retrieving revision 1.2
>diff -u -r1.2 SessionBean.java
>--- jee-models/org/eclipse/jst/javaee/ejb/SessionBean.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/SessionBean.java	14 Oct 2009 21:48:07 -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.EmptyType;
>+import org.eclipse.jst.javaee.core.EnvEntry;
>+import org.eclipse.jst.javaee.core.Icon;
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.LifecycleCallback;
>+import org.eclipse.jst.javaee.core.MessageDestinationRef;
>+import org.eclipse.jst.javaee.core.PersistenceContextRef;
>+import org.eclipse.jst.javaee.core.PersistenceUnitRef;
>+import org.eclipse.jst.javaee.core.ResourceEnvRef;
>+import org.eclipse.jst.javaee.core.ResourceRef;
>+import org.eclipse.jst.javaee.core.SecurityRoleRef;
>+import org.eclipse.jst.javaee.core.ServiceRef;
> 
> /**
> * 
>@@ -22,64 +38,81 @@
> * 
> * 
> * 
>- * 	The session-beanType declares an session bean. The
>- * 	declaration consists of:
>- * 
>- * 	 - an optional description
>- * 	 - an optional display name
>- * 	 - an optional icon element that contains a small and a large
>- * 	 icon file name
>- * 	 - a name assigned to the enterprise bean
>- * 	 in the deployment description
>- * - an optional mapped-name element that can be used to provide
>- * vendor-specific deployment information such as the physical
>- * jndi-name of the session bean's remote home/business interface.
>- * This element is not required to be supported by all
>- * implementations. Any use of this element is non-portable.
>- * - the names of all the remote or local business interfaces,
>- * if any
>- * 	 - the names of the session bean's remote home and
>- * 	 remote interfaces, if any
>- * 	 - the names of the session bean's local home and
>- * 	 local interfaces, if any
>- * 	 - the name of the session bean's web service endpoint
>- * 	 interface, if any
>- * 	 - the session bean's implementation class
>- * 	 - the session bean's state management type
>- * - an optional declaration of the session bean's timeout method.
>- * 	 - the optional session bean's transaction management type.
>- * If it is not present, it is defaulted to Container.
>- * - an optional list of the session bean class and/or
>- * superclass around-invoke methods.
>- * 	 - an optional declaration of the bean's
>- * 	 environment entries
>- * 	 - an optional declaration of the bean's EJB references
>- * 	 - an optional declaration of the bean's local
>- * 	 EJB references
>- * 	 - an optional declaration of the bean's web
>- * 	 service references
>- * 	 - an optional declaration of the security role
>- * 	 references
>- * 	 - an optional declaration of the security identity
>- * 	 to be used for the execution of the bean's methods
>- * 	 - an optional declaration of the bean's resource
>- * 	 manager connection factory references
>- * 	 - an optional declaration of the bean's resource
>- * 	 environment references.
>- * 	 - an optional declaration of the bean's message
>- * 	 destination references
>- * 
>- * 	The elements that are optional are "optional" in the sense
>- * 	that they are omitted when if lists represented by them are
>- * 	empty.
>- * 
>- * 	Either both the local-home and the local elements or both
>- * 	the home and the remote elements must be specified for the
>- * 	session bean.
>- * 
>- * 	The service-endpoint element may only be specified if the
>- * 	bean is a stateless session bean.
>- * 
>+ * The session-beanType declares an session bean. The
>+ * declaration consists of:
>+ * 
>+ * - an optional description
>+ * - an optional display name
>+ * - an optional icon element that contains a small and a large 
>+ * icon file name
>+ * - a name assigned to the enterprise bean
>+ * in the deployment description
>+ * - an optional mapped-name element that can be used to provide
>+ * vendor-specific deployment information such as the physical
>+ * jndi-name of the session bean's remote home/business interface. 
>+ * This element is not required to be supported by all 
>+ * implementations. Any use of this element is non-portable.
>+ * - the names of all the remote or local business interfaces, 
>+ * if any
>+ * - the names of the session bean's remote home and
>+ * remote interfaces, if any
>+ * - the names of the session bean's local home and
>+ * local interfaces, if any
>+ * - an optional declaration that this bean exposes a
>+ * no-interface view
>+ * - the name of the session bean's web service endpoint
>+ * interface, if any
>+ * - the session bean's implementation class
>+ * - the session bean's state management type
>+ * - an optional declaration of a stateful session bean's timeout value
>+ * - an optional declaration of the session bean's timeout method for
>+ * handling programmatically created timers
>+ * - an optional declaration of timers to be automatically created at
>+ * deployment time
>+ * - an optional declaration that a Singleton bean has eager
>+ * initialization
>+ * - an optional declaration of a Singleton/Stateful bean's concurrency 
>+ * management type
>+ * - an optional declaration of the method locking metadata
>+ * for a Singleton with container managed concurrency
>+ * - an optional declaration of the other Singleton beans in the
>+ * application that must be initialized before this bean
>+ * - an optional declaration of the session bean's asynchronous 
>+ * methods
>+ * - the optional session bean's transaction management type. 
>+ * If it is not present, it is defaulted to Container.
>+ * - an optional declaration of a stateful session bean's 
>+ * afterBegin, beforeCompletion, and/or afterCompletion methods
>+ * - an optional list of the session bean class and/or
>+ * superclass around-invoke methods.
>+ * - an optional list of the session bean class and/or
>+ * superclass around-timeout methods.
>+ * - an optional declaration of the bean's 
>+ * environment entries
>+ * - an optional declaration of the bean's EJB references
>+ * - an optional declaration of the bean's local 
>+ * EJB references
>+ * - an optional declaration of the bean's web 
>+ * service references
>+ * - an optional declaration of the security role 
>+ * references
>+ * - an optional declaration of the security identity 
>+ * to be used for the execution of the bean's methods
>+ * - an optional declaration of the bean's resource 
>+ * manager connection factory references
>+ * - an optional declaration of the bean's resource 
>+ * environment references.
>+ * - an optional declaration of the bean's message 
>+ * destination references
>+ * 
>+ * The elements that are optional are "optional" in the sense
>+ * that they are omitted when if lists represented by them are
>+ * empty.
>+ * 
>+ * The service-endpoint element may only be specified if the
>+ * bean is a stateless session bean.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -97,14 +130,26 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocal Local}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getBusinessLocals Business Locals}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getBusinessRemotes Business Remotes}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocalBean Local Bean}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getServiceEndpoint Service Endpoint}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbClass Ejb Class}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getSessionType Session Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getStatefulTimeout Stateful Timeout}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getTimeoutMethod Timeout Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getTimer Timer}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#isInitOnStartup Init On Startup}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getConcurrencyManagementType Concurrency Management Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getConcurrentMethod Concurrent Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getDependsOn Depends On}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getInitMethods Init Methods}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getRemoveMethods Remove Methods}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getAsyncMethod Async Method}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getTransactionType Transaction Type}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getAfterBeginMethod After Begin Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getBeforeCompletionMethod Before Completion Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getAfterCompletionMethod After Completion Method}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getAroundInvokes Around Invokes}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getAroundTimeouts Around Timeouts}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getEnvEntries Env Entries}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbRefs Ejb Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbLocalRefs Ejb Local Refs}</li>
>@@ -116,6 +161,7 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceUnitRefs Persistence Unit Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getPostConstructs Post Constructs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getPreDestroys Pre Destroys}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getDataSource Data Source}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getPostActivates Post Activates}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getPrePassivates Pre Passivates}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.SessionBean#getSecurityRoleRefs Security Role Refs}</li>
>@@ -142,7 +188,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -157,7 +203,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -172,7 +218,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Name' attribute.
>@@ -337,7 +383,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_BusinessLocals()
> 	 * @generated
> 	 */
>-	List getBusinessLocals();
>+	List<String> getBusinessLocals();
> 
> 	/**
> 	 * Returns the value of the 'Business Remotes' attribute list.
>@@ -352,23 +398,54 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_BusinessRemotes()
> 	 * @generated
> 	 */
>-	List getBusinessRemotes();
>+	List<String> getBusinessRemotes();
> 
> 	/**
>-	 * Returns the value of the 'Service Endpoint' attribute.
>+	 * Returns the value of the 'Local Bean' containment reference.
> 	 * 
> 	 * 
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The service-endpoint element contains the
>-	 * 	 fully-qualified name of the enterprise bean's web
>-	 * 	 service endpoint interface. The service-endpoint
>-	 * 	 element may only be specified for a stateless
>-	 * 	 session bean. The specified interface must be a
>-	 * 	 valid JAX-RPC service endpoint interface.
>+	 * The local-bean element declares that this
>+	 * session bean exposes a no-interface Local client view.
>+	 * 
>+	 * @since Java EE 6, EJB 3.1
>+	 * 
>+	 * 
>+	 * @return the value of the 'Local Bean' containment reference.
>+	 * @see #setLocalBean(EmptyType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_LocalBean()
>+	 * @generated
>+	 */
>+	EmptyType getLocalBean();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocalBean Local Bean}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Local Bean' containment reference.
>+	 * @see #getLocalBean()
>+	 * @generated
>+	 */
>+	void setLocalBean(EmptyType value);
>+
>+	/**
>+	 * Returns the value of the 'Service Endpoint' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
> 	 * 
>-	 * 	 
>+	 * The service-endpoint element contains the
>+	 * fully-qualified name of the enterprise bean's web
>+	 * service endpoint interface. The service-endpoint
>+	 * element may only be specified for a stateless
>+	 * session bean. The specified interface must be a
>+	 * valid JAX-RPC service endpoint interface.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Service Endpoint' attribute.
> 	 * @see #setServiceEndpoint(String)
>@@ -394,11 +471,12 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * The ejb-class element specifies the fully qualified name
>-	 * of the bean class for this ejb. It is required unless
>-	 * there is a component-defining annotation for the same
>-	 * ejb-name.
>-	 * 
>+	 * The ejb-class element specifies the fully qualified name
>+	 * of the bean class for this ejb. It is required unless
>+	 * there is a component-defining annotation for the same
>+	 * ejb-name.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
> 	 * 
> 	 * 
> 	 * @return the value of the 'Ejb Class' attribute.
>@@ -420,7 +498,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Session Type' attribute.
>-	 * The default value is <code>"Stateful"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.SessionType}.
> 	 * 
> 	 * 
>@@ -475,6 +552,31 @@
> 	boolean isSetSessionType();
> 
> 	/**
>+	 * Returns the value of the 'Stateful Timeout' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Stateful Timeout' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Stateful Timeout' containment reference.
>+	 * @see #setStatefulTimeout(StatefulTimeoutType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_StatefulTimeout()
>+	 * @generated
>+	 */
>+	StatefulTimeoutType getStatefulTimeout();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getStatefulTimeout Stateful Timeout}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Stateful Timeout' containment reference.
>+	 * @see #getStatefulTimeout()
>+	 * @generated
>+	 */
>+	void setStatefulTimeout(StatefulTimeoutType value);
>+
>+	/**
> 	 * Returns the value of the 'Timeout Method' containment reference.
> 	 * 
> 	 * 
>@@ -482,6 +584,16 @@
> 	 * there really should be more of a description here...
> 	 * 
> 	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The timeout-method element specifies the method that
>+	 * will receive callbacks for programmatically
>+	 * created timers.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
>+	 * 
> 	 * @return the value of the 'Timeout Method' containment reference.
> 	 * @see #setTimeoutMethod(NamedMethodType)
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_TimeoutMethod()
>@@ -500,6 +612,175 @@
> 	void setTimeoutMethod(NamedMethodType value);
> 
> 	/**
>+	 * Returns the value of the 'Timer' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.TimerType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Timer' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Timer' containment reference list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_Timer()
>+	 * @generated
>+	 */
>+	List<TimerType> getTimer();
>+
>+	/**
>+	 * Returns the value of the 'Init On Startup' attribute.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * The init-on-startup element specifies that a Singleton
>+	 * bean has eager initialization.
>+	 * This element can only be specified for singleton session
>+	 * beans.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
>+	 * 
>+	 * @return the value of the 'Init On Startup' attribute.
>+	 * @see #isSetInitOnStartup()
>+	 * @see #unsetInitOnStartup()
>+	 * @see #setInitOnStartup(boolean)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_InitOnStartup()
>+	 * @generated
>+	 */
>+	boolean isInitOnStartup();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#isInitOnStartup Init On Startup}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Init On Startup' attribute.
>+	 * @see #isSetInitOnStartup()
>+	 * @see #unsetInitOnStartup()
>+	 * @see #isInitOnStartup()
>+	 * @generated
>+	 */
>+	void setInitOnStartup(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#isInitOnStartup Init On Startup}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetInitOnStartup()
>+	 * @see #isInitOnStartup()
>+	 * @see #setInitOnStartup(boolean)
>+	 * @generated
>+	 */
>+	void unsetInitOnStartup();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#isInitOnStartup Init On Startup}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Init On Startup' attribute is set.
>+	 * @see #unsetInitOnStartup()
>+	 * @see #isInitOnStartup()
>+	 * @see #setInitOnStartup(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetInitOnStartup();
>+
>+	/**
>+	 * Returns the value of the 'Concurrency Management Type' attribute.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Concurrency Management Type' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Concurrency Management Type' attribute.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType
>+	 * @see #isSetConcurrencyManagementType()
>+	 * @see #unsetConcurrencyManagementType()
>+	 * @see #setConcurrencyManagementType(ConcurrencyManagementTypeType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_ConcurrencyManagementType()
>+	 * @generated
>+	 */
>+	ConcurrencyManagementTypeType getConcurrencyManagementType();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getConcurrencyManagementType Concurrency Management Type}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Concurrency Management Type' attribute.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType
>+	 * @see #isSetConcurrencyManagementType()
>+	 * @see #unsetConcurrencyManagementType()
>+	 * @see #getConcurrencyManagementType()
>+	 * @generated
>+	 */
>+	void setConcurrencyManagementType(ConcurrencyManagementTypeType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getConcurrencyManagementType Concurrency Management Type}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetConcurrencyManagementType()
>+	 * @see #getConcurrencyManagementType()
>+	 * @see #setConcurrencyManagementType(ConcurrencyManagementTypeType)
>+	 * @generated
>+	 */
>+	void unsetConcurrencyManagementType();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getConcurrencyManagementType Concurrency Management Type}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Concurrency Management Type' attribute is set.
>+	 * @see #unsetConcurrencyManagementType()
>+	 * @see #getConcurrencyManagementType()
>+	 * @see #setConcurrencyManagementType(ConcurrencyManagementTypeType)
>+	 * @generated
>+	 */
>+	boolean isSetConcurrencyManagementType();
>+
>+	/**
>+	 * Returns the value of the 'Concurrent Method' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Concurrent Method' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Concurrent Method' containment reference list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_ConcurrentMethod()
>+	 * @generated
>+	 */
>+	List<ConcurrentMethodType> getConcurrentMethod();
>+
>+	/**
>+	 * Returns the value of the 'Depends On' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Depends On' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Depends On' containment reference.
>+	 * @see #setDependsOn(DependsOnType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_DependsOn()
>+	 * @generated
>+	 */
>+	DependsOnType getDependsOn();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getDependsOn Depends On}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Depends On' containment reference.
>+	 * @see #getDependsOn()
>+	 * @generated
>+	 */
>+	void setDependsOn(DependsOnType value);
>+
>+	/**
> 	 * Returns the value of the 'Init Methods' containment reference list.
> 	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.InitMethodType}.
> 	 * 
>@@ -507,18 +788,19 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The init-method element specifies the mappings for
>-	 * 	 EJB 2.x style create methods for an EJB 3.0 bean.
>-	 * 	 This element can only be specified for stateful
>-	 * session beans.
>-	 * 
>-	 * 	 
>+	 * The init-method element specifies the mappings for
>+	 * EJB 2.x style create methods for an EJB 3.x bean.
>+	 * This element can only be specified for stateful 
>+	 * session beans. 
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Init Methods' containment reference list.
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_InitMethods()
> 	 * @generated
> 	 */
>-	List getInitMethods();
>+	List<InitMethodType> getInitMethods();
> 
> 	/**
> 	 * Returns the value of the 'Remove Methods' containment reference list.
>@@ -528,22 +810,37 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The remove-method element specifies the mappings for
>-	 * 	 EJB 2.x style remove methods for an EJB 3.0 bean.
>-	 * 	 This element can only be specified for stateful
>-	 * session beans.
>-	 * 
>-	 * 	 
>+	 * The remove-method element specifies the mappings for
>+	 * EJB 2.x style remove methods for an EJB 3.x bean.
>+	 * This element can only be specified for stateful 
>+	 * session beans. 
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Remove Methods' containment reference list.
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_RemoveMethods()
> 	 * @generated
> 	 */
>-	List getRemoveMethods();
>+	List<RemoveMethodType> getRemoveMethods();
>+
>+	/**
>+	 * Returns the value of the 'Async Method' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.AsyncMethodType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Async Method' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Async Method' containment reference list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_AsyncMethod()
>+	 * @generated
>+	 */
>+	List<AsyncMethodType> getAsyncMethod();
> 
> 	/**
> 	 * Returns the value of the 'Transaction Type' attribute.
>-	 * The default value is <code>"Bean"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.TransactionType}.
> 	 * 
> 	 * 
>@@ -598,6 +895,84 @@
> 	boolean isSetTransactionType();
> 
> 	/**
>+	 * Returns the value of the 'After Begin Method' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, EJB 3.1
>+	 * 
>+	 * 
>+	 * @return the value of the 'After Begin Method' containment reference.
>+	 * @see #setAfterBeginMethod(NamedMethodType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_AfterBeginMethod()
>+	 * @generated
>+	 */
>+	NamedMethodType getAfterBeginMethod();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getAfterBeginMethod After Begin Method}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'After Begin Method' containment reference.
>+	 * @see #getAfterBeginMethod()
>+	 * @generated
>+	 */
>+	void setAfterBeginMethod(NamedMethodType value);
>+
>+	/**
>+	 * Returns the value of the 'Before Completion Method' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, EJB 3.1
>+	 * 
>+	 * 
>+	 * @return the value of the 'Before Completion Method' containment reference.
>+	 * @see #setBeforeCompletionMethod(NamedMethodType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_BeforeCompletionMethod()
>+	 * @generated
>+	 */
>+	NamedMethodType getBeforeCompletionMethod();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getBeforeCompletionMethod Before Completion Method}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Before Completion Method' containment reference.
>+	 * @see #getBeforeCompletionMethod()
>+	 * @generated
>+	 */
>+	void setBeforeCompletionMethod(NamedMethodType value);
>+
>+	/**
>+	 * Returns the value of the 'After Completion Method' containment reference.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, EJB 3.1
>+	 * 
>+	 * 
>+	 * @return the value of the 'After Completion Method' containment reference.
>+	 * @see #setAfterCompletionMethod(NamedMethodType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_AfterCompletionMethod()
>+	 * @generated
>+	 */
>+	NamedMethodType getAfterCompletionMethod();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.SessionBean#getAfterCompletionMethod After Completion Method}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'After Completion Method' containment reference.
>+	 * @see #getAfterCompletionMethod()
>+	 * @generated
>+	 */
>+	void setAfterCompletionMethod(NamedMethodType value);
>+
>+	/**
> 	 * Returns the value of the 'Around Invokes' containment reference list.
> 	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.AroundInvokeType}.
> 	 * 
>@@ -610,7 +985,23 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_AroundInvokes()
> 	 * @generated
> 	 */
>-	List getAroundInvokes();
>+	List<AroundInvokeType> getAroundInvokes();
>+
>+	/**
>+	 * Returns the value of the 'Around Timeouts' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.ejb.AroundTimeoutType}.
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * @since Java EE 6, EJB 3.1
>+	 * 
>+	 * 
>+	 * @return the value of the 'Around Timeouts' containment reference list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_AroundTimeouts()
>+	 * @generated
>+	 */
>+	List<AroundTimeoutType> getAroundTimeouts();
> 
> 	/**
> 	 * Returns the value of the 'Env Entries' containment reference list.
>@@ -625,7 +1016,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_EnvEntries()
> 	 * @generated
> 	 */
>-	List getEnvEntries();
>+	List<EnvEntry> getEnvEntries();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Refs' containment reference list.
>@@ -640,7 +1031,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_EjbRefs()
> 	 * @generated
> 	 */
>-	List getEjbRefs();
>+	List<EjbRef> getEjbRefs();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Local Refs' containment reference list.
>@@ -655,7 +1046,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_EjbLocalRefs()
> 	 * @generated
> 	 */
>-	List getEjbLocalRefs();
>+	List<EjbLocalRef> getEjbLocalRefs();
> 
> 	/**
> 	 * Returns the value of the 'Service Refs' containment reference list.
>@@ -670,7 +1061,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_ServiceRefs()
> 	 * @generated
> 	 */
>-	List getServiceRefs();
>+	List<ServiceRef> getServiceRefs();
> 
> 	/**
> 	 * Returns the value of the 'Resource Refs' containment reference list.
>@@ -685,7 +1076,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_ResourceRefs()
> 	 * @generated
> 	 */
>-	List getResourceRefs();
>+	List<ResourceRef> getResourceRefs();
> 
> 	/**
> 	 * Returns the value of the 'Resource Env Refs' containment reference list.
>@@ -700,7 +1091,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_ResourceEnvRefs()
> 	 * @generated
> 	 */
>-	List getResourceEnvRefs();
>+	List<ResourceEnvRef> getResourceEnvRefs();
> 
> 	/**
> 	 * Returns the value of the 'Message Destination Refs' containment reference list.
>@@ -715,7 +1106,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_MessageDestinationRefs()
> 	 * @generated
> 	 */
>-	List getMessageDestinationRefs();
>+	List<MessageDestinationRef> getMessageDestinationRefs();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Context Refs' containment reference list.
>@@ -730,7 +1121,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_PersistenceContextRefs()
> 	 * @generated
> 	 */
>-	List getPersistenceContextRefs();
>+	List<PersistenceContextRef> getPersistenceContextRefs();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Unit Refs' containment reference list.
>@@ -745,7 +1136,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_PersistenceUnitRefs()
> 	 * @generated
> 	 */
>-	List getPersistenceUnitRefs();
>+	List<PersistenceUnitRef> getPersistenceUnitRefs();
> 
> 	/**
> 	 * Returns the value of the 'Post Constructs' containment reference list.
>@@ -760,7 +1151,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_PostConstructs()
> 	 * @generated
> 	 */
>-	List getPostConstructs();
>+	List<LifecycleCallback> getPostConstructs();
> 
> 	/**
> 	 * Returns the value of the 'Pre Destroys' containment reference list.
>@@ -775,7 +1166,22 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_PreDestroys()
> 	 * @generated
> 	 */
>-	List getPreDestroys();
>+	List<LifecycleCallback> getPreDestroys();
>+
>+	/**
>+	 * Returns the value of the 'Data Source' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DataSourceType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Data Source' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Data Source' containment reference list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_DataSource()
>+	 * @generated
>+	 */
>+	List<DataSourceType> getDataSource();
> 
> 	/**
> 	 * Returns the value of the 'Post Activates' containment reference list.
>@@ -790,7 +1196,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_PostActivates()
> 	 * @generated
> 	 */
>-	List getPostActivates();
>+	List<LifecycleCallback> getPostActivates();
> 
> 	/**
> 	 * Returns the value of the 'Pre Passivates' containment reference list.
>@@ -805,7 +1211,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_PrePassivates()
> 	 * @generated
> 	 */
>-	List getPrePassivates();
>+	List<LifecycleCallback> getPrePassivates();
> 
> 	/**
> 	 * Returns the value of the 'Security Role Refs' containment reference list.
>@@ -820,7 +1226,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getSessionBean_SecurityRoleRefs()
> 	 * @generated
> 	 */
>-	List getSecurityRoleRefs();
>+	List<SecurityRoleRef> getSecurityRoleRefs();
> 
> 	/**
> 	 * Returns the value of the 'Security Identities' containment reference.
>Index: jee-models/org/eclipse/jst/javaee/ejb/AssemblyDescriptor.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/AssemblyDescriptor.java,v
>retrieving revision 1.2
>diff -u -r1.2 AssemblyDescriptor.java
>--- jee-models/org/eclipse/jst/javaee/ejb/AssemblyDescriptor.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/AssemblyDescriptor.java	14 Oct 2009 21:48:07 -0000
>@@ -13,6 +13,8 @@
> import java.util.List;
> 
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.MessageDestination;
>+import org.eclipse.jst.javaee.core.SecurityRole;
> 
> /**
> * 
>@@ -22,24 +24,25 @@
> * 
> * 
> * 
>- * 	The assembly-descriptorType defines
>- * 	application-assembly information.
>- * 
>- * 	The application-assembly information consists of the
>- * 	following parts: the definition of security roles, the
>- * 	definition of method permissions, the definition of
>- * 	transaction attributes for enterprise beans with
>- * 	container-managed transaction demarcation, the definition
>+ * The assembly-descriptorType defines
>+ * application-assembly information.
>+ * 
>+ * The application-assembly information consists of the
>+ * following parts: the definition of security roles, the
>+ * definition of method permissions, the definition of
>+ * transaction attributes for enterprise beans with
>+ * container-managed transaction demarcation, the definition
> * of interceptor bindings, a list of
>- * 	methods to be excluded from being invoked, and a list of
>+ * methods to be excluded from being invoked, and a list of
> * exception types that should be treated as application exceptions.
>- * 
>- * 	All the parts are optional in the sense that they are
>- * 	omitted if the lists represented by them are empty.
>- * 
>- * 	Providing an assembly-descriptor in the deployment
>- * 	descriptor is optional for the ejb-jar file producer.
>- * 
>+ * 
>+ * All the parts are optional in the sense that they are
>+ * omitted if the lists represented by them are empty.
>+ * 
>+ * Providing an assembly-descriptor in the deployment
>+ * descriptor is optional for the ejb-jar file producer.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -75,7 +78,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_SecurityRoles()
> 	 * @generated
> 	 */
>-	List getSecurityRoles();
>+	List<SecurityRole> getSecurityRoles();
> 
> 	/**
> 	 * Returns the value of the 'Method Permissions' containment reference list.
>@@ -90,7 +93,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_MethodPermissions()
> 	 * @generated
> 	 */
>-	List getMethodPermissions();
>+	List<MethodPermission> getMethodPermissions();
> 
> 	/**
> 	 * Returns the value of the 'Container Transactions' containment reference list.
>@@ -105,7 +108,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_ContainerTransactions()
> 	 * @generated
> 	 */
>-	List getContainerTransactions();
>+	List<ContainerTransactionType> getContainerTransactions();
> 
> 	/**
> 	 * Returns the value of the 'Interceptor Bindings' containment reference list.
>@@ -120,7 +123,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_InterceptorBindings()
> 	 * @generated
> 	 */
>-	List getInterceptorBindings();
>+	List<InterceptorBindingType> getInterceptorBindings();
> 
> 	/**
> 	 * Returns the value of the 'Message Destinations' containment reference list.
>@@ -135,7 +138,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_MessageDestinations()
> 	 * @generated
> 	 */
>-	List getMessageDestinations();
>+	List<MessageDestination> getMessageDestinations();
> 
> 	/**
> 	 * Returns the value of the 'Exclude List' containment reference.
>@@ -175,7 +178,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAssemblyDescriptor_ApplicationExceptions()
> 	 * @generated
> 	 */
>-	List getApplicationExceptions();
>+	List<ApplicationException> getApplicationExceptions();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/CMPField.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CMPField.java,v
>retrieving revision 1.2
>diff -u -r1.2 CMPField.java
>--- jee-models/org/eclipse/jst/javaee/ejb/CMPField.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/CMPField.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -22,10 +23,11 @@
> * 
> * 
> * 
>- * 	The cmp-fieldType describes a container-managed field. The
>- * 	cmp-fieldType contains an optional description of the field,
>- * 	and the name of the field.
>- * 
>+ * The cmp-fieldType describes a container-managed field. The
>+ * cmp-fieldType contains an optional description of the field,
>+ * and the name of the field.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -56,7 +58,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMPField_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Field Name' attribute.
>@@ -65,21 +67,22 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The field-name element specifies the name of a
>-	 * 	 container managed field.
>-	 * 
>-	 * 	 The name of the cmp-field of an entity bean with
>-	 * 	 cmp-version 2.x must begin with a lowercase
>-	 * 	 letter. This field is accessed by methods whose
>-	 * 	 names consists of the name of the field specified by
>-	 * 	 field-name in which the first letter is uppercased,
>-	 * 	 prefixed by "get" or "set".
>-	 * 
>-	 * 	 The name of the cmp-field of an entity bean with
>-	 * 	 cmp-version 1.x must denote a public field of the
>-	 * 	 enterprise bean class or one of its superclasses.
>-	 * 
>-	 * 	 
>+	 * The field-name element specifies the name of a
>+	 * container managed field.
>+	 * 
>+	 * The name of the cmp-field of an entity bean with
>+	 * cmp-version 2.x must begin with a lowercase
>+	 * letter. This field is accessed by methods whose
>+	 * names consists of the name of the field specified by
>+	 * field-name in which the first letter is uppercased,
>+	 * prefixed by "get" or "set".
>+	 * 
>+	 * The name of the cmp-field of an entity bean with
>+	 * cmp-version 1.x must denote a public field of the
>+	 * enterprise bean class or one of its superclasses.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Field Name' attribute.
> 	 * @see #setFieldName(String)
>Index: jee-models/org/eclipse/jst/javaee/ejb/InterceptorOrderType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorOrderType.java,v
>retrieving revision 1.2
>diff -u -r1.2 InterceptorOrderType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/InterceptorOrderType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/InterceptorOrderType.java	14 Oct 2009 21:48:07 -0000
>@@ -21,8 +21,11 @@
> *
> * 
> * 
>+ * 
> * The interceptor-orderType element describes a total ordering
> * of interceptor classes.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -52,7 +55,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorOrderType_InterceptorClasses()
> 	 * @generated
> 	 */
>-	List getInterceptorClasses();
>+	List<String> getInterceptorClasses();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/RelationshipRoleSourceType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/RelationshipRoleSourceType.java,v
>retrieving revision 1.2
>diff -u -r1.2 RelationshipRoleSourceType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/RelationshipRoleSourceType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/RelationshipRoleSourceType.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -22,12 +23,13 @@
> * 
> * 
> * 
>- * 	The relationship-role-sourceType designates the source of a
>- * 	role that participates in a relationship. A
>- * 	relationship-role-sourceType is used by
>- * 	relationship-role-source elements to uniquely identify an
>- * 	entity bean.
>- * 
>+ * The relationship-role-sourceType designates the source of a
>+ * role that participates in a relationship. A
>+ * relationship-role-sourceType is used by
>+ * relationship-role-source elements to uniquely identify an
>+ * entity bean.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -58,7 +60,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getRelationshipRoleSourceType_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Name' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/EntityBean.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EntityBean.java,v
>retrieving revision 1.2
>diff -u -r1.2 EntityBean.java
>--- jee-models/org/eclipse/jst/javaee/ejb/EntityBean.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/EntityBean.java	14 Oct 2009 21:48:07 -0000
>@@ -12,7 +12,22 @@
> 
> 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.Icon;
> import org.eclipse.jst.javaee.core.JavaEEObject;
>+import org.eclipse.jst.javaee.core.LifecycleCallback;
>+import org.eclipse.jst.javaee.core.MessageDestinationRef;
>+import org.eclipse.jst.javaee.core.PersistenceContextRef;
>+import org.eclipse.jst.javaee.core.PersistenceUnitRef;
>+import org.eclipse.jst.javaee.core.ResourceEnvRef;
>+import org.eclipse.jst.javaee.core.ResourceRef;
>+import org.eclipse.jst.javaee.core.SecurityRoleRef;
>+import org.eclipse.jst.javaee.core.ServiceRef;
> 
> /**
> * 
>@@ -22,96 +37,97 @@
> * 
> * 
> * 
>- * 	The entity-beanType declares an entity bean. The declaration
>- * 	consists of:
>- * 
>- * 	 - an optional description
>- * 	 - an optional display name
>- * 	 - an optional icon element that contains a small and a large
>- * 	 icon file name
>- * 	 - a unique name assigned to the enterprise bean
>- * 	 in the deployment descriptor
>- * - an optional mapped-name element that can be used to provide
>- * vendor-specific deployment information such as the physical
>- * jndi-name of the entity bean's remote home interface. This
>- * element is not required to be supported by all implementations.
>- * Any use of this element is non-portable.
>- * 	 - the names of the entity bean's remote home
>- * 	 and remote interfaces, if any
>- * 	 - the names of the entity bean's local home and local
>- * 	 interfaces, if any
>- * 	 - the entity bean's implementation class
>- * 	 - the optional entity bean's persistence management type. If
>- * this element is not specified it is defaulted to Container.
>- * 	 - the entity bean's primary key class name
>- * 	 - an indication of the entity bean's reentrancy
>- * 	 - an optional specification of the
>- * 	 entity bean's cmp-version
>- * 	 - an optional specification of the entity bean's
>- * 	 abstract schema name
>- * 	 - an optional list of container-managed fields
>- * 	 - an optional specification of the primary key
>- * 	 field
>- * 	 - an optional declaration of the bean's environment
>- * 	 entries
>- * 	 - an optional declaration of the bean's EJB
>- * 	 references
>- * 	 - an optional declaration of the bean's local
>- * 	 EJB references
>- * 	 - an optional declaration of the bean's web
>- * 	 service references
>- * 	 - an optional declaration of the security role
>- * 	 references
>- * 	 - an optional declaration of the security identity
>- * 	 to be used for the execution of the bean's methods
>- * 	 - an optional declaration of the bean's
>- * 	 resource manager connection factory references
>- * 	 - an optional declaration of the bean's
>- * 	 resource environment references
>- * 	 - an optional declaration of the bean's message
>- * 	 destination references
>- * 	 - an optional set of query declarations
>- * 	 for finder and select methods for an entity
>- * 	 bean with cmp-version 2.x.
>- * 
>- * 	The optional abstract-schema-name element must be specified
>- * 	for an entity bean with container-managed persistence and
>- * 	cmp-version 2.x.
>- * 
>- * 	The optional primkey-field may be present in the descriptor
>- * 	if the entity's persistence-type is Container.
>- * 
>- * 	The optional cmp-version element may be present in the
>- * 	descriptor if the entity's persistence-type is Container. If
>- * 	the persistence-type is Container and the cmp-version
>- * 	element is not specified, its value defaults to 2.x.
>- * 
>- * 	The optional home and remote elements must be specified if
>- * 	the entity bean cmp-version is 1.x.
>- * 
>- * 	The optional home and remote elements must be specified if
>- * 	the entity bean has a remote home and remote interface.
>- * 
>- * 	The optional local-home and local elements must be specified
>- * 	if the entity bean has a local home and local interface.
>- * 
>- * 	Either both the local-home and the local elements or both
>- * 	the home and the remote elements must be specified.
>- * 
>- * 	The optional query elements must be present if the
>- * 	persistence-type is Container and the cmp-version is 2.x and
>- * 	query methods other than findByPrimaryKey have been defined
>- * 	for the entity bean.
>- * 
>- * 	The other elements that are optional are "optional" in the
>- * 	sense that they are omitted if the lists represented by them
>- * 	are empty.
>- * 
>- * 	At least one cmp-field element must be present in the
>- * 	descriptor if the entity's persistence-type is Container and
>- * 	the cmp-version is 1.x, and none must not be present if the
>- * 	entity's persistence-type is Bean.
>- * 
>+ * The entity-beanType declares an entity bean. The declaration
>+ * consists of:
>+ * 
>+ * - an optional description
>+ * - an optional display name
>+ * - an optional icon element that contains a small and a large 
>+ * icon file name
>+ * - a unique name assigned to the enterprise bean
>+ * in the deployment descriptor
>+ * - an optional mapped-name element that can be used to provide
>+ * vendor-specific deployment information such as the physical
>+ * jndi-name of the entity bean's remote home interface. This 
>+ * element is not required to be supported by all implementations.
>+ * Any use of this element is non-portable.
>+ * - the names of the entity bean's remote home 
>+ * and remote interfaces, if any
>+ * - the names of the entity bean's local home and local
>+ * interfaces, if any
>+ * - the entity bean's implementation class
>+ * - the optional entity bean's persistence management type. If 
>+ * this element is not specified it is defaulted to Container.
>+ * - the entity bean's primary key class name
>+ * - an indication of the entity bean's reentrancy
>+ * - an optional specification of the 
>+ * entity bean's cmp-version
>+ * - an optional specification of the entity bean's
>+ * abstract schema name
>+ * - an optional list of container-managed fields
>+ * - an optional specification of the primary key 
>+ * field
>+ * - an optional declaration of the bean's environment 
>+ * entries
>+ * - an optional declaration of the bean's EJB 
>+ * references
>+ * - an optional declaration of the bean's local 
>+ * EJB references
>+ * - an optional declaration of the bean's web 
>+ * service references
>+ * - an optional declaration of the security role 
>+ * references
>+ * - an optional declaration of the security identity
>+ * to be used for the execution of the bean's methods
>+ * - an optional declaration of the bean's 
>+ * resource manager connection factory references
>+ * - an optional declaration of the bean's
>+ * resource environment references
>+ * - an optional declaration of the bean's message 
>+ * destination references
>+ * - an optional set of query declarations
>+ * for finder and select methods for an entity
>+ * bean with cmp-version 2.x.
>+ * 
>+ * The optional abstract-schema-name element must be specified
>+ * for an entity bean with container-managed persistence and
>+ * cmp-version 2.x.
>+ * 
>+ * The optional primkey-field may be present in the descriptor
>+ * if the entity's persistence-type is Container.
>+ * 
>+ * The optional cmp-version element may be present in the
>+ * descriptor if the entity's persistence-type is Container. If
>+ * the persistence-type is Container and the cmp-version
>+ * element is not specified, its value defaults to 2.x.
>+ * 
>+ * The optional home and remote elements must be specified if
>+ * the entity bean cmp-version is 1.x.
>+ * 
>+ * The optional home and remote elements must be specified if
>+ * the entity bean has a remote home and remote interface.
>+ * 
>+ * The optional local-home and local elements must be specified
>+ * if the entity bean has a local home and local interface.
>+ * 
>+ * Either both the local-home and the local elements or both
>+ * the home and the remote elements must be specified.
>+ * 
>+ * The optional query elements must be present if the
>+ * persistence-type is Container and the cmp-version is 2.x and
>+ * query methods other than findByPrimaryKey have been defined
>+ * for the entity bean.
>+ * 
>+ * The other elements that are optional are "optional" in the
>+ * sense that they are omitted if the lists represented by them
>+ * are empty.
>+ * 
>+ * At least one cmp-field element must be present in the
>+ * descriptor if the entity's persistence-type is Container and
>+ * the cmp-version is 1.x, and none must not be present if the
>+ * entity's persistence-type is Bean.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -146,6 +162,7 @@
> * <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceUnitRefs Persistence Unit Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getPostConstructs Post Constructs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getPreDestroys Pre Destroys}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getDataSource Data Source}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getSecurityRoleRefs Security Role Refs}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getSecurityIdentity Security Identity}</li>
> * <li>{@link org.eclipse.jst.javaee.ejb.EntityBean#getQueries Queries}</li>
>@@ -171,7 +188,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Display Names' containment reference list.
>@@ -186,7 +203,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_DisplayNames()
> 	 * @generated
> 	 */
>-	List getDisplayNames();
>+	List<DisplayName> getDisplayNames();
> 
> 	/**
> 	 * Returns the value of the 'Icons' containment reference list.
>@@ -201,7 +218,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_Icons()
> 	 * @generated
> 	 */
>-	List getIcons();
>+	List<Icon> getIcons();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Name' attribute.
>@@ -380,7 +397,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Persistence Type' attribute.
>-	 * The default value is <code>"Bean"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.PersistenceType}.
> 	 * 
> 	 * 
>@@ -441,15 +457,16 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The prim-key-class element contains the
>-	 * 	 fully-qualified name of an
>-	 * 	 entity bean's primary key class.
>-	 * 
>-	 * 	 If the definition of the primary key class is
>-	 * 	 deferred to deployment time, the prim-key-class
>-	 * 	 element should specify java.lang.Object.
>-	 * 
>-	 * 	 
>+	 * The prim-key-class element contains the
>+	 * fully-qualified name of an
>+	 * entity bean's primary key class.
>+	 * 
>+	 * If the definition of the primary key class is
>+	 * deferred to deployment time, the prim-key-class 
>+	 * element should specify java.lang.Object.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Prim Key Class' attribute.
> 	 * @see #setPrimKeyClass(String)
>@@ -475,13 +492,14 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The reentrant element specifies whether an entity
>-	 * 	 bean is reentrant or not.
>-	 * 
>-	 * 	 The reentrant element must be one of the two
>-	 * 	 following: true or false
>-	 * 
>-	 * 	 
>+	 * The reentrant element specifies whether an entity
>+	 * bean is reentrant or not.
>+	 * 
>+	 * The reentrant element must be one of the two
>+	 * following: true or false
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Reentrant' attribute.
> 	 * @see #isSetReentrant()
>@@ -529,7 +547,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Cmp Version' attribute.
>-	 * The default value is <code>"1.x"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.CmpVersionType}.
> 	 * 
> 	 * 
>@@ -590,15 +607,16 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The abstract-schema-name element specifies the name
>-	 * 	 of the abstract schema type of an entity bean with
>-	 * 	 cmp-version 2.x. It is used in EJB QL queries.
>-	 * 
>-	 * 	 For example, the abstract-schema-name for an entity
>-	 * 	 bean whose local interface is
>-	 * 	 com.acme.commerce.Order might be Order.
>-	 * 
>-	 * 	 
>+	 * The abstract-schema-name element specifies the name
>+	 * of the abstract schema type of an entity bean with 
>+	 * cmp-version 2.x. It is used in EJB QL queries. 
>+	 * 
>+	 * For example, the abstract-schema-name for an entity 
>+	 * bean whose local interface is 
>+	 * com.acme.commerce.Order might be Order. 
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Abstract Schema Name' attribute.
> 	 * @see #setAbstractSchemaName(String)
>@@ -630,7 +648,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_CmpFields()
> 	 * @generated
> 	 */
>-	List getCmpFields();
>+	List<CMPField> getCmpFields();
> 
> 	/**
> 	 * Returns the value of the 'Primkey Field' attribute.
>@@ -639,22 +657,23 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The primkey-field element is used to specify the
>-	 * 	 name of the primary key field for an entity with
>-	 * 	 container-managed persistence.
>-	 * 
>-	 * 	 The primkey-field must be one of the fields declared
>-	 * 	 in the cmp-field element, and the type of the field
>-	 * 	 must be the same as the primary key type.
>-	 * 
>-	 * 	 The primkey-field element is not used if the primary
>-	 * 	 key maps to multiple container-managed fields
>-	 * 	 (i.e. the key is a compound key). In this case, the
>-	 * 	 fields of the primary key class must be public, and
>-	 * 	 their names must correspond to the field names of
>-	 * 	 the entity bean class that comprise the key.
>-	 * 
>-	 * 	 
>+	 * The primkey-field element is used to specify the
>+	 * name of the primary key field for an entity with
>+	 * container-managed persistence.
>+	 * 
>+	 * The primkey-field must be one of the fields declared
>+	 * in the cmp-field element, and the type of the field
>+	 * must be the same as the primary key type.
>+	 * 
>+	 * The primkey-field element is not used if the primary
>+	 * key maps to multiple container-managed fields
>+	 * (i.e. the key is a compound key). In this case, the
>+	 * fields of the primary key class must be public, and
>+	 * their names must correspond to the field names of
>+	 * the entity bean class that comprise the key.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Primkey Field' attribute.
> 	 * @see #setPrimkeyField(String)
>@@ -686,7 +705,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_EnvEntries()
> 	 * @generated
> 	 */
>-	List getEnvEntries();
>+	List<EnvEntry> getEnvEntries();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Refs' containment reference list.
>@@ -701,7 +720,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_EjbRefs()
> 	 * @generated
> 	 */
>-	List getEjbRefs();
>+	List<EjbRef> getEjbRefs();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Local Refs' containment reference list.
>@@ -716,7 +735,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_EjbLocalRefs()
> 	 * @generated
> 	 */
>-	List getEjbLocalRefs();
>+	List<EjbLocalRef> getEjbLocalRefs();
> 
> 	/**
> 	 * Returns the value of the 'Service Refs' containment reference list.
>@@ -731,7 +750,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_ServiceRefs()
> 	 * @generated
> 	 */
>-	List getServiceRefs();
>+	List<ServiceRef> getServiceRefs();
> 
> 	/**
> 	 * Returns the value of the 'Resource Refs' containment reference list.
>@@ -746,7 +765,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_ResourceRefs()
> 	 * @generated
> 	 */
>-	List getResourceRefs();
>+	List<ResourceRef> getResourceRefs();
> 
> 	/**
> 	 * Returns the value of the 'Resource Env Refs' containment reference list.
>@@ -761,7 +780,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_ResourceEnvRefs()
> 	 * @generated
> 	 */
>-	List getResourceEnvRefs();
>+	List<ResourceEnvRef> getResourceEnvRefs();
> 
> 	/**
> 	 * Returns the value of the 'Message Destination Refs' containment reference list.
>@@ -776,7 +795,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_MessageDestinationRefs()
> 	 * @generated
> 	 */
>-	List getMessageDestinationRefs();
>+	List<MessageDestinationRef> getMessageDestinationRefs();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Context Refs' containment reference list.
>@@ -791,7 +810,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_PersistenceContextRefs()
> 	 * @generated
> 	 */
>-	List getPersistenceContextRefs();
>+	List<PersistenceContextRef> getPersistenceContextRefs();
> 
> 	/**
> 	 * Returns the value of the 'Persistence Unit Refs' containment reference list.
>@@ -806,7 +825,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_PersistenceUnitRefs()
> 	 * @generated
> 	 */
>-	List getPersistenceUnitRefs();
>+	List<PersistenceUnitRef> getPersistenceUnitRefs();
> 
> 	/**
> 	 * Returns the value of the 'Post Constructs' containment reference list.
>@@ -821,7 +840,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_PostConstructs()
> 	 * @generated
> 	 */
>-	List getPostConstructs();
>+	List<LifecycleCallback> getPostConstructs();
> 
> 	/**
> 	 * Returns the value of the 'Pre Destroys' containment reference list.
>@@ -836,7 +855,22 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_PreDestroys()
> 	 * @generated
> 	 */
>-	List getPreDestroys();
>+	List<LifecycleCallback> getPreDestroys();
>+
>+	/**
>+	 * Returns the value of the 'Data Source' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.DataSourceType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Data Source' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Data Source' containment reference list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_DataSource()
>+	 * @generated
>+	 */
>+	List<DataSourceType> getDataSource();
> 
> 	/**
> 	 * Returns the value of the 'Security Role Refs' containment reference list.
>@@ -851,7 +885,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_SecurityRoleRefs()
> 	 * @generated
> 	 */
>-	List getSecurityRoleRefs();
>+	List<SecurityRoleRef> getSecurityRoleRefs();
> 
> 	/**
> 	 * Returns the value of the 'Security Identity' containment reference.
>@@ -891,7 +925,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEntityBean_Queries()
> 	 * @generated
> 	 */
>-	List getQueries();
>+	List<Query> getQueries();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/EnterpriseBeans.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EnterpriseBeans.java,v
>retrieving revision 1.2
>diff -u -r1.2 EnterpriseBeans.java
>--- jee-models/org/eclipse/jst/javaee/ejb/EnterpriseBeans.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/EnterpriseBeans.java	14 Oct 2009 21:48:07 -0000
>@@ -24,10 +24,11 @@
> * 
> * 
> * 
>- * 	The enterprise-beansType declares one or more enterprise
>- * 	beans. Each bean can be a session, entity or message-driven
>- * 	bean.
>- * 
>+ * The enterprise-beansType declares one or more enterprise
>+ * beans. Each bean can be a session, entity or message-driven
>+ * bean.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -75,7 +76,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEnterpriseBeans_SessionBeans()
> 	 * @generated
> 	 */
>-	List getSessionBeans();
>+	List<SessionBean> getSessionBeans();
> 
> 	/**
> 	 * Returns the value of the 'Entity Beans' containment reference list.
>@@ -90,7 +91,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEnterpriseBeans_EntityBeans()
> 	 * @generated
> 	 */
>-	List getEntityBeans();
>+	List<EntityBean> getEntityBeans();
> 
> 	/**
> 	 * Returns the value of the 'Message Driven Beans' containment reference list.
>@@ -105,7 +106,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEnterpriseBeans_MessageDrivenBeans()
> 	 * @generated
> 	 */
>-	List getMessageDrivenBeans();
>+	List<MessageDrivenBean> getMessageDrivenBeans();
> 
> 	/**
> 	 * Returns the value of the 'Id' attribute.
>Index: jee-models/org/eclipse/jst/javaee/ejb/CMRField.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/CMRField.java,v
>retrieving revision 1.2
>diff -u -r1.2 CMRField.java
>--- jee-models/org/eclipse/jst/javaee/ejb/CMRField.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/CMRField.java	14 Oct 2009 21:48:07 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.List;
> 
>+import org.eclipse.jst.javaee.core.Description;
> import org.eclipse.jst.javaee.core.JavaEEObject;
> 
> /**
>@@ -22,15 +23,16 @@
> * 
> * 
> * 
>- * 	The cmr-fieldType describes the bean provider's view of
>- * 	a relationship. It consists of an optional description, and
>- * 	the name and the class type of a field in the source of a
>- * 	role of a relationship. The cmr-field-name element
>- * 	corresponds to the name used for the get and set accessor
>- * 	methods for the relationship. The cmr-field-type element is
>- * 	used only for collection-valued cmr-fields. It specifies the
>- * 	type of the collection that is used.
>- * 
>+ * The cmr-fieldType describes the bean provider's view of
>+ * a relationship. It consists of an optional description, and
>+ * the name and the class type of a field in the source of a
>+ * role of a relationship. The cmr-field-name element
>+ * corresponds to the name used for the get and set accessor
>+ * methods for the relationship. The cmr-field-type element is
>+ * used only for collection-valued cmr-fields. It specifies the
>+ * type of the collection that is used.
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> *
>@@ -62,7 +64,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getCMRField_Descriptions()
> 	 * @generated
> 	 */
>-	List getDescriptions();
>+	List<Description> getDescriptions();
> 
> 	/**
> 	 * Returns the value of the 'Cmr Field Name' attribute.
>@@ -71,15 +73,16 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	 The cmr-field-name element specifies the name of a
>-	 * 	 logical relationship field in the entity bean
>-	 * 	 class. The name of the cmr-field must begin with a
>-	 * 	 lowercase letter. This field is accessed by methods
>-	 * 	 whose names consist of the name of the field
>-	 * 	 specified by cmr-field-name in which the first
>-	 * 	 letter is uppercased, prefixed by "get" or "set".
>-	 * 
>-	 * 	 
>+	 * The cmr-field-name element specifies the name of a
>+	 * logical relationship field in the entity bean
>+	 * class. The name of the cmr-field must begin with a
>+	 * lowercase letter. This field is accessed by methods
>+	 * whose names consist of the name of the field
>+	 * specified by cmr-field-name in which the first
>+	 * letter is uppercased, prefixed by "get" or "set".
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
>+	 * 
> 	 * 
> 	 * @return the value of the 'Cmr Field Name' attribute.
> 	 * @see #setCmrFieldName(String)
>@@ -100,7 +103,6 @@
> 
> 	/**
> 	 * Returns the value of the 'Cmr Field Type' attribute.
>-	 * The default value is <code>"java.util.Collection"</code>.
> 	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.CMRFieldType}.
> 	 * 
> 	 * 
>Index: jee-models/org/eclipse/jst/javaee/ejb/EJBJarDeploymentDescriptor.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBJarDeploymentDescriptor.java,v
>retrieving revision 1.2
>diff -u -r1.2 EJBJarDeploymentDescriptor.java
>--- jee-models/org/eclipse/jst/javaee/ejb/EJBJarDeploymentDescriptor.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/EJBJarDeploymentDescriptor.java	14 Oct 2009 21:48:07 -0000
>@@ -65,7 +65,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getEJBJarDeploymentDescriptor_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.ejb.internal.metadata.EjbPackage#getEJBJarDeploymentDescriptor_XSISchemaLocation()
> 	 * @generated
> 	 */
>-	Map getXSISchemaLocation();
>+	Map<String, String> getXSISchemaLocation();
> 
> 	/**
> 	 * Returns the value of the 'Ejb Jar' containment reference.
>@@ -90,8 +90,9 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * 	This is the root of the ejb-jar deployment descriptor.
>-	 * 
>+	 * This is the root of the ejb-jar deployment descriptor.
>+	 * 
>+	 * @since Java EE 5, EJB 3.0
> 	 * 
> 	 * 
> 	 * @return the value of the 'Ejb Jar' containment reference.
>Index: jee-models/org/eclipse/jst/javaee/ejb/MethodInterfaceType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/MethodInterfaceType.java,v
>retrieving revision 1.2
>diff -u -r1.2 MethodInterfaceType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/MethodInterfaceType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/MethodInterfaceType.java	14 Oct 2009 21:48:07 -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,31 +24,109 @@
> * 
> * 
> * 
>- * 	The method-intf element allows a method element to
>- * 	differentiate between the methods with the same name and
>- * 	signature that are multiply defined across the home and
>- * 	component interfaces (e.g, in both an enterprise bean's
>- * 	remote and local interfaces or in both an enterprise bean's
>- * 	home and remote interfaces, etc.); the component and web
>- * 	service endpoint interfaces, and so on. The Local applies to
>- * both local component interface and local business interface.
>- * Similarly, Remote applies to both remote component interface
>- * and the remote business interface.
>- * 
>- * 	The method-intf element must be one of the following:
>- * 
>- * 	 Home
>- * 	 Remote
>- * 	 LocalHome
>- * 	 Local
>- * 	 ServiceEndpoint
>- * 
>+ * The method-intf element allows a method element to
>+ * differentiate between the methods with the same name and
>+ * signature that are multiply defined across the home and
>+ * component interfaces (e.g, in both an enterprise bean's
>+ * remote and local interfaces or in both an enterprise bean's
>+ * home and remote interfaces, etc.); the component and web
>+ * service endpoint interfaces, and so on. 
>+ * 
>+ * Local applies to the local component interface, local business 
>+ * interfaces, and the no-interface view. 
>+ * 
>+ * Remote applies to both remote component interface and the remote 
>+ * business interfaces. 
>+ * 
>+ * ServiceEndpoint refers to methods exposed through a web service
>+ * endpoint.
>+ * 
>+ * Timer refers to the bean's timeout callback methods.
>+ * 
>+ * MessageEndpoint refers to the methods of a message-driven bean's
>+ * message-listener interface.
>+ * 
>+ * The method-intf element must be one of the following:
>+ * 
>+ * Home
>+ * Remote
>+ * LocalHome
>+ * Local
>+ * ServiceEndpoint
>+ * Timer
>+ * MessageEndpoint
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getMethodInterfaceType()
> * @generated
> */
>-public final class MethodInterfaceType extends AbstractEnumerator {
>+public enum MethodInterfaceType implements Enumerator
>+{
>+	/**
>+	 * The 'Home' literal object.
>+	 * 
>+	 * 
>+	 * @see #HOME
>+	 * @generated
>+	 * @ordered
>+	 */
>+	HOME_LITERAL(0, "Home", "Home"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Remote' literal object.
>+	 * 
>+	 * 
>+	 * @see #REMOTE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	REMOTE_LITERAL(1, "Remote", "Remote"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Local Home' literal object.
>+	 * 
>+	 * 
>+	 * @see #LOCAL_HOME
>+	 * @generated
>+	 * @ordered
>+	 */
>+	LOCAL_HOME_LITERAL(2, "LocalHome", "LocalHome"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Local' literal object.
>+	 * 
>+	 * 
>+	 * @see #LOCAL
>+	 * @generated
>+	 * @ordered
>+	 */
>+	LOCAL_LITERAL(3, "Local", "Local"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Service Endpoint' literal object.
>+	 * 
>+	 * 
>+	 * @see #SERVICE_ENDPOINT
>+	 * @generated
>+	 * @ordered
>+	 */
>+	SERVICE_ENDPOINT_LITERAL(4, "ServiceEndpoint", "ServiceEndpoint"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Timer' literal object.
>+	 * 
>+	 * 
>+	 * @see #TIMER
>+	 * @generated
>+	 * @ordered
>+	 */
>+	TIMER_LITERAL(5, "Timer", "Timer"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Message Endpoint' literal object.
>+	 * 
>+	 * 
>+	 * @see #MESSAGE_ENDPOINT
>+	 * @generated
>+	 * @ordered
>+	 */
>+	MESSAGE_ENDPOINT_LITERAL(6, "MessageEndpoint", "MessageEndpoint"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The 'Home' literal value.
> 	 * 
>@@ -120,54 +198,34 @@
> 	public static final int SERVICE_ENDPOINT = 4;
> 
> 	/**
>-	 * The 'Home' literal object.
>-	 * 
>-	 * 
>-	 * @see #HOME
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final MethodInterfaceType HOME_LITERAL = new MethodInterfaceType(HOME, "Home", "Home"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Remote' literal object.
>-	 * 
>-	 * 
>-	 * @see #REMOTE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final MethodInterfaceType REMOTE_LITERAL = new MethodInterfaceType(REMOTE, "Remote", "Remote"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Local Home' literal object.
>+	 * The 'Timer' literal value.
> 	 * 
> 	 * 
>-	 * @see #LOCAL_HOME
>+	 * 
>+	 * 
>+	 * @since Java EE 6, EJB 3.1
>+	 * 
>+	 * 
>+	 * @see #TIMER_LITERAL
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final MethodInterfaceType LOCAL_HOME_LITERAL = new MethodInterfaceType(LOCAL_HOME, "LocalHome", "LocalHome"); //$NON-NLS-1$ //$NON-NLS-2$
>+	public static final int TIMER = 5;
> 
> 	/**
>-	 * The 'Local' literal object.
>+	 * The 'Message Endpoint' literal value.
> 	 * 
> 	 * 
>-	 * @see #LOCAL
>+	 * 
>+	 * 
>+	 * @since Java EE 6, EJB 3.1
>+	 * 
>+	 * 
>+	 * @see #MESSAGE_ENDPOINT_LITERAL
> 	 * @generated
> 	 * @ordered
> 	 */
>-	public static final MethodInterfaceType LOCAL_LITERAL = new MethodInterfaceType(LOCAL, "Local", "Local"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Service Endpoint' literal object.
>-	 * 
>-	 * 
>-	 * @see #SERVICE_ENDPOINT
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final MethodInterfaceType SERVICE_ENDPOINT_LITERAL = new MethodInterfaceType(SERVICE_ENDPOINT, "ServiceEndpoint", "ServiceEndpoint"); //$NON-NLS-1$ //$NON-NLS-2$
>+	public static final int MESSAGE_ENDPOINT = 6;
> 
> 	/**
> 	 * An array of all the 'Method Interface Type' enumerators.
>@@ -182,6 +240,8 @@
> 			LOCAL_HOME_LITERAL,
> 			LOCAL_LITERAL,
> 			SERVICE_ENDPOINT_LITERAL,
>+			TIMER_LITERAL,
>+			MESSAGE_ENDPOINT_LITERAL,
> 		};
> 
> 	/**
>@@ -190,7 +250,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<MethodInterfaceType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Method Interface Type' literal with the specified literal value.
>@@ -237,18 +297,80 @@
> 			case LOCAL_HOME: return LOCAL_HOME_LITERAL;
> 			case LOCAL: return LOCAL_LITERAL;
> 			case SERVICE_ENDPOINT: return SERVICE_ENDPOINT_LITERAL;
>+			case TIMER: return TIMER_LITERAL;
>+			case MESSAGE_ENDPOINT: return MESSAGE_ENDPOINT_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 MethodInterfaceType(int value, String name, String literal) {
>-		super(value, name, literal);
>+		this.value = value;
>+		this.name = name;
>+		this.literal = literal;
> 	}
> 
>-} //MethodInterfaceType
>+	/**
>+	 * 
>+	 * 
>+	 * @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/ejb/ResultTypeMappingType.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/ResultTypeMappingType.java,v
>retrieving revision 1.2
>diff -u -r1.2 ResultTypeMappingType.java
>--- jee-models/org/eclipse/jst/javaee/ejb/ResultTypeMappingType.java	26 Jul 2007 16:56:10 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/ResultTypeMappingType.java	14 Oct 2009 21:48:07 -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 result-type-mappingType is used in the query element to
>- * 	specify whether an abstract schema type returned by a query
>- * 	for a select method is to be mapped to an EJBLocalObject or
>- * 	EJBObject type.
>- * 
>- * 	The value must be one of the following:
>- * 
>- * 	 Local
>- * 	 Remote
>- * 
>+ * The result-type-mappingType is used in the query element to
>+ * specify whether an abstract schema type returned by a query
>+ * for a select method is to be mapped to an EJBLocalObject or
>+ * EJBObject type.
>+ * 
>+ * The value must be one of the following:
>+ * 
>+ * Local
>+ * Remote
>+ * 
>+ * @since Java EE 5, EJB 3.0
> * 
> * 
> * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getResultTypeMappingType()
> * @generated
> */
>-public final class ResultTypeMappingType extends AbstractEnumerator {
>+public enum ResultTypeMappingType implements Enumerator
>+{
>+	/**
>+	 * The 'Local' literal object.
>+	 * 
>+	 * 
>+	 * @see #LOCAL
>+	 * @generated
>+	 * @ordered
>+	 */
>+	LOCAL_LITERAL(0, "Local", "Local"), //$NON-NLS-1$ //$NON-NLS-2$
>+	/**
>+	 * The 'Remote' literal object.
>+	 * 
>+	 * 
>+	 * @see #REMOTE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	REMOTE_LITERAL(1, "Remote", "Remote"); //$NON-NLS-1$ //$NON-NLS-2$
> 	/**
> 	 * The 'Local' literal value.
> 	 * 
>@@ -69,26 +89,6 @@
> 	public static final int REMOTE = 1;
> 
> 	/**
>-	 * The 'Local' literal object.
>-	 * 
>-	 * 
>-	 * @see #LOCAL
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final ResultTypeMappingType LOCAL_LITERAL = new ResultTypeMappingType(LOCAL, "Local", "Local"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
>-	 * The 'Remote' literal object.
>-	 * 
>-	 * 
>-	 * @see #REMOTE
>-	 * @generated
>-	 * @ordered
>-	 */
>-	public static final ResultTypeMappingType REMOTE_LITERAL = new ResultTypeMappingType(REMOTE, "Remote", "Remote"); //$NON-NLS-1$ //$NON-NLS-2$
>-
>-	/**
> 	 * An array of all the 'Result Type Mapping Type' enumerators.
> 	 * 
> 	 * 
>@@ -106,7 +106,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+	public static final List<ResultTypeMappingType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
> 
> 	/**
> 	 * Returns the 'Result Type Mapping Type' literal with the specified literal value.
>@@ -151,17 +151,77 @@
> 			case LOCAL: return LOCAL_LITERAL;
> 			case REMOTE: return REMOTE_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 ResultTypeMappingType(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;
> 	}
> 
>-} //ResultTypeMappingType
>+	/**
>+	 * 
>+	 * 
>+	 * @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/ejb/internal/metadata/EjbPackage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java,v
>retrieving revision 1.2
>diff -u -r1.2 EjbPackage.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java	26 Jul 2007 16:56:16 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java	14 Oct 2009 21:48:09 -0000
>@@ -31,265 +31,243 @@
> * 
> * 
> * 
>- * @(#)ejb-jar_3_0.xsds	1.51 02/23/06
>- * 
>- * 
>- * 
>- * Copyright 2003-2006 Sun Microsystems, Inc.
>- * 4150 Network Circle
>- * Santa Clara, California 95054
>- * U.S.A
>- * All rights reserved.
>- * 
>- * Sun Microsystems, Inc. has intellectual property rights
>- * relating to technology described in this document. In
>- * particular, and without limitation, these intellectual
>- * property rights may include one or more of the U.S. patents
>- * listed at http://www.sun.com/patents and one or more
>- * additional patents or pending patent applications in the
>- * U.S. and other countries.
>- * 
>- * This document and the technology which it describes are
>- * distributed under licenses restricting their use, copying,
>- * distribution, and decompilation. No part of this document
>- * may be reproduced in any form by any means without prior
>- * written authorization of Sun and its licensors, if any.
>- * 
>- * Third-party software, including font technology, is
>- * copyrighted and licensed from Sun suppliers.
>- * 
>- * Sun, Sun Microsystems, the Sun logo, Solaris, Java, javaee,
>- * JavaServer Pages, Enterprise JavaBeans and the Java Coffee
>- * Cup logo are trademarks or registered trademarks of Sun
>- * Microsystems, Inc. in the U.S. and other countries.
>- * 
>- * Federal Acquisitions: Commercial Software - Government Users
>- * Subject to Standard License Terms and Conditions.
> * 
>+ * $Id: ejb-jar_3_1.xsd,v 1.3 2009/10/02 06:33:19 ccc Exp $
>+ * 
> * 
> * 
>+ * <![CDATA[[
>+ * This is the XML Schema for the EJB 3.1 deployment descriptor.
> * 
>- * 
>- * 	This is the XML Schema for the EJB 3.0 deployment descriptor.
>- * 	The deployment descriptor must be named "META-INF/ejb-jar.xml" in
>- * 	the EJB's jar file. All EJB deployment descriptors must indicate
>- * 	the ejb-jar schema by using the Java EE namespace:
>- * 
>- * 	http://java.sun.com/xml/ns/javaee
>- * 
>- * 	and by indicating the version of the schema by
>- * 	using the version element as shown below:
>- * 
>- * 	 &lt;ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
>- * 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>- * 	 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
>- * 		 http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
>- * 	 version="3.0"&gt;
>- * 	 ...
>- * 	 &lt;/ejb-jar&gt;
>- * 
>- * 	The instance documents may indicate the published version of
>- * 	the schema using the xsi:schemaLocation attribute for the
>- * 	Java EE namespace with the following location:
>- * 
>- * 	http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd
>- * 
>- * 	
>+ * All EJB deployment descriptors must indicate
>+ * the ejb-jar schema by using the Java EE namespace:
>+ * 
>+ * http://java.sun.com/xml/ns/javaee
>+ * 
>+ * and by indicating the version of the schema by
>+ * using the version element as shown below:
>+ * 
>+ * <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
>+ * xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>+ * xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
>+ * 	 http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
>+ * version="3.1">
>+ * ...
>+ * </ejb-jar>
>+ * 
>+ * The instance documents may indicate the published version of
>+ * the schema using the xsi:schemaLocation attribute for the
>+ * Java EE namespace with the following location:
>+ * 
>+ * http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.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.ejb.EjbFactory
>@@ -328,6 +306,52 @@
> 	EjbPackage eINSTANCE = org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl.init();
> 
> 	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AccessTimeoutTypeImpl Access Timeout Type}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.AccessTimeoutTypeImpl
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getAccessTimeoutType()
>+	 * @generated
>+	 */
>+	int ACCESS_TIMEOUT_TYPE = 0;
>+
>+	/**
>+	 * The feature id for the 'Timeout' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACCESS_TIMEOUT_TYPE__TIMEOUT = 0;
>+
>+	/**
>+	 * The feature id for the 'Unit' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACCESS_TIMEOUT_TYPE__UNIT = 1;
>+
>+	/**
>+	 * The feature id for the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACCESS_TIMEOUT_TYPE__ID = 2;
>+
>+	/**
>+	 * The number of structural features of the 'Access Timeout Type' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACCESS_TIMEOUT_TYPE_FEATURE_COUNT = 3;
>+
>+	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigImpl Activation Config}' class.
> 	 * 
> 	 * 
>@@ -335,7 +359,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getActivationConfig()
> 	 * @generated
> 	 */
>-	int ACTIVATION_CONFIG = 0;
>+	int ACTIVATION_CONFIG = 1;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -381,7 +405,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getActivationConfigProperty()
> 	 * @generated
> 	 */
>-	int ACTIVATION_CONFIG_PROPERTY = 1;
>+	int ACTIVATION_CONFIG_PROPERTY = 2;
> 
> 	/**
> 	 * The feature id for the 'Activation Config Property Name' attribute.
>@@ -427,7 +451,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getApplicationException()
> 	 * @generated
> 	 */
>-	int APPLICATION_EXCEPTION = 2;
>+	int APPLICATION_EXCEPTION = 3;
> 
> 	/**
> 	 * The feature id for the 'Exception Class' attribute.
>@@ -448,13 +472,22 @@
> 	int APPLICATION_EXCEPTION__ROLLBACK = 1;
> 
> 	/**
>+	 * The feature id for the 'Inherited' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int APPLICATION_EXCEPTION__INHERITED = 2;
>+
>+	/**
> 	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_EXCEPTION__ID = 2;
>+	int APPLICATION_EXCEPTION__ID = 3;
> 
> 	/**
> 	 * The number of structural features of the 'Application Exception' class.
>@@ -463,7 +496,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int APPLICATION_EXCEPTION_FEATURE_COUNT = 3;
>+	int APPLICATION_EXCEPTION_FEATURE_COUNT = 4;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AroundInvokeTypeImpl Around Invoke Type}' class.
>@@ -473,7 +506,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getAroundInvokeType()
> 	 * @generated
> 	 */
>-	int AROUND_INVOKE_TYPE = 3;
>+	int AROUND_INVOKE_TYPE = 4;
> 
> 	/**
> 	 * The feature id for the 'Class' attribute.
>@@ -503,6 +536,43 @@
> 	int AROUND_INVOKE_TYPE_FEATURE_COUNT = 2;
> 
> 	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AroundTimeoutTypeImpl Around Timeout Type}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.AroundTimeoutTypeImpl
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getAroundTimeoutType()
>+	 * @generated
>+	 */
>+	int AROUND_TIMEOUT_TYPE = 5;
>+
>+	/**
>+	 * The feature id for the 'Class' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int AROUND_TIMEOUT_TYPE__CLASS = 0;
>+
>+	/**
>+	 * The feature id for the 'Method Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int AROUND_TIMEOUT_TYPE__METHOD_NAME = 1;
>+
>+	/**
>+	 * The number of structural features of the 'Around Timeout Type' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int AROUND_TIMEOUT_TYPE_FEATURE_COUNT = 2;
>+
>+	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl Assembly Descriptor}' class.
> 	 * 
> 	 * 
>@@ -510,7 +580,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getAssemblyDescriptor()
> 	 * @generated
> 	 */
>-	int ASSEMBLY_DESCRIPTOR = 4;
>+	int ASSEMBLY_DESCRIPTOR = 6;
> 
> 	/**
> 	 * The feature id for the 'Security Roles' containment reference list.
>@@ -594,6 +664,61 @@
> 	int ASSEMBLY_DESCRIPTOR_FEATURE_COUNT = 8;
> 
> 	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl Async Method Type}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getAsyncMethodType()
>+	 * @generated
>+	 */
>+	int ASYNC_METHOD_TYPE = 7;
>+
>+	/**
>+	 * The feature id for the 'Method Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ASYNC_METHOD_TYPE__METHOD_NAME = 0;
>+
>+	/**
>+	 * The feature id for the 'Method Params' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ASYNC_METHOD_TYPE__METHOD_PARAMS = 1;
>+
>+	/**
>+	 * The feature id for the 'Method Intf' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ASYNC_METHOD_TYPE__METHOD_INTF = 2;
>+
>+	/**
>+	 * The feature id for the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ASYNC_METHOD_TYPE__ID = 3;
>+
>+	/**
>+	 * The number of structural features of the 'Async Method Type' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ASYNC_METHOD_TYPE_FEATURE_COUNT = 4;
>+
>+	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.CMPFieldImpl CMP Field}' class.
> 	 * 
> 	 * 
>@@ -601,7 +726,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMPField()
> 	 * @generated
> 	 */
>-	int CMP_FIELD = 5;
>+	int CMP_FIELD = 8;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -647,7 +772,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMRField()
> 	 * @generated
> 	 */
>-	int CMR_FIELD = 6;
>+	int CMR_FIELD = 9;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -695,6 +820,61 @@
> 	int CMR_FIELD_FEATURE_COUNT = 4;
> 
> 	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ConcurrentMethodTypeImpl Concurrent Method Type}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.ConcurrentMethodTypeImpl
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getConcurrentMethodType()
>+	 * @generated
>+	 */
>+	int CONCURRENT_METHOD_TYPE = 10;
>+
>+	/**
>+	 * The feature id for the 'Method' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONCURRENT_METHOD_TYPE__METHOD = 0;
>+
>+	/**
>+	 * The feature id for the 'Lock' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONCURRENT_METHOD_TYPE__LOCK = 1;
>+
>+	/**
>+	 * The feature id for the 'Access Timeout' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONCURRENT_METHOD_TYPE__ACCESS_TIMEOUT = 2;
>+
>+	/**
>+	 * The feature id for the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONCURRENT_METHOD_TYPE__ID = 3;
>+
>+	/**
>+	 * The number of structural features of the 'Concurrent Method Type' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONCURRENT_METHOD_TYPE_FEATURE_COUNT = 4;
>+
>+	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ContainerTransactionTypeImpl Container Transaction Type}' class.
> 	 * 
> 	 * 
>@@ -702,7 +882,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getContainerTransactionType()
> 	 * @generated
> 	 */
>-	int CONTAINER_TRANSACTION_TYPE = 7;
>+	int CONTAINER_TRANSACTION_TYPE = 11;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -750,6 +930,43 @@
> 	int CONTAINER_TRANSACTION_TYPE_FEATURE_COUNT = 4;
> 
> 	/**
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.DependsOnTypeImpl Depends On Type}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.DependsOnTypeImpl
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getDependsOnType()
>+	 * @generated
>+	 */
>+	int DEPENDS_ON_TYPE = 12;
>+
>+	/**
>+	 * The feature id for the 'Ejb Name' attribute list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DEPENDS_ON_TYPE__EJB_NAME = 0;
>+
>+	/**
>+	 * The feature id for the 'Id' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DEPENDS_ON_TYPE__ID = 1;
>+
>+	/**
>+	 * The number of structural features of the 'Depends On Type' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DEPENDS_ON_TYPE_FEATURE_COUNT = 2;
>+
>+	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl EJB Jar}' class.
> 	 * 
> 	 * 
>@@ -757,7 +974,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEJBJar()
> 	 * @generated
> 	 */
>-	int EJB_JAR = 8;
>+	int EJB_JAR = 13;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -787,13 +1004,22 @@
> 	int EJB_JAR__ICONS = 2;
> 
> 	/**
>+	 * The feature id for the 'Module Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int EJB_JAR__MODULE_NAME = 3;
>+
>+	/**
> 	 * The feature id for the 'Enterprise Beans' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_JAR__ENTERPRISE_BEANS = 3;
>+	int EJB_JAR__ENTERPRISE_BEANS = 4;
> 
> 	/**
> 	 * The feature id for the 'Interceptors' containment reference.
>@@ -802,7 +1028,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_JAR__INTERCEPTORS = 4;
>+	int EJB_JAR__INTERCEPTORS = 5;
> 
> 	/**
> 	 * The feature id for the 'Relationships' containment reference.
>@@ -811,7 +1037,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_JAR__RELATIONSHIPS = 5;
>+	int EJB_JAR__RELATIONSHIPS = 6;
> 
> 	/**
> 	 * The feature id for the 'Assembly Descriptor' containment reference.
>@@ -820,7 +1046,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_JAR__ASSEMBLY_DESCRIPTOR = 6;
>+	int EJB_JAR__ASSEMBLY_DESCRIPTOR = 7;
> 
> 	/**
> 	 * The feature id for the 'Ejb Client Jar' attribute.
>@@ -829,7 +1055,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_JAR__EJB_CLIENT_JAR = 7;
>+	int EJB_JAR__EJB_CLIENT_JAR = 8;
> 
> 	/**
> 	 * The feature id for the 'Id' attribute.
>@@ -838,7 +1064,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_JAR__ID = 8;
>+	int EJB_JAR__ID = 9;
> 
> 	/**
> 	 * The feature id for the 'Metadata Complete' attribute.
>@@ -847,7 +1073,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_JAR__METADATA_COMPLETE = 9;
>+	int EJB_JAR__METADATA_COMPLETE = 10;
> 
> 	/**
> 	 * The feature id for the 'Version' attribute.
>@@ -856,7 +1082,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_JAR__VERSION = 10;
>+	int EJB_JAR__VERSION = 11;
> 
> 	/**
> 	 * The number of structural features of the 'EJB Jar' class.
>@@ -865,7 +1091,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int EJB_JAR_FEATURE_COUNT = 11;
>+	int EJB_JAR_FEATURE_COUNT = 12;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarDeploymentDescriptorImpl EJB Jar Deployment Descriptor}' class.
>@@ -875,7 +1101,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEJBJarDeploymentDescriptor()
> 	 * @generated
> 	 */
>-	int EJB_JAR_DEPLOYMENT_DESCRIPTOR = 9;
>+	int EJB_JAR_DEPLOYMENT_DESCRIPTOR = 14;
> 
> 	/**
> 	 * The feature id for the 'Mixed' attribute list.
>@@ -930,7 +1156,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEJBRelation()
> 	 * @generated
> 	 */
>-	int EJB_RELATION = 10;
>+	int EJB_RELATION = 15;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -985,7 +1211,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEJBRelationshipRole()
> 	 * @generated
> 	 */
>-	int EJB_RELATIONSHIP_ROLE = 11;
>+	int EJB_RELATIONSHIP_ROLE = 16;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1067,7 +1293,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEnterpriseBeans()
> 	 * @generated
> 	 */
>-	int ENTERPRISE_BEANS = 12;
>+	int ENTERPRISE_BEANS = 17;
> 
> 	/**
> 	 * The feature id for the 'Group' attribute list.
>@@ -1131,7 +1357,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEntityBean()
> 	 * @generated
> 	 */
>-	int ENTITY_BEAN = 13;
>+	int ENTITY_BEAN = 18;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1386,22 +1612,31 @@
> 	int ENTITY_BEAN__PRE_DESTROYS = 27;
> 
> 	/**
>-	 * The feature id for the 'Security Role Refs' containment reference list.
>+	 * The feature id for the 'Data Source' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ENTITY_BEAN__SECURITY_ROLE_REFS = 28;
>+	int ENTITY_BEAN__DATA_SOURCE = 28;
> 
> 	/**
>-	 * The feature id for the 'Security Identity' containment reference.
>+	 * The feature id for the 'Security Role Refs' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ENTITY_BEAN__SECURITY_IDENTITY = 29;
>+	int ENTITY_BEAN__SECURITY_ROLE_REFS = 29;
>+
>+	/**
>+	 * The feature id for the 'Security Identity' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ENTITY_BEAN__SECURITY_IDENTITY = 30;
> 
> 	/**
> 	 * The feature id for the 'Queries' containment reference list.
>@@ -1410,7 +1645,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ENTITY_BEAN__QUERIES = 30;
>+	int ENTITY_BEAN__QUERIES = 31;
> 
> 	/**
> 	 * The feature id for the 'Id' attribute.
>@@ -1419,7 +1654,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ENTITY_BEAN__ID = 31;
>+	int ENTITY_BEAN__ID = 32;
> 
> 	/**
> 	 * The number of structural features of the 'Entity Bean' class.
>@@ -1428,7 +1663,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ENTITY_BEAN_FEATURE_COUNT = 32;
>+	int ENTITY_BEAN_FEATURE_COUNT = 33;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ExcludeListImpl Exclude List}' class.
>@@ -1438,7 +1673,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getExcludeList()
> 	 * @generated
> 	 */
>-	int EXCLUDE_LIST = 14;
>+	int EXCLUDE_LIST = 19;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1484,7 +1719,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInitMethodType()
> 	 * @generated
> 	 */
>-	int INIT_METHOD_TYPE = 15;
>+	int INIT_METHOD_TYPE = 20;
> 
> 	/**
> 	 * The feature id for the 'Create Method' containment reference.
>@@ -1530,7 +1765,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInterceptorBindingType()
> 	 * @generated
> 	 */
>-	int INTERCEPTOR_BINDING_TYPE = 16;
>+	int INTERCEPTOR_BINDING_TYPE = 21;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1621,7 +1856,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInterceptorOrderType()
> 	 * @generated
> 	 */
>-	int INTERCEPTOR_ORDER_TYPE = 17;
>+	int INTERCEPTOR_ORDER_TYPE = 22;
> 
> 	/**
> 	 * The feature id for the 'Interceptor Classes' attribute list.
>@@ -1658,7 +1893,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInterceptorsType()
> 	 * @generated
> 	 */
>-	int INTERCEPTORS_TYPE = 18;
>+	int INTERCEPTORS_TYPE = 23;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1704,7 +1939,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getInterceptorType()
> 	 * @generated
> 	 */
>-	int INTERCEPTOR_TYPE = 19;
>+	int INTERCEPTOR_TYPE = 24;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1734,13 +1969,22 @@
> 	int INTERCEPTOR_TYPE__AROUND_INVOKES = 2;
> 
> 	/**
>+	 * The feature id for the 'Around Timeouts' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int INTERCEPTOR_TYPE__AROUND_TIMEOUTS = 3;
>+
>+	/**
> 	 * The feature id for the 'Env Entries' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__ENV_ENTRIES = 3;
>+	int INTERCEPTOR_TYPE__ENV_ENTRIES = 4;
> 
> 	/**
> 	 * The feature id for the 'Ejb Refs' containment reference list.
>@@ -1749,7 +1993,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__EJB_REFS = 4;
>+	int INTERCEPTOR_TYPE__EJB_REFS = 5;
> 
> 	/**
> 	 * The feature id for the 'Ejb Local Refs' containment reference list.
>@@ -1758,7 +2002,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__EJB_LOCAL_REFS = 5;
>+	int INTERCEPTOR_TYPE__EJB_LOCAL_REFS = 6;
> 
> 	/**
> 	 * The feature id for the 'Service Refs' containment reference list.
>@@ -1767,7 +2011,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__SERVICE_REFS = 6;
>+	int INTERCEPTOR_TYPE__SERVICE_REFS = 7;
> 
> 	/**
> 	 * The feature id for the 'Resource Refs' containment reference list.
>@@ -1776,7 +2020,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__RESOURCE_REFS = 7;
>+	int INTERCEPTOR_TYPE__RESOURCE_REFS = 8;
> 
> 	/**
> 	 * The feature id for the 'Resource Env Refs' containment reference list.
>@@ -1785,7 +2029,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__RESOURCE_ENV_REFS = 8;
>+	int INTERCEPTOR_TYPE__RESOURCE_ENV_REFS = 9;
> 
> 	/**
> 	 * The feature id for the 'Message Destination Refs' containment reference list.
>@@ -1794,7 +2038,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS = 9;
>+	int INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS = 10;
> 
> 	/**
> 	 * The feature id for the 'Persistence Context Refs' containment reference list.
>@@ -1803,7 +2047,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS = 10;
>+	int INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS = 11;
> 
> 	/**
> 	 * The feature id for the 'Persistence Unit Refs' containment reference list.
>@@ -1812,7 +2056,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS = 11;
>+	int INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS = 12;
> 
> 	/**
> 	 * The feature id for the 'Post Constructs' containment reference list.
>@@ -1821,7 +2065,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__POST_CONSTRUCTS = 12;
>+	int INTERCEPTOR_TYPE__POST_CONSTRUCTS = 13;
> 
> 	/**
> 	 * The feature id for the 'Pre Destroys' containment reference list.
>@@ -1830,7 +2074,16 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__PRE_DESTROYS = 13;
>+	int INTERCEPTOR_TYPE__PRE_DESTROYS = 14;
>+
>+	/**
>+	 * The feature id for the 'Data Source' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int INTERCEPTOR_TYPE__DATA_SOURCE = 15;
> 
> 	/**
> 	 * The feature id for the 'Post Activates' containment reference list.
>@@ -1839,7 +2092,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__POST_ACTIVATES = 14;
>+	int INTERCEPTOR_TYPE__POST_ACTIVATES = 16;
> 
> 	/**
> 	 * The feature id for the 'Pre Passivates' containment reference list.
>@@ -1848,7 +2101,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__PRE_PASSIVATES = 15;
>+	int INTERCEPTOR_TYPE__PRE_PASSIVATES = 17;
> 
> 	/**
> 	 * The feature id for the 'Id' attribute.
>@@ -1857,7 +2110,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE__ID = 16;
>+	int INTERCEPTOR_TYPE__ID = 18;
> 
> 	/**
> 	 * The number of structural features of the 'Interceptor Type' class.
>@@ -1866,7 +2119,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int INTERCEPTOR_TYPE_FEATURE_COUNT = 17;
>+	int INTERCEPTOR_TYPE_FEATURE_COUNT = 19;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl Message Driven Bean}' class.
>@@ -1876,7 +2129,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMessageDrivenBean()
> 	 * @generated
> 	 */
>-	int MESSAGE_DRIVEN_BEAN = 20;
>+	int MESSAGE_DRIVEN_BEAN = 25;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -1951,13 +2204,22 @@
> 	int MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD = 7;
> 
> 	/**
>+	 * The feature id for the 'Timer' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MESSAGE_DRIVEN_BEAN__TIMER = 8;
>+
>+	/**
> 	 * The feature id for the 'Transaction Type' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE = 8;
>+	int MESSAGE_DRIVEN_BEAN__TRANSACTION_TYPE = 9;
> 
> 	/**
> 	 * The feature id for the 'Message Destination Type' attribute.
>@@ -1966,7 +2228,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE = 9;
>+	int MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_TYPE = 10;
> 
> 	/**
> 	 * The feature id for the 'Message Destination Link' attribute.
>@@ -1975,7 +2237,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_LINK = 10;
>+	int MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_LINK = 11;
> 
> 	/**
> 	 * The feature id for the 'Activation Config' containment reference.
>@@ -1984,7 +2246,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG = 11;
>+	int MESSAGE_DRIVEN_BEAN__ACTIVATION_CONFIG = 12;
> 
> 	/**
> 	 * The feature id for the 'Around Invokes' containment reference list.
>@@ -1993,7 +2255,16 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__AROUND_INVOKES = 12;
>+	int MESSAGE_DRIVEN_BEAN__AROUND_INVOKES = 13;
>+
>+	/**
>+	 * The feature id for the 'Around Timeouts' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MESSAGE_DRIVEN_BEAN__AROUND_TIMEOUTS = 14;
> 
> 	/**
> 	 * The feature id for the 'Env Entries' containment reference list.
>@@ -2002,7 +2273,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__ENV_ENTRIES = 13;
>+	int MESSAGE_DRIVEN_BEAN__ENV_ENTRIES = 15;
> 
> 	/**
> 	 * The feature id for the 'Ejb Refs' containment reference list.
>@@ -2011,7 +2282,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__EJB_REFS = 14;
>+	int MESSAGE_DRIVEN_BEAN__EJB_REFS = 16;
> 
> 	/**
> 	 * The feature id for the 'Ejb Local Refs' containment reference list.
>@@ -2020,7 +2291,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS = 15;
>+	int MESSAGE_DRIVEN_BEAN__EJB_LOCAL_REFS = 17;
> 
> 	/**
> 	 * The feature id for the 'Service Refs' containment reference list.
>@@ -2029,7 +2300,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__SERVICE_REFS = 16;
>+	int MESSAGE_DRIVEN_BEAN__SERVICE_REFS = 18;
> 
> 	/**
> 	 * The feature id for the 'Resource Refs' containment reference list.
>@@ -2038,7 +2309,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__RESOURCE_REFS = 17;
>+	int MESSAGE_DRIVEN_BEAN__RESOURCE_REFS = 19;
> 
> 	/**
> 	 * The feature id for the 'Resource Env Refs' containment reference list.
>@@ -2047,7 +2318,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS = 18;
>+	int MESSAGE_DRIVEN_BEAN__RESOURCE_ENV_REFS = 20;
> 
> 	/**
> 	 * The feature id for the 'Message Destination Refs' containment reference list.
>@@ -2056,7 +2327,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS = 19;
>+	int MESSAGE_DRIVEN_BEAN__MESSAGE_DESTINATION_REFS = 21;
> 
> 	/**
> 	 * The feature id for the 'Persistence Context Refs' containment reference list.
>@@ -2065,7 +2336,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS = 20;
>+	int MESSAGE_DRIVEN_BEAN__PERSISTENCE_CONTEXT_REFS = 22;
> 
> 	/**
> 	 * The feature id for the 'Persistence Unit Refs' containment reference list.
>@@ -2074,7 +2345,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS = 21;
>+	int MESSAGE_DRIVEN_BEAN__PERSISTENCE_UNIT_REFS = 23;
> 
> 	/**
> 	 * The feature id for the 'Post Constructs' containment reference list.
>@@ -2083,7 +2354,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS = 22;
>+	int MESSAGE_DRIVEN_BEAN__POST_CONSTRUCTS = 24;
> 
> 	/**
> 	 * The feature id for the 'Pre Destroys' containment reference list.
>@@ -2092,7 +2363,25 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__PRE_DESTROYS = 23;
>+	int MESSAGE_DRIVEN_BEAN__PRE_DESTROYS = 25;
>+
>+	/**
>+	 * The feature id for the 'Data Source' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MESSAGE_DRIVEN_BEAN__DATA_SOURCE = 26;
>+
>+	/**
>+	 * The feature id for the 'Security Role Ref' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MESSAGE_DRIVEN_BEAN__SECURITY_ROLE_REF = 27;
> 
> 	/**
> 	 * The feature id for the 'Security Identity' containment reference.
>@@ -2101,7 +2390,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY = 24;
>+	int MESSAGE_DRIVEN_BEAN__SECURITY_IDENTITY = 28;
> 
> 	/**
> 	 * The feature id for the 'Id' attribute.
>@@ -2110,7 +2399,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN__ID = 25;
>+	int MESSAGE_DRIVEN_BEAN__ID = 29;
> 
> 	/**
> 	 * The number of structural features of the 'Message Driven Bean' class.
>@@ -2119,7 +2408,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MESSAGE_DRIVEN_BEAN_FEATURE_COUNT = 26;
>+	int MESSAGE_DRIVEN_BEAN_FEATURE_COUNT = 30;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MethodParamsImpl Method Params}' class.
>@@ -2129,7 +2418,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodParams()
> 	 * @generated
> 	 */
>-	int METHOD_PARAMS = 21;
>+	int METHOD_PARAMS = 26;
> 
> 	/**
> 	 * The feature id for the 'Method Params' attribute list.
>@@ -2166,7 +2455,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodPermission()
> 	 * @generated
> 	 */
>-	int METHOD_PERMISSION = 22;
>+	int METHOD_PERMISSION = 27;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -2230,7 +2519,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodType()
> 	 * @generated
> 	 */
>-	int METHOD_TYPE = 23;
>+	int METHOD_TYPE = 28;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -2303,7 +2592,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getNamedMethodType()
> 	 * @generated
> 	 */
>-	int NAMED_METHOD_TYPE = 24;
>+	int NAMED_METHOD_TYPE = 29;
> 
> 	/**
> 	 * The feature id for the 'Method Name' attribute.
>@@ -2349,7 +2638,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getQuery()
> 	 * @generated
> 	 */
>-	int QUERY = 25;
>+	int QUERY = 30;
> 
> 	/**
> 	 * The feature id for the 'Description' containment reference.
>@@ -2413,7 +2702,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getQueryMethod()
> 	 * @generated
> 	 */
>-	int QUERY_METHOD = 26;
>+	int QUERY_METHOD = 31;
> 
> 	/**
> 	 * The feature id for the 'Method Name' attribute.
>@@ -2459,7 +2748,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getRelationshipRoleSourceType()
> 	 * @generated
> 	 */
>-	int RELATIONSHIP_ROLE_SOURCE_TYPE = 27;
>+	int RELATIONSHIP_ROLE_SOURCE_TYPE = 32;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -2505,7 +2794,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getRelationships()
> 	 * @generated
> 	 */
>-	int RELATIONSHIPS = 28;
>+	int RELATIONSHIPS = 33;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -2551,7 +2840,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getRemoveMethodType()
> 	 * @generated
> 	 */
>-	int REMOVE_METHOD_TYPE = 29;
>+	int REMOVE_METHOD_TYPE = 34;
> 
> 	/**
> 	 * The feature id for the 'Bean Method' containment reference.
>@@ -2597,7 +2886,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSecurityIdentityType()
> 	 * @generated
> 	 */
>-	int SECURITY_IDENTITY_TYPE = 30;
>+	int SECURITY_IDENTITY_TYPE = 35;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -2652,7 +2941,7 @@
> 	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSessionBean()
> 	 * @generated
> 	 */
>-	int SESSION_BEAN = 31;
>+	int SESSION_BEAN = 36;
> 
> 	/**
> 	 * The feature id for the 'Descriptions' containment reference list.
>@@ -2754,13 +3043,22 @@
> 	int SESSION_BEAN__BUSINESS_REMOTES = 10;
> 
> 	/**
>+	 * The feature id for the 'Local Bean' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SESSION_BEAN__LOCAL_BEAN = 11;
>+
>+	/**
> 	 * The feature id for the 'Service Endpoint' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__SERVICE_ENDPOINT = 11;
>+	int SESSION_BEAN__SERVICE_ENDPOINT = 12;
> 
> 	/**
> 	 * The feature id for the 'Ejb Class' attribute.
>@@ -2769,7 +3067,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__EJB_CLASS = 12;
>+	int SESSION_BEAN__EJB_CLASS = 13;
> 
> 	/**
> 	 * The feature id for the 'Session Type' attribute.
>@@ -2778,3233 +3076,4345 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__SESSION_TYPE = 13;
>+	int SESSION_BEAN__SESSION_TYPE = 14;
> 
> 	/**
>-	 * The feature id for the 'Timeout Method' containment reference.
>+	 * The feature id for the 'Stateful Timeout' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__TIMEOUT_METHOD = 14;
>+	int SESSION_BEAN__STATEFUL_TIMEOUT = 15;
> 
> 	/**
>-	 * The feature id for the 'Init Methods' containment reference list.
>+	 * The feature id for the 'Timeout Method' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__INIT_METHODS = 15;
>+	int SESSION_BEAN__TIMEOUT_METHOD = 16;
> 
> 	/**
>-	 * The feature id for the 'Remove Methods' containment reference list.
>+	 * The feature id for the 'Timer' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__REMOVE_METHODS = 16;
>+	int SESSION_BEAN__TIMER = 17;
> 
> 	/**
>-	 * The feature id for the 'Transaction Type' attribute.
>+	 * The feature id for the 'Init On Startup' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__TRANSACTION_TYPE = 17;
>+	int SESSION_BEAN__INIT_ON_STARTUP = 18;
> 
> 	/**
>-	 * The feature id for the 'Around Invokes' containment reference list.
>+	 * The feature id for the 'Concurrency Management Type' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__AROUND_INVOKES = 18;
>+	int SESSION_BEAN__CONCURRENCY_MANAGEMENT_TYPE = 19;
> 
> 	/**
>-	 * The feature id for the 'Env Entries' containment reference list.
>+	 * The feature id for the 'Concurrent Method' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__ENV_ENTRIES = 19;
>+	int SESSION_BEAN__CONCURRENT_METHOD = 20;
> 
> 	/**
>-	 * The feature id for the 'Ejb Refs' containment reference list.
>+	 * The feature id for the 'Depends On' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__EJB_REFS = 20;
>+	int SESSION_BEAN__DEPENDS_ON = 21;
> 
> 	/**
>-	 * The feature id for the 'Ejb Local Refs' containment reference list.
>+	 * The feature id for the 'Init Methods' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__EJB_LOCAL_REFS = 21;
>+	int SESSION_BEAN__INIT_METHODS = 22;
> 
> 	/**
>-	 * The feature id for the 'Service Refs' containment reference list.
>+	 * The feature id for the 'Remove Methods' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__SERVICE_REFS = 22;
>+	int SESSION_BEAN__REMOVE_METHODS = 23;
> 
> 	/**
>-	 * The feature id for the 'Resource Refs' containment reference list.
>+	 * The feature id for the 'Async Method' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__RESOURCE_REFS = 23;
>+	int SESSION_BEAN__ASYNC_METHOD = 24;
> 
> 	/**
>-	 * The feature id for the 'Resource Env Refs' containment reference list.
>+	 * The feature id for the 'Transaction Type' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__RESOURCE_ENV_REFS = 24;
>+	int SESSION_BEAN__TRANSACTION_TYPE = 25;
> 
> 	/**
>-	 * The feature id for the 'Message Destination Refs' containment reference list.
>+	 * The feature id for the 'After Begin Method' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__MESSAGE_DESTINATION_REFS = 25;
>+	int SESSION_BEAN__AFTER_BEGIN_METHOD = 26;
> 
> 	/**
>-	 * The feature id for the 'Persistence Context Refs' containment reference list.
>+	 * The feature id for the 'Before Completion Method' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__PERSISTENCE_CONTEXT_REFS = 26;
>+	int SESSION_BEAN__BEFORE_COMPLETION_METHOD = 27;
> 
> 	/**
>-	 * The feature id for the 'Persistence Unit Refs' containment reference list.
>+	 * The feature id for the 'After Completion Method' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__PERSISTENCE_UNIT_REFS = 27;
>+	int SESSION_BEAN__AFTER_COMPLETION_METHOD = 28;
> 
> 	/**
>-	 * The feature id for the 'Post Constructs' containment reference list.
>+	 * The feature id for the 'Around Invokes' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__POST_CONSTRUCTS = 28;
>+	int SESSION_BEAN__AROUND_INVOKES = 29;
> 
> 	/**
>-	 * The feature id for the 'Pre Destroys' containment reference list.
>+	 * The feature id for the 'Around Timeouts' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__PRE_DESTROYS = 29;
>+	int SESSION_BEAN__AROUND_TIMEOUTS = 30;
> 
> 	/**
>-	 * The feature id for the 'Post Activates' containment reference list.
>+	 * The feature id for the 'Env Entries' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__POST_ACTIVATES = 30;
>+	int SESSION_BEAN__ENV_ENTRIES = 31;
> 
> 	/**
>-	 * The feature id for the 'Pre Passivates' containment reference list.
>+	 * The feature id for the 'Ejb Refs' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__PRE_PASSIVATES = 31;
>+	int SESSION_BEAN__EJB_REFS = 32;
> 
> 	/**
>-	 * The feature id for the 'Security Role Refs' containment reference list.
>+	 * The feature id for the 'Ejb Local Refs' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__SECURITY_ROLE_REFS = 32;
>+	int SESSION_BEAN__EJB_LOCAL_REFS = 33;
> 
> 	/**
>-	 * The feature id for the 'Security Identities' containment reference.
>+	 * The feature id for the 'Service Refs' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__SECURITY_IDENTITIES = 33;
>+	int SESSION_BEAN__SERVICE_REFS = 34;
> 
> 	/**
>-	 * The feature id for the 'Id' attribute.
>+	 * The feature id for the 'Resource Refs' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN__ID = 34;
>+	int SESSION_BEAN__RESOURCE_REFS = 35;
> 
> 	/**
>-	 * The number of structural features of the 'Session Bean' class.
>+	 * The feature id for the 'Resource Env Refs' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SESSION_BEAN_FEATURE_COUNT = 35;
>+	int SESSION_BEAN__RESOURCE_ENV_REFS = 36;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.CmpVersionType Cmp Version Type}' enum.
>+	 * The feature id for the 'Message Destination Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.CmpVersionType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCmpVersionType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int CMP_VERSION_TYPE = 32;
>+	int SESSION_BEAN__MESSAGE_DESTINATION_REFS = 37;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.CMRFieldType CMR Field Type}' enum.
>+	 * The feature id for the 'Persistence Context Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.CMRFieldType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMRFieldType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int CMR_FIELD_TYPE = 33;
>+	int SESSION_BEAN__PERSISTENCE_CONTEXT_REFS = 38;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.MethodInterfaceType Method Interface Type}' enum.
>+	 * The feature id for the 'Persistence Unit Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodInterfaceType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int METHOD_INTERFACE_TYPE = 34;
>+	int SESSION_BEAN__PERSISTENCE_UNIT_REFS = 39;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.MultiplicityType Multiplicity Type}' enum.
>+	 * The feature id for the 'Post Constructs' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.MultiplicityType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMultiplicityType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int MULTIPLICITY_TYPE = 35;
>+	int SESSION_BEAN__POST_CONSTRUCTS = 40;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.PersistenceType Persistence Type}' enum.
>+	 * The feature id for the 'Pre Destroys' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.PersistenceType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getPersistenceType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int PERSISTENCE_TYPE = 36;
>+	int SESSION_BEAN__PRE_DESTROYS = 41;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.ResultTypeMappingType Result Type Mapping Type}' enum.
>+	 * The feature id for the 'Data Source' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.ResultTypeMappingType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getResultTypeMappingType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int RESULT_TYPE_MAPPING_TYPE = 37;
>+	int SESSION_BEAN__DATA_SOURCE = 42;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.SessionType Session Type}' enum.
>+	 * The feature id for the 'Post Activates' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.SessionType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSessionType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int SESSION_TYPE = 38;
>+	int SESSION_BEAN__POST_ACTIVATES = 43;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.TransactionAttributeType Transaction Attribute Type}' enum.
>+	 * The feature id for the 'Pre Passivates' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.TransactionAttributeType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionAttributeType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int TRANSACTION_ATTRIBUTE_TYPE = 39;
>+	int SESSION_BEAN__PRE_PASSIVATES = 44;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.TransactionType Transaction Type}' enum.
>+	 * The feature id for the 'Security Role Refs' containment reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.TransactionType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int TRANSACTION_TYPE = 40;
>+	int SESSION_BEAN__SECURITY_ROLE_REFS = 45;
> 
> 	/**
>-	 * The meta object id for the 'Cmp Version Type Object' data type.
>+	 * The feature id for the 'Security Identities' containment reference.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.CmpVersionType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCmpVersionTypeObject()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int CMP_VERSION_TYPE_OBJECT = 41;
>+	int SESSION_BEAN__SECURITY_IDENTITIES = 46;
> 
> 	/**
>-	 * The meta object id for the 'CMR Field Type Object' data type.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.CMRFieldType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMRFieldTypeObject()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int CMR_FIELD_TYPE_OBJECT = 42;
>+	int SESSION_BEAN__ID = 47;
> 
> 	/**
>-	 * The meta object id for the 'Class Type' data type.
>+	 * The number of structural features of the 'Session Bean' class.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEjbClassType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int EJB_CLASS_TYPE = 43;
>+	int SESSION_BEAN_FEATURE_COUNT = 48;
> 
> 	/**
>-	 * The meta object id for the 'Name Type' data type.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.StatefulTimeoutTypeImpl Stateful Timeout Type}' class.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEjbNameType()
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.StatefulTimeoutTypeImpl
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getStatefulTimeoutType()
> 	 * @generated
> 	 */
>-	int EJB_NAME_TYPE = 44;
>+	int STATEFUL_TIMEOUT_TYPE = 37;
> 
> 	/**
>-	 * The meta object id for the 'Method Interface Type Object' data type.
>+	 * The feature id for the 'Timeout' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodInterfaceTypeObject()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int METHOD_INTERFACE_TYPE_OBJECT = 45;
>+	int STATEFUL_TIMEOUT_TYPE__TIMEOUT = 0;
> 
> 	/**
>-	 * The meta object id for the 'Method Name Type' data type.
>+	 * The feature id for the 'Unit' attribute.
> 	 * 
> 	 * 
>-	 * @see java.lang.String
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodNameType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int METHOD_NAME_TYPE = 46;
>+	int STATEFUL_TIMEOUT_TYPE__UNIT = 1;
> 
> 	/**
>-	 * The meta object id for the 'Multiplicity Type Object' data type.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.MultiplicityType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMultiplicityTypeObject()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int MULTIPLICITY_TYPE_OBJECT = 47;
>+	int STATEFUL_TIMEOUT_TYPE__ID = 2;
> 
> 	/**
>-	 * The meta object id for the 'Persistence Type Object' data type.
>+	 * The number of structural features of the 'Stateful Timeout Type' class.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.PersistenceType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getPersistenceTypeObject()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int PERSISTENCE_TYPE_OBJECT = 48;
>+	int STATEFUL_TIMEOUT_TYPE_FEATURE_COUNT = 3;
> 
> 	/**
>-	 * The meta object id for the 'Result Type Mapping Type Object' data type.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerScheduleTypeImpl Timer Schedule Type}' class.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.ResultTypeMappingType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getResultTypeMappingTypeObject()
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.TimerScheduleTypeImpl
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTimerScheduleType()
> 	 * @generated
> 	 */
>-	int RESULT_TYPE_MAPPING_TYPE_OBJECT = 49;
>+	int TIMER_SCHEDULE_TYPE = 38;
> 
> 	/**
>-	 * The meta object id for the 'Session Type Object' data type.
>+	 * The feature id for the 'Second' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.SessionType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSessionTypeObject()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int SESSION_TYPE_OBJECT = 50;
>+	int TIMER_SCHEDULE_TYPE__SECOND = 0;
> 
> 	/**
>-	 * The meta object id for the 'Transaction Attribute Type Object' data type.
>+	 * The feature id for the 'Minute' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.TransactionAttributeType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionAttributeTypeObject()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int TRANSACTION_ATTRIBUTE_TYPE_OBJECT = 51;
>+	int TIMER_SCHEDULE_TYPE__MINUTE = 1;
> 
> 	/**
>-	 * The meta object id for the 'Transaction Type Object' data type.
>+	 * The feature id for the 'Hour' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.jst.javaee.ejb.TransactionType
>-	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionTypeObject()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int TRANSACTION_TYPE_OBJECT = 52;
>-
>+	int TIMER_SCHEDULE_TYPE__HOUR = 2;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ActivationConfig Activation Config}'.
>+	 * The feature id for the 'Day Of Month' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Activation Config'.
>-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getActivationConfig();
>+	int TIMER_SCHEDULE_TYPE__DAY_OF_MONTH = 3;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getDescriptions Descriptions}'.
>+	 * The feature id for the 'Month' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig#getDescriptions()
>-	 * @see #getActivationConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getActivationConfig_Descriptions();
>+	int TIMER_SCHEDULE_TYPE__MONTH = 4;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getActivationConfigProperties Activation Config Properties}'.
>+	 * The feature id for the 'Day Of Week' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Activation Config Properties'.
>-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig#getActivationConfigProperties()
>-	 * @see #getActivationConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getActivationConfig_ActivationConfigProperties();
>+	int TIMER_SCHEDULE_TYPE__DAY_OF_WEEK = 5;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getId Id}'.
>+	 * The feature id for the 'Year' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig#getId()
>-	 * @see #getActivationConfig()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getActivationConfig_Id();
>+	int TIMER_SCHEDULE_TYPE__YEAR = 6;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty Activation Config Property}'.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Activation Config Property'.
>-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getActivationConfigProperty();
>+	int TIMER_SCHEDULE_TYPE__ID = 7;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyName Activation Config Property Name}'.
>+	 * The number of structural features of the 'Timer Schedule Type' class.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Activation Config Property Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyName()
>-	 * @see #getActivationConfigProperty()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getActivationConfigProperty_ActivationConfigPropertyName();
>+	int TIMER_SCHEDULE_TYPE_FEATURE_COUNT = 8;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyValue Activation Config Property Value}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl Timer Type}' class.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Activation Config Property Value'.
>-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyValue()
>-	 * @see #getActivationConfigProperty()
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTimerType()
> 	 * @generated
> 	 */
>-	EAttribute getActivationConfigProperty_ActivationConfigPropertyValue();
>+	int TIMER_TYPE = 39;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getId Id}'.
>+	 * The feature id for the 'Description' containment reference list.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getId()
>-	 * @see #getActivationConfigProperty()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getActivationConfigProperty_Id();
>+	int TIMER_TYPE__DESCRIPTION = 0;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ApplicationException Application Exception}'.
>+	 * The feature id for the 'Schedule' containment reference.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Application Exception'.
>-	 * @see org.eclipse.jst.javaee.ejb.ApplicationException
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getApplicationException();
>+	int TIMER_TYPE__SCHEDULE = 1;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ApplicationException#getExceptionClass Exception Class}'.
>+	 * The feature id for the 'Start' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Exception Class'.
>-	 * @see org.eclipse.jst.javaee.ejb.ApplicationException#getExceptionClass()
>-	 * @see #getApplicationException()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getApplicationException_ExceptionClass();
>+	int TIMER_TYPE__START = 2;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ApplicationException#isRollback Rollback}'.
>+	 * The feature id for the 'End' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Rollback'.
>-	 * @see org.eclipse.jst.javaee.ejb.ApplicationException#isRollback()
>-	 * @see #getApplicationException()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getApplicationException_Rollback();
>+	int TIMER_TYPE__END = 3;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ApplicationException#getId Id}'.
>+	 * The feature id for the 'Timeout Method' containment reference.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.ApplicationException#getId()
>-	 * @see #getApplicationException()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getApplicationException_Id();
>+	int TIMER_TYPE__TIMEOUT_METHOD = 4;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.AroundInvokeType Around Invoke Type}'.
>+	 * The feature id for the 'Persistent' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Around Invoke Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.AroundInvokeType
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getAroundInvokeType();
>+	int TIMER_TYPE__PERSISTENT = 5;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AroundInvokeType#getClass_ Class}'.
>+	 * The feature id for the 'Timezone' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Class'.
>-	 * @see org.eclipse.jst.javaee.ejb.AroundInvokeType#getClass_()
>-	 * @see #getAroundInvokeType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getAroundInvokeType_Class();
>+	int TIMER_TYPE__TIMEZONE = 6;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AroundInvokeType#getMethodName Method Name}'.
>+	 * The feature id for the 'Info' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Method Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.AroundInvokeType#getMethodName()
>-	 * @see #getAroundInvokeType()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EAttribute getAroundInvokeType_MethodName();
>+	int TIMER_TYPE__INFO = 7;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor Assembly Descriptor}'.
>+	 * The feature id for the 'Id' attribute.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Assembly Descriptor'.
>-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EClass getAssemblyDescriptor();
>+	int TIMER_TYPE__ID = 8;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getSecurityRoles Security Roles}'.
>+	 * The number of structural features of the 'Timer Type' class.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Security Roles'.
>-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getSecurityRoles()
>-	 * @see #getAssemblyDescriptor()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	EReference getAssemblyDescriptor_SecurityRoles();
>+	int TIMER_TYPE_FEATURE_COUNT = 9;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMethodPermissions Method Permissions}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.CmpVersionType Cmp Version Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Method Permissions'.
>-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMethodPermissions()
>-	 * @see #getAssemblyDescriptor()
>+	 * @see org.eclipse.jst.javaee.ejb.CmpVersionType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCmpVersionType()
> 	 * @generated
> 	 */
>-	EReference getAssemblyDescriptor_MethodPermissions();
>+	int CMP_VERSION_TYPE = 40;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getContainerTransactions Container Transactions}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.CMRFieldType CMR Field Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Container Transactions'.
>-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getContainerTransactions()
>-	 * @see #getAssemblyDescriptor()
>+	 * @see org.eclipse.jst.javaee.ejb.CMRFieldType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMRFieldType()
> 	 * @generated
> 	 */
>-	EReference getAssemblyDescriptor_ContainerTransactions();
>+	int CMR_FIELD_TYPE = 41;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getInterceptorBindings Interceptor Bindings}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType Concurrency Management Type Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Interceptor Bindings'.
>-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getInterceptorBindings()
>-	 * @see #getAssemblyDescriptor()
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getConcurrencyManagementTypeType()
> 	 * @generated
> 	 */
>-	EReference getAssemblyDescriptor_InterceptorBindings();
>+	int CONCURRENCY_MANAGEMENT_TYPE_TYPE = 42;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMessageDestinations Message Destinations}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType Concurrent Lock Type Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Message Destinations'.
>-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMessageDestinations()
>-	 * @see #getAssemblyDescriptor()
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getConcurrentLockTypeType()
> 	 * @generated
> 	 */
>-	EReference getAssemblyDescriptor_MessageDestinations();
>+	int CONCURRENT_LOCK_TYPE_TYPE = 43;
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getExcludeList Exclude List}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.MethodInterfaceType Method Interface Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Exclude List'.
>-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getExcludeList()
>-	 * @see #getAssemblyDescriptor()
>+	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodInterfaceType()
> 	 * @generated
> 	 */
>-	EReference getAssemblyDescriptor_ExcludeList();
>+	int METHOD_INTERFACE_TYPE = 44;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getApplicationExceptions Application Exceptions}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.MultiplicityType Multiplicity Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Application Exceptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getApplicationExceptions()
>-	 * @see #getAssemblyDescriptor()
>+	 * @see org.eclipse.jst.javaee.ejb.MultiplicityType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMultiplicityType()
> 	 * @generated
> 	 */
>-	EReference getAssemblyDescriptor_ApplicationExceptions();
>+	int MULTIPLICITY_TYPE = 45;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getId Id}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.PersistenceType Persistence Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getId()
>-	 * @see #getAssemblyDescriptor()
>+	 * @see org.eclipse.jst.javaee.ejb.PersistenceType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getPersistenceType()
> 	 * @generated
> 	 */
>-	EAttribute getAssemblyDescriptor_Id();
>+	int PERSISTENCE_TYPE = 46;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.CMPField CMP Field}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.ResultTypeMappingType Result Type Mapping Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'CMP Field'.
>-	 * @see org.eclipse.jst.javaee.ejb.CMPField
>+	 * @see org.eclipse.jst.javaee.ejb.ResultTypeMappingType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getResultTypeMappingType()
> 	 * @generated
> 	 */
>-	EClass getCMPField();
>+	int RESULT_TYPE_MAPPING_TYPE = 47;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.CMPField#getDescriptions Descriptions}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.SessionType Session Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.CMPField#getDescriptions()
>-	 * @see #getCMPField()
>+	 * @see org.eclipse.jst.javaee.ejb.SessionType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSessionType()
> 	 * @generated
> 	 */
>-	EReference getCMPField_Descriptions();
>+	int SESSION_TYPE = 48;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMPField#getFieldName Field Name}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.TimeUnitTypeType Time Unit Type Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Field Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.CMPField#getFieldName()
>-	 * @see #getCMPField()
>+	 * @see org.eclipse.jst.javaee.ejb.TimeUnitTypeType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTimeUnitTypeType()
> 	 * @generated
> 	 */
>-	EAttribute getCMPField_FieldName();
>+	int TIME_UNIT_TYPE_TYPE = 49;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMPField#getId Id}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.TransactionAttributeType Transaction Attribute Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.CMPField#getId()
>-	 * @see #getCMPField()
>+	 * @see org.eclipse.jst.javaee.ejb.TransactionAttributeType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionAttributeType()
> 	 * @generated
> 	 */
>-	EAttribute getCMPField_Id();
>+	int TRANSACTION_ATTRIBUTE_TYPE = 50;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.CMRField CMR Field}'.
>+	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.TransactionType Transaction Type}' enum.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'CMR Field'.
>-	 * @see org.eclipse.jst.javaee.ejb.CMRField
>+	 * @see org.eclipse.jst.javaee.ejb.TransactionType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionType()
> 	 * @generated
> 	 */
>-	EClass getCMRField();
>+	int TRANSACTION_TYPE = 51;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.CMRField#getDescriptions Descriptions}'.
>+	 * The meta object id for the 'Cmp Version Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.CMRField#getDescriptions()
>-	 * @see #getCMRField()
>+	 * @see org.eclipse.jst.javaee.ejb.CmpVersionType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCmpVersionTypeObject()
> 	 * @generated
> 	 */
>-	EReference getCMRField_Descriptions();
>+	int CMP_VERSION_TYPE_OBJECT = 52;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldName Cmr Field Name}'.
>+	 * The meta object id for the 'CMR Field Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Cmr Field Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldName()
>-	 * @see #getCMRField()
>+	 * @see org.eclipse.jst.javaee.ejb.CMRFieldType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getCMRFieldTypeObject()
> 	 * @generated
> 	 */
>-	EAttribute getCMRField_CmrFieldName();
>+	int CMR_FIELD_TYPE_OBJECT = 53;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldType Cmr Field Type}'.
>+	 * The meta object id for the 'Concurrency Management Type Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Cmr Field Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldType()
>-	 * @see #getCMRField()
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getConcurrencyManagementTypeTypeObject()
> 	 * @generated
> 	 */
>-	EAttribute getCMRField_CmrFieldType();
>+	int CONCURRENCY_MANAGEMENT_TYPE_TYPE_OBJECT = 54;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMRField#getId Id}'.
>+	 * The meta object id for the 'Concurrent Lock Type Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.CMRField#getId()
>-	 * @see #getCMRField()
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getConcurrentLockTypeTypeObject()
> 	 * @generated
> 	 */
>-	EAttribute getCMRField_Id();
>+	int CONCURRENT_LOCK_TYPE_TYPE_OBJECT = 55;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType Container Transaction Type}'.
>+	 * The meta object id for the 'Class Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Container Transaction Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEjbClassType()
> 	 * @generated
> 	 */
>-	EClass getContainerTransactionType();
>+	int EJB_CLASS_TYPE = 56;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getDescriptions Descriptions}'.
>+	 * The meta object id for the 'Name Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType#getDescriptions()
>-	 * @see #getContainerTransactionType()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getEjbNameType()
> 	 * @generated
> 	 */
>-	EReference getContainerTransactionType_Descriptions();
>+	int EJB_NAME_TYPE = 57;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getMethods Methods}'.
>+	 * The meta object id for the 'Method Interface Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Methods'.
>-	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType#getMethods()
>-	 * @see #getContainerTransactionType()
>+	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodInterfaceTypeObject()
> 	 * @generated
> 	 */
>-	EReference getContainerTransactionType_Methods();
>+	int METHOD_INTERFACE_TYPE_OBJECT = 58;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getTransAttribute Trans Attribute}'.
>+	 * The meta object id for the 'Method Name Type' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Trans Attribute'.
>-	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType#getTransAttribute()
>-	 * @see #getContainerTransactionType()
>+	 * @see java.lang.String
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMethodNameType()
> 	 * @generated
> 	 */
>-	EAttribute getContainerTransactionType_TransAttribute();
>+	int METHOD_NAME_TYPE = 59;
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getId Id}'.
>+	 * The meta object id for the 'Multiplicity Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType#getId()
>-	 * @see #getContainerTransactionType()
>+	 * @see org.eclipse.jst.javaee.ejb.MultiplicityType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getMultiplicityTypeObject()
> 	 * @generated
> 	 */
>-	EAttribute getContainerTransactionType_Id();
>+	int MULTIPLICITY_TYPE_OBJECT = 60;
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EJBJar EJB Jar}'.
>+	 * The meta object id for the 'Persistence Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'EJB Jar'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJar
>+	 * @see org.eclipse.jst.javaee.ejb.PersistenceType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getPersistenceTypeObject()
> 	 * @generated
> 	 */
>-	EClass getEJBJar();
>+	int PERSISTENCE_TYPE_OBJECT = 61;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBJar#getDescriptions Descriptions}'.
>+	 * The meta object id for the 'Result Type Mapping Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getDescriptions()
>-	 * @see #getEJBJar()
>+	 * @see org.eclipse.jst.javaee.ejb.ResultTypeMappingType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getResultTypeMappingTypeObject()
> 	 * @generated
> 	 */
>-	EReference getEJBJar_Descriptions();
>+	int RESULT_TYPE_MAPPING_TYPE_OBJECT = 62;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBJar#getDisplayNames Display Names}'.
>+	 * The meta object id for the 'Session Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Display Names'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getDisplayNames()
>-	 * @see #getEJBJar()
>+	 * @see org.eclipse.jst.javaee.ejb.SessionType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getSessionTypeObject()
> 	 * @generated
> 	 */
>-	EReference getEJBJar_DisplayNames();
>+	int SESSION_TYPE_OBJECT = 63;
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBJar#getIcons Icons}'.
>+	 * The meta object id for the 'Time Unit Type Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Icons'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getIcons()
>-	 * @see #getEJBJar()
>+	 * @see org.eclipse.jst.javaee.ejb.TimeUnitTypeType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTimeUnitTypeTypeObject()
> 	 * @generated
> 	 */
>-	EReference getEJBJar_Icons();
>+	int TIME_UNIT_TYPE_TYPE_OBJECT = 64;
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJar#getEnterpriseBeans Enterprise Beans}'.
>+	 * The meta object id for the 'Transaction Attribute Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Enterprise Beans'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getEnterpriseBeans()
>-	 * @see #getEJBJar()
>+	 * @see org.eclipse.jst.javaee.ejb.TransactionAttributeType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionAttributeTypeObject()
> 	 * @generated
> 	 */
>-	EReference getEJBJar_EnterpriseBeans();
>+	int TRANSACTION_ATTRIBUTE_TYPE_OBJECT = 65;
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJar#getInterceptors Interceptors}'.
>+	 * The meta object id for the 'Transaction Type Object' data type.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Interceptors'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getInterceptors()
>-	 * @see #getEJBJar()
>+	 * @see org.eclipse.jst.javaee.ejb.TransactionType
>+	 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTransactionTypeObject()
> 	 * @generated
> 	 */
>-	EReference getEJBJar_Interceptors();
>+	int TRANSACTION_TYPE_OBJECT = 66;
>+
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJar#getRelationships Relationships}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType Access Timeout Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Relationships'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getRelationships()
>-	 * @see #getEJBJar()
>+	 * @return the meta object for class 'Access Timeout Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.AccessTimeoutType
> 	 * @generated
> 	 */
>-	EReference getEJBJar_Relationships();
>+	EClass getAccessTimeoutType();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJar#getAssemblyDescriptor Assembly Descriptor}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType#getTimeout Timeout}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Assembly Descriptor'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getAssemblyDescriptor()
>-	 * @see #getEJBJar()
>+	 * @return the meta object for the attribute 'Timeout'.
>+	 * @see org.eclipse.jst.javaee.ejb.AccessTimeoutType#getTimeout()
>+	 * @see #getAccessTimeoutType()
> 	 * @generated
> 	 */
>-	EReference getEJBJar_AssemblyDescriptor();
>+	EAttribute getAccessTimeoutType_Timeout();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#getEjbClientJar Ejb Client Jar}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType#getUnit Unit}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Ejb Client Jar'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getEjbClientJar()
>-	 * @see #getEJBJar()
>+	 * @return the meta object for the attribute 'Unit'.
>+	 * @see org.eclipse.jst.javaee.ejb.AccessTimeoutType#getUnit()
>+	 * @see #getAccessTimeoutType()
> 	 * @generated
> 	 */
>-	EAttribute getEJBJar_EjbClientJar();
>+	EAttribute getAccessTimeoutType_Unit();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType#getId Id}'.
> 	 * 
> 	 * 
> 	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getId()
>-	 * @see #getEJBJar()
>+	 * @see org.eclipse.jst.javaee.ejb.AccessTimeoutType#getId()
>+	 * @see #getAccessTimeoutType()
> 	 * @generated
> 	 */
>-	EAttribute getEJBJar_Id();
>+	EAttribute getAccessTimeoutType_Id();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#isMetadataComplete Metadata Complete}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ActivationConfig Activation Config}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Metadata Complete'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#isMetadataComplete()
>-	 * @see #getEJBJar()
>+	 * @return the meta object for class 'Activation Config'.
>+	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig
> 	 * @generated
> 	 */
>-	EAttribute getEJBJar_MetadataComplete();
>+	EClass getActivationConfig();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#getVersion Version}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Version'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getVersion()
>-	 * @see #getEJBJar()
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig#getDescriptions()
>+	 * @see #getActivationConfig()
> 	 * @generated
> 	 */
>-	EAttribute getEJBJar_Version();
>+	EReference getActivationConfig_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor EJB Jar Deployment Descriptor}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getActivationConfigProperties Activation Config Properties}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'EJB Jar Deployment Descriptor'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor
>+	 * @return the meta object for the containment reference list 'Activation Config Properties'.
>+	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig#getActivationConfigProperties()
>+	 * @see #getActivationConfig()
> 	 * @generated
> 	 */
>-	EClass getEJBJarDeploymentDescriptor();
>+	EReference getActivationConfig_ActivationConfigProperties();
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getMixed Mixed}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ActivationConfig#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Mixed'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getMixed()
>-	 * @see #getEJBJarDeploymentDescriptor()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.ActivationConfig#getId()
>+	 * @see #getActivationConfig()
> 	 * @generated
> 	 */
>-	EAttribute getEJBJarDeploymentDescriptor_Mixed();
>+	EAttribute getActivationConfig_Id();
> 
> 	/**
>-	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXMLNSPrefixMap XMLNS Prefix Map}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty Activation Config Property}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the map 'XMLNS Prefix Map'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXMLNSPrefixMap()
>-	 * @see #getEJBJarDeploymentDescriptor()
>+	 * @return the meta object for class 'Activation Config Property'.
>+	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty
> 	 * @generated
> 	 */
>-	EReference getEJBJarDeploymentDescriptor_XMLNSPrefixMap();
>+	EClass getActivationConfigProperty();
> 
> 	/**
>-	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXSISchemaLocation XSI Schema Location}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyName Activation Config Property Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the map 'XSI Schema Location'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXSISchemaLocation()
>-	 * @see #getEJBJarDeploymentDescriptor()
>+	 * @return the meta object for the attribute 'Activation Config Property Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyName()
>+	 * @see #getActivationConfigProperty()
> 	 * @generated
> 	 */
>-	EReference getEJBJarDeploymentDescriptor_XSISchemaLocation();
>+	EAttribute getActivationConfigProperty_ActivationConfigPropertyName();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getEjbJar Ejb Jar}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyValue Activation Config Property Value}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Ejb Jar'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getEjbJar()
>-	 * @see #getEJBJarDeploymentDescriptor()
>+	 * @return the meta object for the attribute 'Activation Config Property Value'.
>+	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getActivationConfigPropertyValue()
>+	 * @see #getActivationConfigProperty()
> 	 * @generated
> 	 */
>-	EReference getEJBJarDeploymentDescriptor_EjbJar();
>+	EAttribute getActivationConfigProperty_ActivationConfigPropertyValue();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EJBRelation EJB Relation}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'EJB Relation'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelation
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.ActivationConfigProperty#getId()
>+	 * @see #getActivationConfigProperty()
> 	 * @generated
> 	 */
>-	EClass getEJBRelation();
>+	EAttribute getActivationConfigProperty_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getDescriptions Descriptions}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ApplicationException Application Exception}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelation#getDescriptions()
>-	 * @see #getEJBRelation()
>+	 * @return the meta object for class 'Application Exception'.
>+	 * @see org.eclipse.jst.javaee.ejb.ApplicationException
> 	 * @generated
> 	 */
>-	EReference getEJBRelation_Descriptions();
>+	EClass getApplicationException();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationName Ejb Relation Name}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ApplicationException#getExceptionClass Exception Class}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Ejb Relation Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationName()
>-	 * @see #getEJBRelation()
>+	 * @return the meta object for the attribute 'Exception Class'.
>+	 * @see org.eclipse.jst.javaee.ejb.ApplicationException#getExceptionClass()
>+	 * @see #getApplicationException()
> 	 * @generated
> 	 */
>-	EAttribute getEJBRelation_EjbRelationName();
>+	EAttribute getApplicationException_ExceptionClass();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationshipRoles Ejb Relationship Roles}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ApplicationException#isRollback Rollback}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Ejb Relationship Roles'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationshipRoles()
>-	 * @see #getEJBRelation()
>+	 * @return the meta object for the attribute 'Rollback'.
>+	 * @see org.eclipse.jst.javaee.ejb.ApplicationException#isRollback()
>+	 * @see #getApplicationException()
> 	 * @generated
> 	 */
>-	EReference getEJBRelation_EjbRelationshipRoles();
>+	EAttribute getApplicationException_Rollback();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ApplicationException#isInherited Inherited}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelation#getId()
>-	 * @see #getEJBRelation()
>+	 * @return the meta object for the attribute 'Inherited'.
>+	 * @see org.eclipse.jst.javaee.ejb.ApplicationException#isInherited()
>+	 * @see #getApplicationException()
> 	 * @generated
> 	 */
>-	EAttribute getEJBRelation_Id();
>+	EAttribute getApplicationException_Inherited();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole EJB Relationship Role}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ApplicationException#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'EJB Relationship Role'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.ApplicationException#getId()
>+	 * @see #getApplicationException()
> 	 * @generated
> 	 */
>-	EClass getEJBRelationshipRole();
>+	EAttribute getApplicationException_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getDescriptions Descriptions}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.AroundInvokeType Around Invoke Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getDescriptions()
>-	 * @see #getEJBRelationshipRole()
>+	 * @return the meta object for class 'Around Invoke Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.AroundInvokeType
> 	 * @generated
> 	 */
>-	EReference getEJBRelationshipRole_Descriptions();
>+	EClass getAroundInvokeType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getEjbRelationshipRoleName Ejb Relationship Role Name}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AroundInvokeType#getClass_ Class}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Ejb Relationship Role Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getEjbRelationshipRoleName()
>-	 * @see #getEJBRelationshipRole()
>+	 * @return the meta object for the attribute 'Class'.
>+	 * @see org.eclipse.jst.javaee.ejb.AroundInvokeType#getClass_()
>+	 * @see #getAroundInvokeType()
> 	 * @generated
> 	 */
>-	EAttribute getEJBRelationshipRole_EjbRelationshipRoleName();
>+	EAttribute getAroundInvokeType_Class();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getMultiplicity Multiplicity}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AroundInvokeType#getMethodName Method Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Multiplicity'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getMultiplicity()
>-	 * @see #getEJBRelationshipRole()
>+	 * @return the meta object for the attribute 'Method Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.AroundInvokeType#getMethodName()
>+	 * @see #getAroundInvokeType()
> 	 * @generated
> 	 */
>-	EAttribute getEJBRelationshipRole_Multiplicity();
>+	EAttribute getAroundInvokeType_MethodName();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCascadeDelete Cascade Delete}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.AroundTimeoutType Around Timeout Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Cascade Delete'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCascadeDelete()
>-	 * @see #getEJBRelationshipRole()
>+	 * @return the meta object for class 'Around Timeout Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.AroundTimeoutType
> 	 * @generated
> 	 */
>-	EReference getEJBRelationshipRole_CascadeDelete();
>+	EClass getAroundTimeoutType();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getRelationshipRoleSource Relationship Role Source}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AroundTimeoutType#getClass_ Class}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Relationship Role Source'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getRelationshipRoleSource()
>-	 * @see #getEJBRelationshipRole()
>+	 * @return the meta object for the attribute 'Class'.
>+	 * @see org.eclipse.jst.javaee.ejb.AroundTimeoutType#getClass_()
>+	 * @see #getAroundTimeoutType()
> 	 * @generated
> 	 */
>-	EReference getEJBRelationshipRole_RelationshipRoleSource();
>+	EAttribute getAroundTimeoutType_Class();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCmrField Cmr Field}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AroundTimeoutType#getMethodName Method Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Cmr Field'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCmrField()
>-	 * @see #getEJBRelationshipRole()
>+	 * @return the meta object for the attribute 'Method Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.AroundTimeoutType#getMethodName()
>+	 * @see #getAroundTimeoutType()
> 	 * @generated
> 	 */
>-	EReference getEJBRelationshipRole_CmrField();
>+	EAttribute getAroundTimeoutType_MethodName();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getId Id}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor Assembly Descriptor}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getId()
>-	 * @see #getEJBRelationshipRole()
>+	 * @return the meta object for class 'Assembly Descriptor'.
>+	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor
> 	 * @generated
> 	 */
>-	EAttribute getEJBRelationshipRole_Id();
>+	EClass getAssemblyDescriptor();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans Enterprise Beans}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getSecurityRoles Security Roles}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Enterprise Beans'.
>-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans
>+	 * @return the meta object for the containment reference list 'Security Roles'.
>+	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getSecurityRoles()
>+	 * @see #getAssemblyDescriptor()
> 	 * @generated
> 	 */
>-	EClass getEnterpriseBeans();
>+	EReference getAssemblyDescriptor_SecurityRoles();
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getGroup Group}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMethodPermissions Method Permissions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Group'.
>-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getGroup()
>-	 * @see #getEnterpriseBeans()
>+	 * @return the meta object for the containment reference list 'Method Permissions'.
>+	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMethodPermissions()
>+	 * @see #getAssemblyDescriptor()
> 	 * @generated
> 	 */
>-	EAttribute getEnterpriseBeans_Group();
>+	EReference getAssemblyDescriptor_MethodPermissions();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getSessionBeans Session Beans}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getContainerTransactions Container Transactions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Session Beans'.
>-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getSessionBeans()
>-	 * @see #getEnterpriseBeans()
>+	 * @return the meta object for the containment reference list 'Container Transactions'.
>+	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getContainerTransactions()
>+	 * @see #getAssemblyDescriptor()
> 	 * @generated
> 	 */
>-	EReference getEnterpriseBeans_SessionBeans();
>+	EReference getAssemblyDescriptor_ContainerTransactions();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getEntityBeans Entity Beans}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getInterceptorBindings Interceptor Bindings}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Entity Beans'.
>-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getEntityBeans()
>-	 * @see #getEnterpriseBeans()
>+	 * @return the meta object for the containment reference list 'Interceptor Bindings'.
>+	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getInterceptorBindings()
>+	 * @see #getAssemblyDescriptor()
> 	 * @generated
> 	 */
>-	EReference getEnterpriseBeans_EntityBeans();
>+	EReference getAssemblyDescriptor_InterceptorBindings();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getMessageDrivenBeans Message Driven Beans}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMessageDestinations Message Destinations}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Message Driven Beans'.
>-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getMessageDrivenBeans()
>-	 * @see #getEnterpriseBeans()
>+	 * @return the meta object for the containment reference list 'Message Destinations'.
>+	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getMessageDestinations()
>+	 * @see #getAssemblyDescriptor()
> 	 * @generated
> 	 */
>-	EReference getEnterpriseBeans_MessageDrivenBeans();
>+	EReference getAssemblyDescriptor_MessageDestinations();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getId Id}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getExcludeList Exclude List}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getId()
>-	 * @see #getEnterpriseBeans()
>+	 * @return the meta object for the containment reference 'Exclude List'.
>+	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getExcludeList()
>+	 * @see #getAssemblyDescriptor()
> 	 * @generated
> 	 */
>-	EAttribute getEnterpriseBeans_Id();
>+	EReference getAssemblyDescriptor_ExcludeList();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EntityBean Entity Bean}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getApplicationExceptions Application Exceptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Entity Bean'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean
>+	 * @return the meta object for the containment reference list 'Application Exceptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getApplicationExceptions()
>+	 * @see #getAssemblyDescriptor()
> 	 * @generated
> 	 */
>-	EClass getEntityBean();
>+	EReference getAssemblyDescriptor_ApplicationExceptions();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getDescriptions Descriptions}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getDescriptions()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.AssemblyDescriptor#getId()
>+	 * @see #getAssemblyDescriptor()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_Descriptions();
>+	EAttribute getAssemblyDescriptor_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getDisplayNames Display Names}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType Async Method Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Display Names'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getDisplayNames()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for class 'Async Method Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.AsyncMethodType
> 	 * @generated
> 	 */
>-	EReference getEntityBean_DisplayNames();
>+	EClass getAsyncMethodType();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getIcons Icons}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodName Method Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Icons'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getIcons()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Method Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodName()
>+	 * @see #getAsyncMethodType()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_Icons();
>+	EAttribute getAsyncMethodType_MethodName();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbName Ejb Name}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodParams Method Params}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Ejb Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEjbName()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the containment reference 'Method Params'.
>+	 * @see org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodParams()
>+	 * @see #getAsyncMethodType()
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_EjbName();
>+	EReference getAsyncMethodType_MethodParams();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getMappedName Mapped Name}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf Method Intf}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Mapped Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getMappedName()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Method Intf'.
>+	 * @see org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf()
>+	 * @see #getAsyncMethodType()
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_MappedName();
>+	EAttribute getAsyncMethodType_MethodIntf();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getHome Home}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Home'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getHome()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.AsyncMethodType#getId()
>+	 * @see #getAsyncMethodType()
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_Home();
>+	EAttribute getAsyncMethodType_Id();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getRemote Remote}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.CMPField CMP Field}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Remote'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getRemote()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for class 'CMP Field'.
>+	 * @see org.eclipse.jst.javaee.ejb.CMPField
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_Remote();
>+	EClass getCMPField();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getLocalHome Local Home}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.CMPField#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Local Home'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getLocalHome()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.CMPField#getDescriptions()
>+	 * @see #getCMPField()
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_LocalHome();
>+	EReference getCMPField_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getLocal Local}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMPField#getFieldName Field Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Local'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getLocal()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Field Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.CMPField#getFieldName()
>+	 * @see #getCMPField()
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_Local();
>+	EAttribute getCMPField_FieldName();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbClass Ejb Class}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMPField#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Ejb Class'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEjbClass()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.CMPField#getId()
>+	 * @see #getCMPField()
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_EjbClass();
>+	EAttribute getCMPField_Id();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceType Persistence Type}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.CMRField CMR Field}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Persistence Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceType()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for class 'CMR Field'.
>+	 * @see org.eclipse.jst.javaee.ejb.CMRField
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_PersistenceType();
>+	EClass getCMRField();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPrimKeyClass Prim Key Class}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.CMRField#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Prim Key Class'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPrimKeyClass()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.CMRField#getDescriptions()
>+	 * @see #getCMRField()
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_PrimKeyClass();
>+	EReference getCMRField_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#isReentrant Reentrant}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldName Cmr Field Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Reentrant'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#isReentrant()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Cmr Field Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldName()
>+	 * @see #getCMRField()
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_Reentrant();
>+	EAttribute getCMRField_CmrFieldName();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getCmpVersion Cmp Version}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldType Cmr Field Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Cmp Version'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getCmpVersion()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Cmr Field Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.CMRField#getCmrFieldType()
>+	 * @see #getCMRField()
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_CmpVersion();
>+	EAttribute getCMRField_CmrFieldType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getAbstractSchemaName Abstract Schema Name}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.CMRField#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Abstract Schema Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getAbstractSchemaName()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.CMRField#getId()
>+	 * @see #getCMRField()
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_AbstractSchemaName();
>+	EAttribute getCMRField_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getCmpFields Cmp Fields}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType Concurrent Method Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Cmp Fields'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getCmpFields()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for class 'Concurrent Method Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrentMethodType
> 	 * @generated
> 	 */
>-	EReference getEntityBean_CmpFields();
>+	EClass getConcurrentMethodType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPrimkeyField Primkey Field}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getMethod Method}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Primkey Field'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPrimkeyField()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the containment reference 'Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getMethod()
>+	 * @see #getConcurrentMethodType()
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_PrimkeyField();
>+	EReference getConcurrentMethodType_Method();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEnvEntries Env Entries}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getLock Lock}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Env Entries'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEnvEntries()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Lock'.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getLock()
>+	 * @see #getConcurrentMethodType()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_EnvEntries();
>+	EAttribute getConcurrentMethodType_Lock();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbRefs Ejb Refs}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getAccessTimeout Access Timeout}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Ejb Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEjbRefs()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the containment reference 'Access Timeout'.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getAccessTimeout()
>+	 * @see #getConcurrentMethodType()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_EjbRefs();
>+	EReference getConcurrentMethodType_AccessTimeout();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbLocalRefs Ejb Local Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Ejb Local Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEjbLocalRefs()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getId()
>+	 * @see #getConcurrentMethodType()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_EjbLocalRefs();
>+	EAttribute getConcurrentMethodType_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getServiceRefs Service Refs}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType Container Transaction Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Service Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getServiceRefs()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for class 'Container Transaction Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType
> 	 * @generated
> 	 */
>-	EReference getEntityBean_ServiceRefs();
>+	EClass getContainerTransactionType();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getResourceRefs Resource Refs}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Resource Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getResourceRefs()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType#getDescriptions()
>+	 * @see #getContainerTransactionType()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_ResourceRefs();
>+	EReference getContainerTransactionType_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getResourceEnvRefs Resource Env Refs}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getMethods Methods}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Resource Env Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getResourceEnvRefs()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the containment reference list 'Methods'.
>+	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType#getMethods()
>+	 * @see #getContainerTransactionType()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_ResourceEnvRefs();
>+	EReference getContainerTransactionType_Methods();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getMessageDestinationRefs Message Destination Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getTransAttribute Trans Attribute}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Message Destination Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getMessageDestinationRefs()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Trans Attribute'.
>+	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType#getTransAttribute()
>+	 * @see #getContainerTransactionType()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_MessageDestinationRefs();
>+	EAttribute getContainerTransactionType_TransAttribute();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceContextRefs Persistence Context Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Persistence Context Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceContextRefs()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.ContainerTransactionType#getId()
>+	 * @see #getContainerTransactionType()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_PersistenceContextRefs();
>+	EAttribute getContainerTransactionType_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceUnitRefs Persistence Unit Refs}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.DependsOnType Depends On Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Persistence Unit Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceUnitRefs()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for class 'Depends On Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.DependsOnType
> 	 * @generated
> 	 */
>-	EReference getEntityBean_PersistenceUnitRefs();
>+	EClass getDependsOnType();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPostConstructs Post Constructs}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.DependsOnType#getEjbName Ejb Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Post Constructs'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPostConstructs()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute list 'Ejb Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.DependsOnType#getEjbName()
>+	 * @see #getDependsOnType()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_PostConstructs();
>+	EAttribute getDependsOnType_EjbName();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPreDestroys Pre Destroys}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.DependsOnType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Pre Destroys'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPreDestroys()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.DependsOnType#getId()
>+	 * @see #getDependsOnType()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_PreDestroys();
>+	EAttribute getDependsOnType_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getSecurityRoleRefs Security Role Refs}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EJBJar EJB Jar}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Security Role Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getSecurityRoleRefs()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for class 'EJB Jar'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar
> 	 * @generated
> 	 */
>-	EReference getEntityBean_SecurityRoleRefs();
>+	EClass getEJBJar();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EntityBean#getSecurityIdentity Security Identity}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBJar#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Security Identity'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getSecurityIdentity()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getDescriptions()
>+	 * @see #getEJBJar()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_SecurityIdentity();
>+	EReference getEJBJar_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getQueries Queries}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBJar#getDisplayNames Display Names}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Queries'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getQueries()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the containment reference list 'Display Names'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getDisplayNames()
>+	 * @see #getEJBJar()
> 	 * @generated
> 	 */
>-	EReference getEntityBean_Queries();
>+	EReference getEJBJar_DisplayNames();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getId Id}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBJar#getIcons Icons}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getId()
>-	 * @see #getEntityBean()
>+	 * @return the meta object for the containment reference list 'Icons'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getIcons()
>+	 * @see #getEJBJar()
> 	 * @generated
> 	 */
>-	EAttribute getEntityBean_Id();
>+	EReference getEJBJar_Icons();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ExcludeList Exclude List}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#getModuleName Module Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Exclude List'.
>-	 * @see org.eclipse.jst.javaee.ejb.ExcludeList
>+	 * @return the meta object for the attribute 'Module Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getModuleName()
>+	 * @see #getEJBJar()
> 	 * @generated
> 	 */
>-	EClass getExcludeList();
>+	EAttribute getEJBJar_ModuleName();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ExcludeList#getDescriptions Descriptions}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJar#getEnterpriseBeans Enterprise Beans}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.ExcludeList#getDescriptions()
>-	 * @see #getExcludeList()
>+	 * @return the meta object for the containment reference 'Enterprise Beans'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getEnterpriseBeans()
>+	 * @see #getEJBJar()
> 	 * @generated
> 	 */
>-	EReference getExcludeList_Descriptions();
>+	EReference getEJBJar_EnterpriseBeans();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ExcludeList#getMethods Methods}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJar#getInterceptors Interceptors}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Methods'.
>-	 * @see org.eclipse.jst.javaee.ejb.ExcludeList#getMethods()
>-	 * @see #getExcludeList()
>+	 * @return the meta object for the containment reference 'Interceptors'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getInterceptors()
>+	 * @see #getEJBJar()
> 	 * @generated
> 	 */
>-	EReference getExcludeList_Methods();
>+	EReference getEJBJar_Interceptors();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ExcludeList#getId Id}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.ExcludeList#getId()
>-	 * @see #getExcludeList()
>-	 * @generated
>-	 */
>-	EAttribute getExcludeList_Id();
>-
>-	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InitMethodType Init Method Type}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJar#getRelationships Relationships}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Init Method Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.InitMethodType
>+	 * @return the meta object for the containment reference 'Relationships'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getRelationships()
>+	 * @see #getEJBJar()
> 	 * @generated
> 	 */
>-	EClass getInitMethodType();
>+	EReference getEJBJar_Relationships();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.InitMethodType#getCreateMethod Create Method}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJar#getAssemblyDescriptor Assembly Descriptor}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Create Method'.
>-	 * @see org.eclipse.jst.javaee.ejb.InitMethodType#getCreateMethod()
>-	 * @see #getInitMethodType()
>+	 * @return the meta object for the containment reference 'Assembly Descriptor'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getAssemblyDescriptor()
>+	 * @see #getEJBJar()
> 	 * @generated
> 	 */
>-	EReference getInitMethodType_CreateMethod();
>+	EReference getEJBJar_AssemblyDescriptor();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.InitMethodType#getBeanMethod Bean Method}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#getEjbClientJar Ejb Client Jar}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Bean Method'.
>-	 * @see org.eclipse.jst.javaee.ejb.InitMethodType#getBeanMethod()
>-	 * @see #getInitMethodType()
>+	 * @return the meta object for the attribute 'Ejb Client Jar'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getEjbClientJar()
>+	 * @see #getEJBJar()
> 	 * @generated
> 	 */
>-	EReference getInitMethodType_BeanMethod();
>+	EAttribute getEJBJar_EjbClientJar();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InitMethodType#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#getId Id}'.
> 	 * 
> 	 * 
> 	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.InitMethodType#getId()
>-	 * @see #getInitMethodType()
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getId()
>+	 * @see #getEJBJar()
> 	 * @generated
> 	 */
>-	EAttribute getInitMethodType_Id();
>+	EAttribute getEJBJar_Id();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType Interceptor Binding Type}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#isMetadataComplete Metadata Complete}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Interceptor Binding Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType
>+	 * @return the meta object for the attribute 'Metadata Complete'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar#isMetadataComplete()
>+	 * @see #getEJBJar()
> 	 * @generated
> 	 */
>-	EClass getInterceptorBindingType();
>+	EAttribute getEJBJar_MetadataComplete();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getDescriptions Descriptions}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBJar#getVersion Version}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getDescriptions()
>-	 * @see #getInterceptorBindingType()
>+	 * @return the meta object for the attribute 'Version'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJar#getVersion()
>+	 * @see #getEJBJar()
> 	 * @generated
> 	 */
>-	EReference getInterceptorBindingType_Descriptions();
>+	EAttribute getEJBJar_Version();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getEjbName Ejb Name}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor EJB Jar Deployment Descriptor}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Ejb Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getEjbName()
>-	 * @see #getInterceptorBindingType()
>+	 * @return the meta object for class 'EJB Jar Deployment Descriptor'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor
> 	 * @generated
> 	 */
>-	EAttribute getInterceptorBindingType_EjbName();
>+	EClass getEJBJarDeploymentDescriptor();
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorClasses Interceptor Classes}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getMixed Mixed}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Interceptor Classes'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorClasses()
>-	 * @see #getInterceptorBindingType()
>+	 * @return the meta object for the attribute list 'Mixed'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getMixed()
>+	 * @see #getEJBJarDeploymentDescriptor()
> 	 * @generated
> 	 */
>-	EAttribute getInterceptorBindingType_InterceptorClasses();
>+	EAttribute getEJBJarDeploymentDescriptor_Mixed();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorOrder Interceptor Order}'.
>+	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXMLNSPrefixMap XMLNS Prefix Map}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Interceptor Order'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorOrder()
>-	 * @see #getInterceptorBindingType()
>+	 * @return the meta object for the map 'XMLNS Prefix Map'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXMLNSPrefixMap()
>+	 * @see #getEJBJarDeploymentDescriptor()
> 	 * @generated
> 	 */
>-	EReference getInterceptorBindingType_InterceptorOrder();
>+	EReference getEJBJarDeploymentDescriptor_XMLNSPrefixMap();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeDefaultInterceptors Exclude Default Interceptors}'.
>+	 * Returns the meta object for the map '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXSISchemaLocation XSI Schema Location}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Exclude Default Interceptors'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeDefaultInterceptors()
>-	 * @see #getInterceptorBindingType()
>+	 * @return the meta object for the map 'XSI Schema Location'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getXSISchemaLocation()
>+	 * @see #getEJBJarDeploymentDescriptor()
> 	 * @generated
> 	 */
>-	EAttribute getInterceptorBindingType_ExcludeDefaultInterceptors();
>+	EReference getEJBJarDeploymentDescriptor_XSISchemaLocation();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeClassInterceptors Exclude Class Interceptors}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getEjbJar Ejb Jar}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Exclude Class Interceptors'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeClassInterceptors()
>-	 * @see #getInterceptorBindingType()
>+	 * @return the meta object for the containment reference 'Ejb Jar'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBJarDeploymentDescriptor#getEjbJar()
>+	 * @see #getEJBJarDeploymentDescriptor()
> 	 * @generated
> 	 */
>-	EAttribute getInterceptorBindingType_ExcludeClassInterceptors();
>+	EReference getEJBJarDeploymentDescriptor_EjbJar();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getMethod Method}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EJBRelation EJB Relation}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Method'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getMethod()
>-	 * @see #getInterceptorBindingType()
>+	 * @return the meta object for class 'EJB Relation'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelation
> 	 * @generated
> 	 */
>-	EReference getInterceptorBindingType_Method();
>+	EClass getEJBRelation();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getId Id}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getId()
>-	 * @see #getInterceptorBindingType()
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelation#getDescriptions()
>+	 * @see #getEJBRelation()
> 	 * @generated
> 	 */
>-	EAttribute getInterceptorBindingType_Id();
>+	EReference getEJBRelation_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType Interceptor Order Type}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationName Ejb Relation Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Interceptor Order Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorOrderType
>+	 * @return the meta object for the attribute 'Ejb Relation Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationName()
>+	 * @see #getEJBRelation()
> 	 * @generated
> 	 */
>-	EClass getInterceptorOrderType();
>+	EAttribute getEJBRelation_EjbRelationName();
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType#getInterceptorClasses Interceptor Classes}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationshipRoles Ejb Relationship Roles}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Interceptor Classes'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorOrderType#getInterceptorClasses()
>-	 * @see #getInterceptorOrderType()
>+	 * @return the meta object for the containment reference list 'Ejb Relationship Roles'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelation#getEjbRelationshipRoles()
>+	 * @see #getEJBRelation()
> 	 * @generated
> 	 */
>-	EAttribute getInterceptorOrderType_InterceptorClasses();
>+	EReference getEJBRelation_EjbRelationshipRoles();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelation#getId Id}'.
> 	 * 
> 	 * 
> 	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorOrderType#getId()
>-	 * @see #getInterceptorOrderType()
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelation#getId()
>+	 * @see #getEJBRelation()
> 	 * @generated
> 	 */
>-	EAttribute getInterceptorOrderType_Id();
>+	EAttribute getEJBRelation_Id();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InterceptorsType Interceptors Type}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole EJB Relationship Role}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Interceptors Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType
>+	 * @return the meta object for class 'EJB Relationship Role'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole
> 	 * @generated
> 	 */
>-	EClass getInterceptorsType();
>+	EClass getEJBRelationshipRole();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getDescriptions Descriptions}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
> 	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType#getDescriptions()
>-	 * @see #getInterceptorsType()
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getDescriptions()
>+	 * @see #getEJBRelationshipRole()
> 	 * @generated
> 	 */
>-	EReference getInterceptorsType_Descriptions();
>+	EReference getEJBRelationshipRole_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getInterceptors Interceptors}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getEjbRelationshipRoleName Ejb Relationship Role Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Interceptors'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType#getInterceptors()
>-	 * @see #getInterceptorsType()
>+	 * @return the meta object for the attribute 'Ejb Relationship Role Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getEjbRelationshipRoleName()
>+	 * @see #getEJBRelationshipRole()
> 	 * @generated
> 	 */
>-	EReference getInterceptorsType_Interceptors();
>+	EAttribute getEJBRelationshipRole_EjbRelationshipRoleName();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getMultiplicity Multiplicity}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType#getId()
>-	 * @see #getInterceptorsType()
>+	 * @return the meta object for the attribute 'Multiplicity'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getMultiplicity()
>+	 * @see #getEJBRelationshipRole()
> 	 * @generated
> 	 */
>-	EAttribute getInterceptorsType_Id();
>+	EAttribute getEJBRelationshipRole_Multiplicity();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InterceptorType Interceptor Type}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCascadeDelete Cascade Delete}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Interceptor Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType
>+	 * @return the meta object for the containment reference 'Cascade Delete'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCascadeDelete()
>+	 * @see #getEJBRelationshipRole()
> 	 * @generated
> 	 */
>-	EClass getInterceptorType();
>+	EReference getEJBRelationshipRole_CascadeDelete();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getDescriptions Descriptions}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getRelationshipRoleSource Relationship Role Source}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getDescriptions()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the containment reference 'Relationship Role Source'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getRelationshipRoleSource()
>+	 * @see #getEJBRelationshipRole()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_Descriptions();
>+	EReference getEJBRelationshipRole_RelationshipRoleSource();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getInterceptorClass Interceptor Class}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCmrField Cmr Field}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Interceptor Class'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getInterceptorClass()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the containment reference 'Cmr Field'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getCmrField()
>+	 * @see #getEJBRelationshipRole()
> 	 * @generated
> 	 */
>-	EAttribute getInterceptorType_InterceptorClass();
>+	EReference getEJBRelationshipRole_CmrField();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundInvokes Around Invokes}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Around Invokes'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getAroundInvokes()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.EJBRelationshipRole#getId()
>+	 * @see #getEJBRelationshipRole()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_AroundInvokes();
>+	EAttribute getEJBRelationshipRole_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries Env Entries}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans Enterprise Beans}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Env Entries'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for class 'Enterprise Beans'.
>+	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_EnvEntries();
>+	EClass getEnterpriseBeans();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbRefs Ejb Refs}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getGroup Group}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Ejb Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getEjbRefs()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the attribute list 'Group'.
>+	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getGroup()
>+	 * @see #getEnterpriseBeans()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_EjbRefs();
>+	EAttribute getEnterpriseBeans_Group();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getSessionBeans Session Beans}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Session Beans'.
>+	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getSessionBeans()
>+	 * @see #getEnterpriseBeans()
>+	 * @generated
>+	 */
>+	EReference getEnterpriseBeans_SessionBeans();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getEntityBeans Entity Beans}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Entity Beans'.
>+	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getEntityBeans()
>+	 * @see #getEnterpriseBeans()
>+	 * @generated
>+	 */
>+	EReference getEnterpriseBeans_EntityBeans();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getMessageDrivenBeans Message Driven Beans}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Message Driven Beans'.
>+	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getMessageDrivenBeans()
>+	 * @see #getEnterpriseBeans()
>+	 * @generated
>+	 */
>+	EReference getEnterpriseBeans_MessageDrivenBeans();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EnterpriseBeans#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.EnterpriseBeans#getId()
>+	 * @see #getEnterpriseBeans()
>+	 * @generated
>+	 */
>+	EAttribute getEnterpriseBeans_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.EntityBean Entity Bean}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Entity Bean'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean
>+	 * @generated
>+	 */
>+	EClass getEntityBean();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getDescriptions Descriptions}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getDescriptions()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getDisplayNames Display Names}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Display Names'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getDisplayNames()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_DisplayNames();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getIcons Icons}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Icons'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getIcons()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_Icons();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbName Ejb Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Ejb Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEjbName()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_EjbName();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getMappedName Mapped Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Mapped Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getMappedName()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_MappedName();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getHome Home}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Home'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getHome()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_Home();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getRemote Remote}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Remote'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getRemote()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_Remote();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getLocalHome Local Home}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Local Home'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getLocalHome()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_LocalHome();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getLocal Local}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Local'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getLocal()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_Local();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbClass Ejb Class}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Ejb Class'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEjbClass()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_EjbClass();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceType Persistence Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Persistence Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceType()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_PersistenceType();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPrimKeyClass Prim Key Class}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Prim Key Class'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPrimKeyClass()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_PrimKeyClass();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#isReentrant Reentrant}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Reentrant'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#isReentrant()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_Reentrant();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getCmpVersion Cmp Version}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Cmp Version'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getCmpVersion()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_CmpVersion();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getAbstractSchemaName Abstract Schema Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Abstract Schema Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getAbstractSchemaName()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_AbstractSchemaName();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getCmpFields Cmp Fields}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Cmp Fields'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getCmpFields()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_CmpFields();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPrimkeyField Primkey Field}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Primkey Field'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPrimkeyField()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_PrimkeyField();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEnvEntries Env Entries}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Env Entries'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEnvEntries()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_EnvEntries();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbRefs Ejb Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Ejb Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEjbRefs()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_EjbRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getEjbLocalRefs Ejb Local Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Ejb Local Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getEjbLocalRefs()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_EjbLocalRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getServiceRefs Service Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Service Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getServiceRefs()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_ServiceRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getResourceRefs Resource Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Resource Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getResourceRefs()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_ResourceRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getResourceEnvRefs Resource Env Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Resource Env Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getResourceEnvRefs()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_ResourceEnvRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getMessageDestinationRefs Message Destination Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Message Destination Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getMessageDestinationRefs()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_MessageDestinationRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceContextRefs Persistence Context Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Persistence Context Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceContextRefs()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_PersistenceContextRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceUnitRefs Persistence Unit Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Persistence Unit Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPersistenceUnitRefs()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_PersistenceUnitRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPostConstructs Post Constructs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Post Constructs'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPostConstructs()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_PostConstructs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getPreDestroys Pre Destroys}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Pre Destroys'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getPreDestroys()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_PreDestroys();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getDataSource Data Source}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Data Source'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getDataSource()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_DataSource();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getSecurityRoleRefs Security Role Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Security Role Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getSecurityRoleRefs()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_SecurityRoleRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.EntityBean#getSecurityIdentity Security Identity}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Security Identity'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getSecurityIdentity()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_SecurityIdentity();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.EntityBean#getQueries Queries}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Queries'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getQueries()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EReference getEntityBean_Queries();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.EntityBean#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.EntityBean#getId()
>+	 * @see #getEntityBean()
>+	 * @generated
>+	 */
>+	EAttribute getEntityBean_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.ExcludeList Exclude List}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Exclude List'.
>+	 * @see org.eclipse.jst.javaee.ejb.ExcludeList
>+	 * @generated
>+	 */
>+	EClass getExcludeList();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ExcludeList#getDescriptions Descriptions}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.ExcludeList#getDescriptions()
>+	 * @see #getExcludeList()
>+	 * @generated
>+	 */
>+	EReference getExcludeList_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.ExcludeList#getMethods Methods}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Methods'.
>+	 * @see org.eclipse.jst.javaee.ejb.ExcludeList#getMethods()
>+	 * @see #getExcludeList()
>+	 * @generated
>+	 */
>+	EReference getExcludeList_Methods();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.ExcludeList#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.ExcludeList#getId()
>+	 * @see #getExcludeList()
>+	 * @generated
>+	 */
>+	EAttribute getExcludeList_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InitMethodType Init Method Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Init Method Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.InitMethodType
>+	 * @generated
>+	 */
>+	EClass getInitMethodType();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.InitMethodType#getCreateMethod Create Method}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Create Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.InitMethodType#getCreateMethod()
>+	 * @see #getInitMethodType()
>+	 * @generated
>+	 */
>+	EReference getInitMethodType_CreateMethod();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.InitMethodType#getBeanMethod Bean Method}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Bean Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.InitMethodType#getBeanMethod()
>+	 * @see #getInitMethodType()
>+	 * @generated
>+	 */
>+	EReference getInitMethodType_BeanMethod();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InitMethodType#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.InitMethodType#getId()
>+	 * @see #getInitMethodType()
>+	 * @generated
>+	 */
>+	EAttribute getInitMethodType_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType Interceptor Binding Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Interceptor Binding Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType
>+	 * @generated
>+	 */
>+	EClass getInterceptorBindingType();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getDescriptions Descriptions}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getDescriptions()
>+	 * @see #getInterceptorBindingType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorBindingType_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getEjbName Ejb Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Ejb Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getEjbName()
>+	 * @see #getInterceptorBindingType()
>+	 * @generated
>+	 */
>+	EAttribute getInterceptorBindingType_EjbName();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorClasses Interceptor Classes}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Interceptor Classes'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorClasses()
>+	 * @see #getInterceptorBindingType()
>+	 * @generated
>+	 */
>+	EAttribute getInterceptorBindingType_InterceptorClasses();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorOrder Interceptor Order}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Interceptor Order'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getInterceptorOrder()
>+	 * @see #getInterceptorBindingType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorBindingType_InterceptorOrder();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeDefaultInterceptors Exclude Default Interceptors}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Exclude Default Interceptors'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeDefaultInterceptors()
>+	 * @see #getInterceptorBindingType()
>+	 * @generated
>+	 */
>+	EAttribute getInterceptorBindingType_ExcludeDefaultInterceptors();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeClassInterceptors Exclude Class Interceptors}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Exclude Class Interceptors'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#isExcludeClassInterceptors()
>+	 * @see #getInterceptorBindingType()
>+	 * @generated
>+	 */
>+	EAttribute getInterceptorBindingType_ExcludeClassInterceptors();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getMethod Method}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getMethod()
>+	 * @see #getInterceptorBindingType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorBindingType_Method();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorBindingType#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorBindingType#getId()
>+	 * @see #getInterceptorBindingType()
>+	 * @generated
>+	 */
>+	EAttribute getInterceptorBindingType_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType Interceptor Order Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Interceptor Order Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorOrderType
>+	 * @generated
>+	 */
>+	EClass getInterceptorOrderType();
>+
>+	/**
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType#getInterceptorClasses Interceptor Classes}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute list 'Interceptor Classes'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorOrderType#getInterceptorClasses()
>+	 * @see #getInterceptorOrderType()
>+	 * @generated
>+	 */
>+	EAttribute getInterceptorOrderType_InterceptorClasses();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorOrderType#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorOrderType#getId()
>+	 * @see #getInterceptorOrderType()
>+	 * @generated
>+	 */
>+	EAttribute getInterceptorOrderType_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InterceptorsType Interceptors Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Interceptors Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType
>+	 * @generated
>+	 */
>+	EClass getInterceptorsType();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getDescriptions Descriptions}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType#getDescriptions()
>+	 * @see #getInterceptorsType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorsType_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getInterceptors Interceptors}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Interceptors'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType#getInterceptors()
>+	 * @see #getInterceptorsType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorsType_Interceptors();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorsType#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorsType#getId()
>+	 * @see #getInterceptorsType()
>+	 * @generated
>+	 */
>+	EAttribute getInterceptorsType_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.InterceptorType Interceptor Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Interceptor Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType
>+	 * @generated
>+	 */
>+	EClass getInterceptorType();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getDescriptions Descriptions}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getDescriptions()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getInterceptorClass Interceptor Class}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Interceptor Class'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getInterceptorClass()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EAttribute getInterceptorType_InterceptorClass();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundInvokes Around Invokes}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Around Invokes'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getAroundInvokes()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_AroundInvokes();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundTimeouts Around Timeouts}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Around Timeouts'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getAroundTimeouts()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_AroundTimeouts();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries Env Entries}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Env Entries'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_EnvEntries();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbRefs Ejb Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Ejb Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getEjbRefs()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_EjbRefs();
> 
> 	/**
> 	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbLocalRefs Ejb Local Refs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Ejb Local Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getEjbLocalRefs()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the containment reference list 'Ejb Local Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getEjbLocalRefs()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_EjbLocalRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getServiceRefs Service Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Service Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getServiceRefs()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_ServiceRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getResourceRefs Resource Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Resource Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getResourceRefs()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_ResourceRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getResourceEnvRefs Resource Env Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Resource Env Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getResourceEnvRefs()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_ResourceEnvRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getMessageDestinationRefs Message Destination Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Message Destination Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getMessageDestinationRefs()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_MessageDestinationRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceContextRefs Persistence Context Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Persistence Context Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceContextRefs()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_PersistenceContextRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceUnitRefs Persistence Unit Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Persistence Unit Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceUnitRefs()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_PersistenceUnitRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPostConstructs Post Constructs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Post Constructs'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPostConstructs()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_PostConstructs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPreDestroys Pre Destroys}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Pre Destroys'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPreDestroys()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_PreDestroys();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getDataSource Data Source}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Data Source'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getDataSource()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_DataSource();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPostActivates Post Activates}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Post Activates'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPostActivates()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_PostActivates();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPrePassivates Pre Passivates}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Pre Passivates'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPrePassivates()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EReference getInterceptorType_PrePassivates();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getId()
>+	 * @see #getInterceptorType()
>+	 * @generated
>+	 */
>+	EAttribute getInterceptorType_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean Message Driven Bean}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Message Driven Bean'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean
>+	 * @generated
>+	 */
>+	EClass getMessageDrivenBean();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDescriptions Descriptions}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDescriptions()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDisplayNames Display Names}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Display Names'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDisplayNames()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_DisplayNames();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getIcons Icons}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Icons'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getIcons()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_Icons();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbName Ejb Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Ejb Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbName()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EAttribute getMessageDrivenBean_EjbName();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMappedName Mapped Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Mapped Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMappedName()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EAttribute getMessageDrivenBean_MappedName();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbClass Ejb Class}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Ejb Class'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbClass()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EAttribute getMessageDrivenBean_EjbClass();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessagingType Messaging Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Messaging Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessagingType()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EAttribute getMessageDrivenBean_MessagingType();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTimeoutMethod Timeout Method}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Timeout Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTimeoutMethod()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_TimeoutMethod();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTimer Timer}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Timer'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTimer()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_Timer();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTransactionType Transaction Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Transaction Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTransactionType()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EAttribute getMessageDrivenBean_TransactionType();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationType Message Destination Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Message Destination Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationType()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EAttribute getMessageDrivenBean_MessageDestinationType();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationLink Message Destination Link}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Message Destination Link'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationLink()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EAttribute getMessageDrivenBean_MessageDestinationLink();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getActivationConfig Activation Config}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Activation Config'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getActivationConfig()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_ActivationConfig();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getAroundInvokes Around Invokes}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Around Invokes'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getAroundInvokes()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_AroundInvokes();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getAroundTimeouts Around Timeouts}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Around Timeouts'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getAroundTimeouts()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_AroundTimeouts();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEnvEntries Env Entries}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Env Entries'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEnvEntries()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_EnvEntries();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbRefs Ejb Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Ejb Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbRefs()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_EjbRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbLocalRefs Ejb Local Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Ejb Local Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbLocalRefs()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_EjbLocalRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getServiceRefs Service Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Service Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getServiceRefs()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_ServiceRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceRefs Resource Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Resource Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceRefs()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_ResourceRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceEnvRefs Resource Env Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Resource Env Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceEnvRefs()
>+	 * @see #getMessageDrivenBean()
>+	 * @generated
>+	 */
>+	EReference getMessageDrivenBean_ResourceEnvRefs();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationRefs Message Destination Refs}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Message Destination Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationRefs()
>+	 * @see #getMessageDrivenBean()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_EjbLocalRefs();
>+	EReference getMessageDrivenBean_MessageDestinationRefs();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getServiceRefs Service Refs}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceContextRefs Persistence Context Refs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Service Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getServiceRefs()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the containment reference list 'Persistence Context Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceContextRefs()
>+	 * @see #getMessageDrivenBean()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_ServiceRefs();
>+	EReference getMessageDrivenBean_PersistenceContextRefs();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getResourceRefs Resource Refs}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceUnitRefs Persistence Unit Refs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Resource Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getResourceRefs()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the containment reference list 'Persistence Unit Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceUnitRefs()
>+	 * @see #getMessageDrivenBean()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_ResourceRefs();
>+	EReference getMessageDrivenBean_PersistenceUnitRefs();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getResourceEnvRefs Resource Env Refs}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPostConstructs Post Constructs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Resource Env Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getResourceEnvRefs()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the containment reference list 'Post Constructs'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPostConstructs()
>+	 * @see #getMessageDrivenBean()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_ResourceEnvRefs();
>+	EReference getMessageDrivenBean_PostConstructs();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getMessageDestinationRefs Message Destination Refs}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPreDestroys Pre Destroys}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Message Destination Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getMessageDestinationRefs()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the containment reference list 'Pre Destroys'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPreDestroys()
>+	 * @see #getMessageDrivenBean()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_MessageDestinationRefs();
>+	EReference getMessageDrivenBean_PreDestroys();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceContextRefs Persistence Context Refs}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDataSource Data Source}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Persistence Context Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceContextRefs()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the containment reference list 'Data Source'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDataSource()
>+	 * @see #getMessageDrivenBean()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_PersistenceContextRefs();
>+	EReference getMessageDrivenBean_DataSource();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceUnitRefs Persistence Unit Refs}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getSecurityRoleRef Security Role Ref}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Persistence Unit Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPersistenceUnitRefs()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the containment reference list 'Security Role Ref'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getSecurityRoleRef()
>+	 * @see #getMessageDrivenBean()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_PersistenceUnitRefs();
>+	EReference getMessageDrivenBean_SecurityRoleRef();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPostConstructs Post Constructs}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getSecurityIdentity Security Identity}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Post Constructs'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPostConstructs()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the containment reference 'Security Identity'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getSecurityIdentity()
>+	 * @see #getMessageDrivenBean()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_PostConstructs();
>+	EReference getMessageDrivenBean_SecurityIdentity();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPreDestroys Pre Destroys}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Pre Destroys'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPreDestroys()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getId()
>+	 * @see #getMessageDrivenBean()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_PreDestroys();
>+	EAttribute getMessageDrivenBean_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPostActivates Post Activates}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.MethodParams Method Params}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Post Activates'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPostActivates()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for class 'Method Params'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodParams
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_PostActivates();
>+	EClass getMethodParams();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getPrePassivates Pre Passivates}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.MethodParams#getMethodParams Method Params}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Pre Passivates'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getPrePassivates()
>-	 * @see #getInterceptorType()
>+	 * @return the meta object for the attribute list 'Method Params'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodParams#getMethodParams()
>+	 * @see #getMethodParams()
> 	 * @generated
> 	 */
>-	EReference getInterceptorType_PrePassivates();
>+	EAttribute getMethodParams_MethodParams();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodParams#getId Id}'.
> 	 * 
> 	 * 
> 	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getId()
>-	 * @see #getInterceptorType()
>+	 * @see org.eclipse.jst.javaee.ejb.MethodParams#getId()
>+	 * @see #getMethodParams()
> 	 * @generated
> 	 */
>-	EAttribute getInterceptorType_Id();
>+	EAttribute getMethodParams_Id();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean Message Driven Bean}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.MethodPermission Method Permission}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Message Driven Bean'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean
>+	 * @return the meta object for class 'Method Permission'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodPermission
> 	 * @generated
> 	 */
>-	EClass getMessageDrivenBean();
>+	EClass getMethodPermission();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDescriptions Descriptions}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
> 	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDescriptions()
>-	 * @see #getMessageDrivenBean()
>+	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getDescriptions()
>+	 * @see #getMethodPermission()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_Descriptions();
>+	EReference getMethodPermission_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDisplayNames Display Names}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getRoleNames Role Names}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Display Names'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getDisplayNames()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the attribute list 'Role Names'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getRoleNames()
>+	 * @see #getMethodPermission()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_DisplayNames();
>+	EAttribute getMethodPermission_RoleNames();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getIcons Icons}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getUnchecked Unchecked}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Icons'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getIcons()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the containment reference 'Unchecked'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getUnchecked()
>+	 * @see #getMethodPermission()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_Icons();
>+	EReference getMethodPermission_Unchecked();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbName Ejb Name}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getMethods Methods}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Methods'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getMethods()
>+	 * @see #getMethodPermission()
>+	 * @generated
>+	 */
>+	EReference getMethodPermission_Methods();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getId Id}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getId()
>+	 * @see #getMethodPermission()
>+	 * @generated
>+	 */
>+	EAttribute getMethodPermission_Id();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.MethodType Method Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Method Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodType
>+	 * @generated
>+	 */
>+	EClass getMethodType();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MethodType#getDescriptions Descriptions}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodType#getDescriptions()
>+	 * @see #getMethodType()
>+	 * @generated
>+	 */
>+	EReference getMethodType_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodType#getEjbName Ejb Name}'.
> 	 * 
> 	 * 
> 	 * @return the meta object for the attribute 'Ejb Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbName()
>-	 * @see #getMessageDrivenBean()
>+	 * @see org.eclipse.jst.javaee.ejb.MethodType#getEjbName()
>+	 * @see #getMethodType()
> 	 * @generated
> 	 */
>-	EAttribute getMessageDrivenBean_EjbName();
>+	EAttribute getMethodType_EjbName();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMappedName Mapped Name}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodIntf Method Intf}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Mapped Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMappedName()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the attribute 'Method Intf'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodType#getMethodIntf()
>+	 * @see #getMethodType()
> 	 * @generated
> 	 */
>-	EAttribute getMessageDrivenBean_MappedName();
>+	EAttribute getMethodType_MethodIntf();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbClass Ejb Class}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodName Method Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Ejb Class'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbClass()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the attribute 'Method Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodType#getMethodName()
>+	 * @see #getMethodType()
> 	 * @generated
> 	 */
>-	EAttribute getMessageDrivenBean_EjbClass();
>+	EAttribute getMethodType_MethodName();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessagingType Messaging Type}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodParams Method Params}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Messaging Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessagingType()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the containment reference 'Method Params'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodType#getMethodParams()
>+	 * @see #getMethodType()
> 	 * @generated
> 	 */
>-	EAttribute getMessageDrivenBean_MessagingType();
>+	EReference getMethodType_MethodParams();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTimeoutMethod Timeout Method}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Timeout Method'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTimeoutMethod()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodType#getId()
>+	 * @see #getMethodType()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_TimeoutMethod();
>+	EAttribute getMethodType_Id();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTransactionType Transaction Type}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.NamedMethodType Named Method Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Transaction Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getTransactionType()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for class 'Named Method Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType
>+	 * @generated
>+	 */
>+	EClass getNamedMethodType();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodName Method Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Method Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodName()
>+	 * @see #getNamedMethodType()
> 	 * @generated
> 	 */
>-	EAttribute getMessageDrivenBean_TransactionType();
>+	EAttribute getNamedMethodType_MethodName();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationType Message Destination Type}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodParams Method Params}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Message Destination Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationType()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the containment reference 'Method Params'.
>+	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodParams()
>+	 * @see #getNamedMethodType()
> 	 * @generated
> 	 */
>-	EAttribute getMessageDrivenBean_MessageDestinationType();
>+	EReference getNamedMethodType_MethodParams();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationLink Message Destination Link}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Message Destination Link'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationLink()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType#getId()
>+	 * @see #getNamedMethodType()
> 	 * @generated
> 	 */
>-	EAttribute getMessageDrivenBean_MessageDestinationLink();
>+	EAttribute getNamedMethodType_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getActivationConfig Activation Config}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.Query Query}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Activation Config'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getActivationConfig()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for class 'Query'.
>+	 * @see org.eclipse.jst.javaee.ejb.Query
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_ActivationConfig();
>+	EClass getQuery();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getAroundInvokes Around Invokes}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.Query#getDescription Description}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Around Invokes'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getAroundInvokes()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the containment reference 'Description'.
>+	 * @see org.eclipse.jst.javaee.ejb.Query#getDescription()
>+	 * @see #getQuery()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_AroundInvokes();
>+	EReference getQuery_Description();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEnvEntries Env Entries}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.Query#getQueryMethod Query Method}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Env Entries'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEnvEntries()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the containment reference 'Query Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.Query#getQueryMethod()
>+	 * @see #getQuery()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_EnvEntries();
>+	EReference getQuery_QueryMethod();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbRefs Ejb Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.Query#getResultTypeMapping Result Type Mapping}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Ejb Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbRefs()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the attribute 'Result Type Mapping'.
>+	 * @see org.eclipse.jst.javaee.ejb.Query#getResultTypeMapping()
>+	 * @see #getQuery()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_EjbRefs();
>+	EAttribute getQuery_ResultTypeMapping();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbLocalRefs Ejb Local Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.Query#getEjbQl Ejb Ql}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Ejb Local Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getEjbLocalRefs()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the attribute 'Ejb Ql'.
>+	 * @see org.eclipse.jst.javaee.ejb.Query#getEjbQl()
>+	 * @see #getQuery()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_EjbLocalRefs();
>+	EAttribute getQuery_EjbQl();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getServiceRefs Service Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.Query#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Service Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getServiceRefs()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.Query#getId()
>+	 * @see #getQuery()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_ServiceRefs();
>+	EAttribute getQuery_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceRefs Resource Refs}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.QueryMethod Query Method}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Resource Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceRefs()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for class 'Query Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.QueryMethod
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_ResourceRefs();
>+	EClass getQueryMethod();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceEnvRefs Resource Env Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.QueryMethod#getMethodName Method Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Resource Env Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getResourceEnvRefs()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the attribute 'Method Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.QueryMethod#getMethodName()
>+	 * @see #getQueryMethod()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_ResourceEnvRefs();
>+	EAttribute getQueryMethod_MethodName();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationRefs Message Destination Refs}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.QueryMethod#getMethodParams Method Params}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Message Destination Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getMessageDestinationRefs()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the containment reference 'Method Params'.
>+	 * @see org.eclipse.jst.javaee.ejb.QueryMethod#getMethodParams()
>+	 * @see #getQueryMethod()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_MessageDestinationRefs();
>+	EReference getQueryMethod_MethodParams();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceContextRefs Persistence Context Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.QueryMethod#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Persistence Context Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceContextRefs()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.QueryMethod#getId()
>+	 * @see #getQueryMethod()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_PersistenceContextRefs();
>+	EAttribute getQueryMethod_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceUnitRefs Persistence Unit Refs}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType Relationship Role Source Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Persistence Unit Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPersistenceUnitRefs()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for class 'Relationship Role Source Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_PersistenceUnitRefs();
>+	EClass getRelationshipRoleSourceType();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPostConstructs Post Constructs}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Post Constructs'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPostConstructs()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getDescriptions()
>+	 * @see #getRelationshipRoleSourceType()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_PostConstructs();
>+	EReference getRelationshipRoleSourceType_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPreDestroys Pre Destroys}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getEjbName Ejb Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Pre Destroys'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getPreDestroys()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the attribute 'Ejb Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getEjbName()
>+	 * @see #getRelationshipRoleSourceType()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_PreDestroys();
>+	EAttribute getRelationshipRoleSourceType_EjbName();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getSecurityIdentity Security Identity}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Security Identity'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getSecurityIdentity()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getId()
>+	 * @see #getRelationshipRoleSourceType()
> 	 * @generated
> 	 */
>-	EReference getMessageDrivenBean_SecurityIdentity();
>+	EAttribute getRelationshipRoleSourceType_Id();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MessageDrivenBean#getId Id}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.Relationships Relationships}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.MessageDrivenBean#getId()
>-	 * @see #getMessageDrivenBean()
>+	 * @return the meta object for class 'Relationships'.
>+	 * @see org.eclipse.jst.javaee.ejb.Relationships
> 	 * @generated
> 	 */
>-	EAttribute getMessageDrivenBean_Id();
>+	EClass getRelationships();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.MethodParams Method Params}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.Relationships#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Method Params'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodParams
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.Relationships#getDescriptions()
>+	 * @see #getRelationships()
> 	 * @generated
> 	 */
>-	EClass getMethodParams();
>+	EReference getRelationships_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.MethodParams#getMethodParams Method Params}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.Relationships#getEjbRelations Ejb Relations}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Method Params'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodParams#getMethodParams()
>-	 * @see #getMethodParams()
>+	 * @return the meta object for the containment reference list 'Ejb Relations'.
>+	 * @see org.eclipse.jst.javaee.ejb.Relationships#getEjbRelations()
>+	 * @see #getRelationships()
> 	 * @generated
> 	 */
>-	EAttribute getMethodParams_MethodParams();
>+	EReference getRelationships_EjbRelations();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodParams#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.Relationships#getId Id}'.
> 	 * 
> 	 * 
> 	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodParams#getId()
>-	 * @see #getMethodParams()
>+	 * @see org.eclipse.jst.javaee.ejb.Relationships#getId()
>+	 * @see #getRelationships()
> 	 * @generated
> 	 */
>-	EAttribute getMethodParams_Id();
>+	EAttribute getRelationships_Id();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.MethodPermission Method Permission}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType Remove Method Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Method Permission'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission
>+	 * @return the meta object for class 'Remove Method Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType
> 	 * @generated
> 	 */
>-	EClass getMethodPermission();
>+	EClass getRemoveMethodType();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getDescriptions Descriptions}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#getBeanMethod Bean Method}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getDescriptions()
>-	 * @see #getMethodPermission()
>+	 * @return the meta object for the containment reference 'Bean Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType#getBeanMethod()
>+	 * @see #getRemoveMethodType()
> 	 * @generated
> 	 */
>-	EReference getMethodPermission_Descriptions();
>+	EReference getRemoveMethodType_BeanMethod();
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getRoleNames Role Names}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#isRetainIfException Retain If Exception}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Role Names'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getRoleNames()
>-	 * @see #getMethodPermission()
>+	 * @return the meta object for the attribute 'Retain If Exception'.
>+	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType#isRetainIfException()
>+	 * @see #getRemoveMethodType()
> 	 * @generated
> 	 */
>-	EAttribute getMethodPermission_RoleNames();
>+	EAttribute getRemoveMethodType_RetainIfException();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getUnchecked Unchecked}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Unchecked'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getUnchecked()
>-	 * @see #getMethodPermission()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType#getId()
>+	 * @see #getRemoveMethodType()
> 	 * @generated
> 	 */
>-	EReference getMethodPermission_Unchecked();
>+	EAttribute getRemoveMethodType_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getMethods Methods}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType Security Identity Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Methods'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getMethods()
>-	 * @see #getMethodPermission()
>+	 * @return the meta object for class 'Security Identity Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType
> 	 * @generated
> 	 */
>-	EReference getMethodPermission_Methods();
>+	EClass getSecurityIdentityType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodPermission#getId Id}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodPermission#getId()
>-	 * @see #getMethodPermission()
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType#getDescriptions()
>+	 * @see #getSecurityIdentityType()
>+	 * @generated
>+	 */
>+	EReference getSecurityIdentityType_Descriptions();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getUseCallerIdentity Use Caller Identity}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Use Caller Identity'.
>+	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType#getUseCallerIdentity()
>+	 * @see #getSecurityIdentityType()
> 	 * @generated
> 	 */
>-	EAttribute getMethodPermission_Id();
>+	EReference getSecurityIdentityType_UseCallerIdentity();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.MethodType Method Type}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getRunAs Run As}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Method Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodType
>+	 * @return the meta object for the containment reference 'Run As'.
>+	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType#getRunAs()
>+	 * @see #getSecurityIdentityType()
> 	 * @generated
> 	 */
>-	EClass getMethodType();
>+	EReference getSecurityIdentityType_RunAs();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.MethodType#getDescriptions Descriptions}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodType#getDescriptions()
>-	 * @see #getMethodType()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType#getId()
>+	 * @see #getSecurityIdentityType()
> 	 * @generated
> 	 */
>-	EReference getMethodType_Descriptions();
>+	EAttribute getSecurityIdentityType_Id();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodType#getEjbName Ejb Name}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.SessionBean Session Bean}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Ejb Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodType#getEjbName()
>-	 * @see #getMethodType()
>+	 * @return the meta object for class 'Session Bean'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean
> 	 * @generated
> 	 */
>-	EAttribute getMethodType_EjbName();
>+	EClass getSessionBean();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodIntf Method Intf}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getDescriptions Descriptions}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Method Intf'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodType#getMethodIntf()
>-	 * @see #getMethodType()
>+	 * @return the meta object for the containment reference list 'Descriptions'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getDescriptions()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getMethodType_MethodIntf();
>+	EReference getSessionBean_Descriptions();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodName Method Name}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getDisplayNames Display Names}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Method Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodType#getMethodName()
>-	 * @see #getMethodType()
>+	 * @return the meta object for the containment reference list 'Display Names'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getDisplayNames()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getMethodType_MethodName();
>+	EReference getSessionBean_DisplayNames();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.MethodType#getMethodParams Method Params}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getIcons Icons}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Method Params'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodType#getMethodParams()
>-	 * @see #getMethodType()
>+	 * @return the meta object for the containment reference list 'Icons'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getIcons()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getMethodType_MethodParams();
>+	EReference getSessionBean_Icons();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.MethodType#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbName Ejb Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.MethodType#getId()
>-	 * @see #getMethodType()
>+	 * @return the meta object for the attribute 'Ejb Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEjbName()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getMethodType_Id();
>+	EAttribute getSessionBean_EjbName();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.NamedMethodType Named Method Type}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getMappedName Mapped Name}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Named Method Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType
>+	 * @return the meta object for the attribute 'Mapped Name'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getMappedName()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EClass getNamedMethodType();
>+	EAttribute getSessionBean_MappedName();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodName Method Name}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getHome Home}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Method Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodName()
>-	 * @see #getNamedMethodType()
>+	 * @return the meta object for the attribute 'Home'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getHome()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getNamedMethodType_MethodName();
>+	EAttribute getSessionBean_Home();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodParams Method Params}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getRemote Remote}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Method Params'.
>-	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType#getMethodParams()
>-	 * @see #getNamedMethodType()
>+	 * @return the meta object for the attribute 'Remote'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getRemote()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getNamedMethodType_MethodParams();
>+	EAttribute getSessionBean_Remote();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.NamedMethodType#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocalHome Local Home}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.NamedMethodType#getId()
>-	 * @see #getNamedMethodType()
>+	 * @return the meta object for the attribute 'Local Home'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getLocalHome()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getNamedMethodType_Id();
>+	EAttribute getSessionBean_LocalHome();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.Query Query}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocal Local}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Query'.
>-	 * @see org.eclipse.jst.javaee.ejb.Query
>+	 * @return the meta object for the attribute 'Local'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getLocal()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EClass getQuery();
>+	EAttribute getSessionBean_Local();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.Query#getDescription Description}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getBusinessLocals Business Locals}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Description'.
>-	 * @see org.eclipse.jst.javaee.ejb.Query#getDescription()
>-	 * @see #getQuery()
>+	 * @return the meta object for the attribute list 'Business Locals'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getBusinessLocals()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getQuery_Description();
>+	EAttribute getSessionBean_BusinessLocals();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.Query#getQueryMethod Query Method}'.
>+	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getBusinessRemotes Business Remotes}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Query Method'.
>-	 * @see org.eclipse.jst.javaee.ejb.Query#getQueryMethod()
>-	 * @see #getQuery()
>+	 * @return the meta object for the attribute list 'Business Remotes'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getBusinessRemotes()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getQuery_QueryMethod();
>+	EAttribute getSessionBean_BusinessRemotes();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.Query#getResultTypeMapping Result Type Mapping}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocalBean Local Bean}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Result Type Mapping'.
>-	 * @see org.eclipse.jst.javaee.ejb.Query#getResultTypeMapping()
>-	 * @see #getQuery()
>+	 * @return the meta object for the containment reference 'Local Bean'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getLocalBean()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getQuery_ResultTypeMapping();
>+	EReference getSessionBean_LocalBean();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.Query#getEjbQl Ejb Ql}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getServiceEndpoint Service Endpoint}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Ejb Ql'.
>-	 * @see org.eclipse.jst.javaee.ejb.Query#getEjbQl()
>-	 * @see #getQuery()
>+	 * @return the meta object for the attribute 'Service Endpoint'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getServiceEndpoint()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getQuery_EjbQl();
>+	EAttribute getSessionBean_ServiceEndpoint();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.Query#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbClass Ejb Class}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.Query#getId()
>-	 * @see #getQuery()
>+	 * @return the meta object for the attribute 'Ejb Class'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEjbClass()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getQuery_Id();
>+	EAttribute getSessionBean_EjbClass();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.QueryMethod Query Method}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSessionType Session Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Query Method'.
>-	 * @see org.eclipse.jst.javaee.ejb.QueryMethod
>+	 * @return the meta object for the attribute 'Session Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getSessionType()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EClass getQueryMethod();
>+	EAttribute getSessionBean_SessionType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.QueryMethod#getMethodName Method Name}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SessionBean#getStatefulTimeout Stateful Timeout}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Method Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.QueryMethod#getMethodName()
>-	 * @see #getQueryMethod()
>+	 * @return the meta object for the containment reference 'Stateful Timeout'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getStatefulTimeout()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getQueryMethod_MethodName();
>+	EReference getSessionBean_StatefulTimeout();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.QueryMethod#getMethodParams Method Params}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SessionBean#getTimeoutMethod Timeout Method}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Method Params'.
>-	 * @see org.eclipse.jst.javaee.ejb.QueryMethod#getMethodParams()
>-	 * @see #getQueryMethod()
>+	 * @return the meta object for the containment reference 'Timeout Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getTimeoutMethod()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getQueryMethod_MethodParams();
>+	EReference getSessionBean_TimeoutMethod();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.QueryMethod#getId Id}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getTimer Timer}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.QueryMethod#getId()
>-	 * @see #getQueryMethod()
>+	 * @return the meta object for the containment reference list 'Timer'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getTimer()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getQueryMethod_Id();
>+	EReference getSessionBean_Timer();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType Relationship Role Source Type}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#isInitOnStartup Init On Startup}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Relationship Role Source Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType
>+	 * @return the meta object for the attribute 'Init On Startup'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#isInitOnStartup()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EClass getRelationshipRoleSourceType();
>+	EAttribute getSessionBean_InitOnStartup();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getDescriptions Descriptions}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getConcurrencyManagementType Concurrency Management Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getDescriptions()
>-	 * @see #getRelationshipRoleSourceType()
>+	 * @return the meta object for the attribute 'Concurrency Management Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getConcurrencyManagementType()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getRelationshipRoleSourceType_Descriptions();
>+	EAttribute getSessionBean_ConcurrencyManagementType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getEjbName Ejb Name}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getConcurrentMethod Concurrent Method}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Ejb Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getEjbName()
>-	 * @see #getRelationshipRoleSourceType()
>+	 * @return the meta object for the containment reference list 'Concurrent Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getConcurrentMethod()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getRelationshipRoleSourceType_EjbName();
>+	EReference getSessionBean_ConcurrentMethod();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getId Id}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SessionBean#getDependsOn Depends On}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType#getId()
>-	 * @see #getRelationshipRoleSourceType()
>+	 * @return the meta object for the containment reference 'Depends On'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getDependsOn()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getRelationshipRoleSourceType_Id();
>+	EReference getSessionBean_DependsOn();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.Relationships Relationships}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getInitMethods Init Methods}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Relationships'.
>-	 * @see org.eclipse.jst.javaee.ejb.Relationships
>+	 * @return the meta object for the containment reference list 'Init Methods'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getInitMethods()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EClass getRelationships();
>+	EReference getSessionBean_InitMethods();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.Relationships#getDescriptions Descriptions}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getRemoveMethods Remove Methods}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.Relationships#getDescriptions()
>-	 * @see #getRelationships()
>+	 * @return the meta object for the containment reference list 'Remove Methods'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getRemoveMethods()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getRelationships_Descriptions();
>+	EReference getSessionBean_RemoveMethods();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.Relationships#getEjbRelations Ejb Relations}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getAsyncMethod Async Method}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Ejb Relations'.
>-	 * @see org.eclipse.jst.javaee.ejb.Relationships#getEjbRelations()
>-	 * @see #getRelationships()
>+	 * @return the meta object for the containment reference list 'Async Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getAsyncMethod()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getRelationships_EjbRelations();
>+	EReference getSessionBean_AsyncMethod();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.Relationships#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getTransactionType Transaction Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.Relationships#getId()
>-	 * @see #getRelationships()
>+	 * @return the meta object for the attribute 'Transaction Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getTransactionType()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getRelationships_Id();
>+	EAttribute getSessionBean_TransactionType();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType Remove Method Type}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SessionBean#getAfterBeginMethod After Begin Method}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Remove Method Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType
>+	 * @return the meta object for the containment reference 'After Begin Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getAfterBeginMethod()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EClass getRemoveMethodType();
>+	EReference getSessionBean_AfterBeginMethod();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#getBeanMethod Bean Method}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SessionBean#getBeforeCompletionMethod Before Completion Method}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Bean Method'.
>-	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType#getBeanMethod()
>-	 * @see #getRemoveMethodType()
>+	 * @return the meta object for the containment reference 'Before Completion Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getBeforeCompletionMethod()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getRemoveMethodType_BeanMethod();
>+	EReference getSessionBean_BeforeCompletionMethod();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#isRetainIfException Retain If Exception}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SessionBean#getAfterCompletionMethod After Completion Method}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Retain If Exception'.
>-	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType#isRetainIfException()
>-	 * @see #getRemoveMethodType()
>+	 * @return the meta object for the containment reference 'After Completion Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getAfterCompletionMethod()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getRemoveMethodType_RetainIfException();
>+	EReference getSessionBean_AfterCompletionMethod();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.RemoveMethodType#getId Id}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getAroundInvokes Around Invokes}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.RemoveMethodType#getId()
>-	 * @see #getRemoveMethodType()
>+	 * @return the meta object for the containment reference list 'Around Invokes'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getAroundInvokes()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getRemoveMethodType_Id();
>+	EReference getSessionBean_AroundInvokes();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType Security Identity Type}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getAroundTimeouts Around Timeouts}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Security Identity Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType
>+	 * @return the meta object for the containment reference list 'Around Timeouts'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getAroundTimeouts()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EClass getSecurityIdentityType();
>+	EReference getSessionBean_AroundTimeouts();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getDescriptions Descriptions}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEnvEntries Env Entries}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType#getDescriptions()
>-	 * @see #getSecurityIdentityType()
>+	 * @return the meta object for the containment reference list 'Env Entries'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEnvEntries()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getSecurityIdentityType_Descriptions();
>+	EReference getSessionBean_EnvEntries();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getUseCallerIdentity Use Caller Identity}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbRefs Ejb Refs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Use Caller Identity'.
>-	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType#getUseCallerIdentity()
>-	 * @see #getSecurityIdentityType()
>+	 * @return the meta object for the containment reference list 'Ejb Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEjbRefs()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getSecurityIdentityType_UseCallerIdentity();
>+	EReference getSessionBean_EjbRefs();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getRunAs Run As}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbLocalRefs Ejb Local Refs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Run As'.
>-	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType#getRunAs()
>-	 * @see #getSecurityIdentityType()
>+	 * @return the meta object for the containment reference list 'Ejb Local Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEjbLocalRefs()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getSecurityIdentityType_RunAs();
>+	EReference getSessionBean_EjbLocalRefs();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SecurityIdentityType#getId Id}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getServiceRefs Service Refs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.SecurityIdentityType#getId()
>-	 * @see #getSecurityIdentityType()
>+	 * @return the meta object for the containment reference list 'Service Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getServiceRefs()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getSecurityIdentityType_Id();
>+	EReference getSessionBean_ServiceRefs();
> 
> 	/**
>-	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.SessionBean Session Bean}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getResourceRefs Resource Refs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for class 'Session Bean'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean
>+	 * @return the meta object for the containment reference list 'Resource Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getResourceRefs()
>+	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EClass getSessionBean();
>+	EReference getSessionBean_ResourceRefs();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getDescriptions Descriptions}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getResourceEnvRefs Resource Env Refs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Descriptions'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getDescriptions()
>+	 * @return the meta object for the containment reference list 'Resource Env Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getResourceEnvRefs()
> 	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_Descriptions();
>+	EReference getSessionBean_ResourceEnvRefs();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getDisplayNames Display Names}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getMessageDestinationRefs Message Destination Refs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Display Names'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getDisplayNames()
>+	 * @return the meta object for the containment reference list 'Message Destination Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getMessageDestinationRefs()
> 	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_DisplayNames();
>+	EReference getSessionBean_MessageDestinationRefs();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getIcons Icons}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceContextRefs Persistence Context Refs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Icons'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getIcons()
>+	 * @return the meta object for the containment reference list 'Persistence Context Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceContextRefs()
> 	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_Icons();
>+	EReference getSessionBean_PersistenceContextRefs();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbName Ejb Name}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceUnitRefs Persistence Unit Refs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Ejb Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEjbName()
>+	 * @return the meta object for the containment reference list 'Persistence Unit Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceUnitRefs()
> 	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_EjbName();
>+	EReference getSessionBean_PersistenceUnitRefs();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getMappedName Mapped Name}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPostConstructs Post Constructs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Mapped Name'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getMappedName()
>+	 * @return the meta object for the containment reference list 'Post Constructs'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPostConstructs()
> 	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_MappedName();
>+	EReference getSessionBean_PostConstructs();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getHome Home}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPreDestroys Pre Destroys}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Home'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getHome()
>+	 * @return the meta object for the containment reference list 'Pre Destroys'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPreDestroys()
> 	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_Home();
>+	EReference getSessionBean_PreDestroys();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getRemote Remote}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getDataSource Data Source}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Remote'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getRemote()
>+	 * @return the meta object for the containment reference list 'Data Source'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getDataSource()
> 	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_Remote();
>+	EReference getSessionBean_DataSource();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocalHome Local Home}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPostActivates Post Activates}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Local Home'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getLocalHome()
>+	 * @return the meta object for the containment reference list 'Post Activates'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPostActivates()
> 	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_LocalHome();
>+	EReference getSessionBean_PostActivates();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getLocal Local}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPrePassivates Pre Passivates}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Local'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getLocal()
>+	 * @return the meta object for the containment reference list 'Pre Passivates'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPrePassivates()
> 	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_Local();
>+	EReference getSessionBean_PrePassivates();
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getBusinessLocals Business Locals}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSecurityRoleRefs Security Role Refs}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Business Locals'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getBusinessLocals()
>+	 * @return the meta object for the containment reference list 'Security Role Refs'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getSecurityRoleRefs()
> 	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_BusinessLocals();
>+	EReference getSessionBean_SecurityRoleRefs();
> 
> 	/**
>-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getBusinessRemotes Business Remotes}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSecurityIdentities Security Identities}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute list 'Business Remotes'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getBusinessRemotes()
>+	 * @return the meta object for the containment reference 'Security Identities'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getSecurityIdentities()
> 	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_BusinessRemotes();
>+	EReference getSessionBean_SecurityIdentities();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getServiceEndpoint Service Endpoint}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Service Endpoint'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getServiceEndpoint()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getId()
> 	 * @see #getSessionBean()
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_ServiceEndpoint();
>+	EAttribute getSessionBean_Id();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbClass Ejb Class}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType Stateful Timeout Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Ejb Class'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEjbClass()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for class 'Stateful Timeout Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.StatefulTimeoutType
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_EjbClass();
>+	EClass getStatefulTimeoutType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSessionType Session Type}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getTimeout Timeout}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Session Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getSessionType()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Timeout'.
>+	 * @see org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getTimeout()
>+	 * @see #getStatefulTimeoutType()
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_SessionType();
>+	EAttribute getStatefulTimeoutType_Timeout();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SessionBean#getTimeoutMethod Timeout Method}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getUnit Unit}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Timeout Method'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getTimeoutMethod()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Unit'.
>+	 * @see org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getUnit()
>+	 * @see #getStatefulTimeoutType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_TimeoutMethod();
>+	EAttribute getStatefulTimeoutType_Unit();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getInitMethods Init Methods}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Init Methods'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getInitMethods()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getId()
>+	 * @see #getStatefulTimeoutType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_InitMethods();
>+	EAttribute getStatefulTimeoutType_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getRemoveMethods Remove Methods}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType Timer Schedule Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Remove Methods'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getRemoveMethods()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for class 'Timer Schedule Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerScheduleType
> 	 * @generated
> 	 */
>-	EReference getSessionBean_RemoveMethods();
>+	EClass getTimerScheduleType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getTransactionType Transaction Type}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getSecond Second}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the attribute 'Transaction Type'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getTransactionType()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Second'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerScheduleType#getSecond()
>+	 * @see #getTimerScheduleType()
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_TransactionType();
>+	EAttribute getTimerScheduleType_Second();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getAroundInvokes Around Invokes}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getMinute Minute}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Around Invokes'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getAroundInvokes()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Minute'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerScheduleType#getMinute()
>+	 * @see #getTimerScheduleType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_AroundInvokes();
>+	EAttribute getTimerScheduleType_Minute();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEnvEntries Env Entries}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getHour Hour}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Env Entries'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEnvEntries()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Hour'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerScheduleType#getHour()
>+	 * @see #getTimerScheduleType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_EnvEntries();
>+	EAttribute getTimerScheduleType_Hour();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbRefs Ejb Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getDayOfMonth Day Of Month}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Ejb Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEjbRefs()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Day Of Month'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerScheduleType#getDayOfMonth()
>+	 * @see #getTimerScheduleType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_EjbRefs();
>+	EAttribute getTimerScheduleType_DayOfMonth();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getEjbLocalRefs Ejb Local Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getMonth Month}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Ejb Local Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getEjbLocalRefs()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Month'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerScheduleType#getMonth()
>+	 * @see #getTimerScheduleType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_EjbLocalRefs();
>+	EAttribute getTimerScheduleType_Month();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getServiceRefs Service Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getDayOfWeek Day Of Week}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Service Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getServiceRefs()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Day Of Week'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerScheduleType#getDayOfWeek()
>+	 * @see #getTimerScheduleType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_ServiceRefs();
>+	EAttribute getTimerScheduleType_DayOfWeek();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getResourceRefs Resource Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getYear Year}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Resource Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getResourceRefs()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Year'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerScheduleType#getYear()
>+	 * @see #getTimerScheduleType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_ResourceRefs();
>+	EAttribute getTimerScheduleType_Year();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getResourceEnvRefs Resource Env Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getId Id}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Resource Env Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getResourceEnvRefs()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Id'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerScheduleType#getId()
>+	 * @see #getTimerScheduleType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_ResourceEnvRefs();
>+	EAttribute getTimerScheduleType_Id();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getMessageDestinationRefs Message Destination Refs}'.
>+	 * Returns the meta object for class '{@link org.eclipse.jst.javaee.ejb.TimerType Timer Type}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Message Destination Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getMessageDestinationRefs()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for class 'Timer Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerType
> 	 * @generated
> 	 */
>-	EReference getSessionBean_MessageDestinationRefs();
>+	EClass getTimerType();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceContextRefs Persistence Context Refs}'.
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.TimerType#getDescription Description}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Persistence Context Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceContextRefs()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the containment reference list 'Description'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerType#getDescription()
>+	 * @see #getTimerType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_PersistenceContextRefs();
>+	EReference getTimerType_Description();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceUnitRefs Persistence Unit Refs}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.TimerType#getSchedule Schedule}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Persistence Unit Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPersistenceUnitRefs()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the containment reference 'Schedule'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerType#getSchedule()
>+	 * @see #getTimerType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_PersistenceUnitRefs();
>+	EReference getTimerType_Schedule();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPostConstructs Post Constructs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerType#getStart Start}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Post Constructs'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPostConstructs()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Start'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerType#getStart()
>+	 * @see #getTimerType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_PostConstructs();
>+	EAttribute getTimerType_Start();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPreDestroys Pre Destroys}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerType#getEnd End}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Pre Destroys'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPreDestroys()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'End'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerType#getEnd()
>+	 * @see #getTimerType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_PreDestroys();
>+	EAttribute getTimerType_End();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPostActivates Post Activates}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.TimerType#getTimeoutMethod Timeout Method}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Post Activates'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPostActivates()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the containment reference 'Timeout Method'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerType#getTimeoutMethod()
>+	 * @see #getTimerType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_PostActivates();
>+	EReference getTimerType_TimeoutMethod();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getPrePassivates Pre Passivates}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerType#isPersistent Persistent}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Pre Passivates'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getPrePassivates()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Persistent'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerType#isPersistent()
>+	 * @see #getTimerType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_PrePassivates();
>+	EAttribute getTimerType_Persistent();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSecurityRoleRefs Security Role Refs}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerType#getTimezone Timezone}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Security Role Refs'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getSecurityRoleRefs()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Timezone'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerType#getTimezone()
>+	 * @see #getTimerType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_SecurityRoleRefs();
>+	EAttribute getTimerType_Timezone();
> 
> 	/**
>-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.javaee.ejb.SessionBean#getSecurityIdentities Security Identities}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerType#getInfo Info}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference 'Security Identities'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getSecurityIdentities()
>-	 * @see #getSessionBean()
>+	 * @return the meta object for the attribute 'Info'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimerType#getInfo()
>+	 * @see #getTimerType()
> 	 * @generated
> 	 */
>-	EReference getSessionBean_SecurityIdentities();
>+	EAttribute getTimerType_Info();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.SessionBean#getId Id}'.
>+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.TimerType#getId Id}'.
> 	 * 
> 	 * 
> 	 * @return the meta object for the attribute 'Id'.
>-	 * @see org.eclipse.jst.javaee.ejb.SessionBean#getId()
>-	 * @see #getSessionBean()
>+	 * @see org.eclipse.jst.javaee.ejb.TimerType#getId()
>+	 * @see #getTimerType()
> 	 * @generated
> 	 */
>-	EAttribute getSessionBean_Id();
>+	EAttribute getTimerType_Id();
> 
> 	/**
> 	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.CmpVersionType Cmp Version Type}'.
>@@ -6027,6 +7437,26 @@
> 	EEnum getCMRFieldType();
> 
> 	/**
>+	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType Concurrency Management Type Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for enum 'Concurrency Management Type Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType
>+	 * @generated
>+	 */
>+	EEnum getConcurrencyManagementTypeType();
>+
>+	/**
>+	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType Concurrent Lock Type Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for enum 'Concurrent Lock Type Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType
>+	 * @generated
>+	 */
>+	EEnum getConcurrentLockTypeType();
>+
>+	/**
> 	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.MethodInterfaceType Method Interface Type}'.
> 	 * 
> 	 * 
>@@ -6077,6 +7507,16 @@
> 	EEnum getSessionType();
> 
> 	/**
>+	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.TimeUnitTypeType Time Unit Type Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for enum 'Time Unit Type Type'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimeUnitTypeType
>+	 * @generated
>+	 */
>+	EEnum getTimeUnitTypeType();
>+
>+	/**
> 	 * Returns the meta object for enum '{@link org.eclipse.jst.javaee.ejb.TransactionAttributeType Transaction Attribute Type}'.
> 	 * 
> 	 * 
>@@ -6117,6 +7557,26 @@
> 	EDataType getCMRFieldTypeObject();
> 
> 	/**
>+	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType Concurrency Management Type Type Object}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Concurrency Management Type Type Object'.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType
>+	 * @generated
>+	 */
>+	EDataType getConcurrencyManagementTypeTypeObject();
>+
>+	/**
>+	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType Concurrent Lock Type Type Object}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Concurrent Lock Type Type Object'.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType
>+	 * @generated
>+	 */
>+	EDataType getConcurrentLockTypeTypeObject();
>+
>+	/**
> 	 * Returns the meta object for data type '{@link java.lang.String Class Type}'.
> 	 * 
> 	 * 
>@@ -6197,6 +7657,16 @@
> 	EDataType getSessionTypeObject();
> 
> 	/**
>+	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.TimeUnitTypeType Time Unit Type Type Object}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for data type 'Time Unit Type Type Object'.
>+	 * @see org.eclipse.jst.javaee.ejb.TimeUnitTypeType
>+	 * @generated
>+	 */
>+	EDataType getTimeUnitTypeTypeObject();
>+
>+	/**
> 	 * Returns the meta object for data type '{@link org.eclipse.jst.javaee.ejb.TransactionAttributeType Transaction Attribute Type Object}'.
> 	 * 
> 	 * 
>@@ -6239,6 +7709,40 @@
> 	 */
> 	interface Literals {
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AccessTimeoutTypeImpl Access Timeout Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.AccessTimeoutTypeImpl
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getAccessTimeoutType()
>+		 * @generated
>+		 */
>+		EClass ACCESS_TIMEOUT_TYPE = eINSTANCE.getAccessTimeoutType();
>+
>+		/**
>+		 * The meta object literal for the 'Timeout' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ACCESS_TIMEOUT_TYPE__TIMEOUT = eINSTANCE.getAccessTimeoutType_Timeout();
>+
>+		/**
>+		 * The meta object literal for the 'Unit' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ACCESS_TIMEOUT_TYPE__UNIT = eINSTANCE.getAccessTimeoutType_Unit();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ACCESS_TIMEOUT_TYPE__ID = eINSTANCE.getAccessTimeoutType_Id();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ActivationConfigImpl Activation Config}' class.
> 		 * 
> 		 * 
>@@ -6333,6 +7837,14 @@
> 		EAttribute APPLICATION_EXCEPTION__ROLLBACK = eINSTANCE.getApplicationException_Rollback();
> 
> 		/**
>+		 * The meta object literal for the 'Inherited' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute APPLICATION_EXCEPTION__INHERITED = eINSTANCE.getApplicationException_Inherited();
>+
>+		/**
> 		 * The meta object literal for the 'Id' attribute feature.
> 		 * 
> 		 * 
>@@ -6367,6 +7879,32 @@
> 		EAttribute AROUND_INVOKE_TYPE__METHOD_NAME = eINSTANCE.getAroundInvokeType_MethodName();
> 
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AroundTimeoutTypeImpl Around Timeout Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.AroundTimeoutTypeImpl
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getAroundTimeoutType()
>+		 * @generated
>+		 */
>+		EClass AROUND_TIMEOUT_TYPE = eINSTANCE.getAroundTimeoutType();
>+
>+		/**
>+		 * The meta object literal for the 'Class' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute AROUND_TIMEOUT_TYPE__CLASS = eINSTANCE.getAroundTimeoutType_Class();
>+
>+		/**
>+		 * The meta object literal for the 'Method Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute AROUND_TIMEOUT_TYPE__METHOD_NAME = eINSTANCE.getAroundTimeoutType_MethodName();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AssemblyDescriptorImpl Assembly Descriptor}' class.
> 		 * 
> 		 * 
>@@ -6441,6 +7979,48 @@
> 		EAttribute ASSEMBLY_DESCRIPTOR__ID = eINSTANCE.getAssemblyDescriptor_Id();
> 
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl Async Method Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getAsyncMethodType()
>+		 * @generated
>+		 */
>+		EClass ASYNC_METHOD_TYPE = eINSTANCE.getAsyncMethodType();
>+
>+		/**
>+		 * The meta object literal for the 'Method Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ASYNC_METHOD_TYPE__METHOD_NAME = eINSTANCE.getAsyncMethodType_MethodName();
>+
>+		/**
>+		 * The meta object literal for the 'Method Params' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference ASYNC_METHOD_TYPE__METHOD_PARAMS = eINSTANCE.getAsyncMethodType_MethodParams();
>+
>+		/**
>+		 * The meta object literal for the 'Method Intf' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ASYNC_METHOD_TYPE__METHOD_INTF = eINSTANCE.getAsyncMethodType_MethodIntf();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute ASYNC_METHOD_TYPE__ID = eINSTANCE.getAsyncMethodType_Id();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.CMPFieldImpl CMP Field}' class.
> 		 * 
> 		 * 
>@@ -6517,6 +8097,48 @@
> 		EAttribute CMR_FIELD__ID = eINSTANCE.getCMRField_Id();
> 
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ConcurrentMethodTypeImpl Concurrent Method Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.ConcurrentMethodTypeImpl
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getConcurrentMethodType()
>+		 * @generated
>+		 */
>+		EClass CONCURRENT_METHOD_TYPE = eINSTANCE.getConcurrentMethodType();
>+
>+		/**
>+		 * The meta object literal for the 'Method' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference CONCURRENT_METHOD_TYPE__METHOD = eINSTANCE.getConcurrentMethodType_Method();
>+
>+		/**
>+		 * The meta object literal for the 'Lock' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute CONCURRENT_METHOD_TYPE__LOCK = eINSTANCE.getConcurrentMethodType_Lock();
>+
>+		/**
>+		 * The meta object literal for the 'Access Timeout' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference CONCURRENT_METHOD_TYPE__ACCESS_TIMEOUT = eINSTANCE.getConcurrentMethodType_AccessTimeout();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute CONCURRENT_METHOD_TYPE__ID = eINSTANCE.getConcurrentMethodType_Id();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.ContainerTransactionTypeImpl Container Transaction Type}' class.
> 		 * 
> 		 * 
>@@ -6559,6 +8181,32 @@
> 		EAttribute CONTAINER_TRANSACTION_TYPE__ID = eINSTANCE.getContainerTransactionType_Id();
> 
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.DependsOnTypeImpl Depends On Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.DependsOnTypeImpl
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getDependsOnType()
>+		 * @generated
>+		 */
>+		EClass DEPENDS_ON_TYPE = eINSTANCE.getDependsOnType();
>+
>+		/**
>+		 * The meta object literal for the 'Ejb Name' attribute list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DEPENDS_ON_TYPE__EJB_NAME = eINSTANCE.getDependsOnType_EjbName();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute DEPENDS_ON_TYPE__ID = eINSTANCE.getDependsOnType_Id();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl EJB Jar}' class.
> 		 * 
> 		 * 
>@@ -6593,6 +8241,14 @@
> 		EReference EJB_JAR__ICONS = eINSTANCE.getEJBJar_Icons();
> 
> 		/**
>+		 * The meta object literal for the 'Module Name' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute EJB_JAR__MODULE_NAME = eINSTANCE.getEJBJar_ModuleName();
>+
>+		/**
> 		 * The meta object literal for the 'Enterprise Beans' containment reference feature.
> 		 * 
> 		 * 
>@@ -7091,6 +8747,14 @@
> 		EReference ENTITY_BEAN__PRE_DESTROYS = eINSTANCE.getEntityBean_PreDestroys();
> 
> 		/**
>+		 * The meta object literal for the 'Data Source' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference ENTITY_BEAN__DATA_SOURCE = eINSTANCE.getEntityBean_DataSource();
>+
>+		/**
> 		 * The meta object literal for the 'Security Role Refs' containment reference list feature.
> 		 * 
> 		 * 
>@@ -7359,6 +9023,14 @@
> 		EReference INTERCEPTOR_TYPE__AROUND_INVOKES = eINSTANCE.getInterceptorType_AroundInvokes();
> 
> 		/**
>+		 * The meta object literal for the 'Around Timeouts' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERCEPTOR_TYPE__AROUND_TIMEOUTS = eINSTANCE.getInterceptorType_AroundTimeouts();
>+
>+		/**
> 		 * The meta object literal for the 'Env Entries' containment reference list feature.
> 		 * 
> 		 * 
>@@ -7447,6 +9119,14 @@
> 		EReference INTERCEPTOR_TYPE__PRE_DESTROYS = eINSTANCE.getInterceptorType_PreDestroys();
> 
> 		/**
>+		 * The meta object literal for the 'Data Source' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERCEPTOR_TYPE__DATA_SOURCE = eINSTANCE.getInterceptorType_DataSource();
>+
>+		/**
> 		 * The meta object literal for the 'Post Activates' containment reference list feature.
> 		 * 
> 		 * 
>@@ -7545,6 +9225,14 @@
> 		EReference MESSAGE_DRIVEN_BEAN__TIMEOUT_METHOD = eINSTANCE.getMessageDrivenBean_TimeoutMethod();
> 
> 		/**
>+		 * The meta object literal for the 'Timer' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference MESSAGE_DRIVEN_BEAN__TIMER = eINSTANCE.getMessageDrivenBean_Timer();
>+
>+		/**
> 		 * The meta object literal for the 'Transaction Type' attribute feature.
> 		 * 
> 		 * 
>@@ -7585,6 +9273,14 @@
> 		EReference MESSAGE_DRIVEN_BEAN__AROUND_INVOKES = eINSTANCE.getMessageDrivenBean_AroundInvokes();
> 
> 		/**
>+		 * The meta object literal for the 'Around Timeouts' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference MESSAGE_DRIVEN_BEAN__AROUND_TIMEOUTS = eINSTANCE.getMessageDrivenBean_AroundTimeouts();
>+
>+		/**
> 		 * The meta object literal for the 'Env Entries' containment reference list feature.
> 		 * 
> 		 * 
>@@ -7673,6 +9369,22 @@
> 		EReference MESSAGE_DRIVEN_BEAN__PRE_DESTROYS = eINSTANCE.getMessageDrivenBean_PreDestroys();
> 
> 		/**
>+		 * The meta object literal for the 'Data Source' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference MESSAGE_DRIVEN_BEAN__DATA_SOURCE = eINSTANCE.getMessageDrivenBean_DataSource();
>+
>+		/**
>+		 * The meta object literal for the 'Security Role Ref' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference MESSAGE_DRIVEN_BEAN__SECURITY_ROLE_REF = eINSTANCE.getMessageDrivenBean_SecurityRoleRef();
>+
>+		/**
> 		 * The meta object literal for the 'Security Identity' containment reference feature.
> 		 * 
> 		 * 
>@@ -8183,6 +9895,14 @@
> 		EAttribute SESSION_BEAN__BUSINESS_REMOTES = eINSTANCE.getSessionBean_BusinessRemotes();
> 
> 		/**
>+		 * The meta object literal for the 'Local Bean' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SESSION_BEAN__LOCAL_BEAN = eINSTANCE.getSessionBean_LocalBean();
>+
>+		/**
> 		 * The meta object literal for the 'Service Endpoint' attribute feature.
> 		 * 
> 		 * 
>@@ -8207,6 +9927,14 @@
> 		EAttribute SESSION_BEAN__SESSION_TYPE = eINSTANCE.getSessionBean_SessionType();
> 
> 		/**
>+		 * The meta object literal for the 'Stateful Timeout' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SESSION_BEAN__STATEFUL_TIMEOUT = eINSTANCE.getSessionBean_StatefulTimeout();
>+
>+		/**
> 		 * The meta object literal for the 'Timeout Method' containment reference feature.
> 		 * 
> 		 * 
>@@ -8215,6 +9943,46 @@
> 		EReference SESSION_BEAN__TIMEOUT_METHOD = eINSTANCE.getSessionBean_TimeoutMethod();
> 
> 		/**
>+		 * The meta object literal for the 'Timer' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SESSION_BEAN__TIMER = eINSTANCE.getSessionBean_Timer();
>+
>+		/**
>+		 * The meta object literal for the 'Init On Startup' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute SESSION_BEAN__INIT_ON_STARTUP = eINSTANCE.getSessionBean_InitOnStartup();
>+
>+		/**
>+		 * The meta object literal for the 'Concurrency Management Type' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute SESSION_BEAN__CONCURRENCY_MANAGEMENT_TYPE = eINSTANCE.getSessionBean_ConcurrencyManagementType();
>+
>+		/**
>+		 * The meta object literal for the 'Concurrent Method' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SESSION_BEAN__CONCURRENT_METHOD = eINSTANCE.getSessionBean_ConcurrentMethod();
>+
>+		/**
>+		 * The meta object literal for the 'Depends On' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SESSION_BEAN__DEPENDS_ON = eINSTANCE.getSessionBean_DependsOn();
>+
>+		/**
> 		 * The meta object literal for the 'Init Methods' containment reference list feature.
> 		 * 
> 		 * 
>@@ -8231,6 +9999,14 @@
> 		EReference SESSION_BEAN__REMOVE_METHODS = eINSTANCE.getSessionBean_RemoveMethods();
> 
> 		/**
>+		 * The meta object literal for the 'Async Method' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SESSION_BEAN__ASYNC_METHOD = eINSTANCE.getSessionBean_AsyncMethod();
>+
>+		/**
> 		 * The meta object literal for the 'Transaction Type' attribute feature.
> 		 * 
> 		 * 
>@@ -8239,6 +10015,30 @@
> 		EAttribute SESSION_BEAN__TRANSACTION_TYPE = eINSTANCE.getSessionBean_TransactionType();
> 
> 		/**
>+		 * The meta object literal for the 'After Begin Method' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SESSION_BEAN__AFTER_BEGIN_METHOD = eINSTANCE.getSessionBean_AfterBeginMethod();
>+
>+		/**
>+		 * The meta object literal for the 'Before Completion Method' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SESSION_BEAN__BEFORE_COMPLETION_METHOD = eINSTANCE.getSessionBean_BeforeCompletionMethod();
>+
>+		/**
>+		 * The meta object literal for the 'After Completion Method' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SESSION_BEAN__AFTER_COMPLETION_METHOD = eINSTANCE.getSessionBean_AfterCompletionMethod();
>+
>+		/**
> 		 * The meta object literal for the 'Around Invokes' containment reference list feature.
> 		 * 
> 		 * 
>@@ -8247,6 +10047,14 @@
> 		EReference SESSION_BEAN__AROUND_INVOKES = eINSTANCE.getSessionBean_AroundInvokes();
> 
> 		/**
>+		 * The meta object literal for the 'Around Timeouts' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SESSION_BEAN__AROUND_TIMEOUTS = eINSTANCE.getSessionBean_AroundTimeouts();
>+
>+		/**
> 		 * The meta object literal for the 'Env Entries' containment reference list feature.
> 		 * 
> 		 * 
>@@ -8335,6 +10143,14 @@
> 		EReference SESSION_BEAN__PRE_DESTROYS = eINSTANCE.getSessionBean_PreDestroys();
> 
> 		/**
>+		 * The meta object literal for the 'Data Source' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SESSION_BEAN__DATA_SOURCE = eINSTANCE.getSessionBean_DataSource();
>+
>+		/**
> 		 * The meta object literal for the 'Post Activates' containment reference list feature.
> 		 * 
> 		 * 
>@@ -8375,6 +10191,196 @@
> 		EAttribute SESSION_BEAN__ID = eINSTANCE.getSessionBean_Id();
> 
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.StatefulTimeoutTypeImpl Stateful Timeout Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.StatefulTimeoutTypeImpl
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getStatefulTimeoutType()
>+		 * @generated
>+		 */
>+		EClass STATEFUL_TIMEOUT_TYPE = eINSTANCE.getStatefulTimeoutType();
>+
>+		/**
>+		 * The meta object literal for the 'Timeout' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute STATEFUL_TIMEOUT_TYPE__TIMEOUT = eINSTANCE.getStatefulTimeoutType_Timeout();
>+
>+		/**
>+		 * The meta object literal for the 'Unit' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute STATEFUL_TIMEOUT_TYPE__UNIT = eINSTANCE.getStatefulTimeoutType_Unit();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute STATEFUL_TIMEOUT_TYPE__ID = eINSTANCE.getStatefulTimeoutType_Id();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerScheduleTypeImpl Timer Schedule Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.TimerScheduleTypeImpl
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTimerScheduleType()
>+		 * @generated
>+		 */
>+		EClass TIMER_SCHEDULE_TYPE = eINSTANCE.getTimerScheduleType();
>+
>+		/**
>+		 * The meta object literal for the 'Second' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_SCHEDULE_TYPE__SECOND = eINSTANCE.getTimerScheduleType_Second();
>+
>+		/**
>+		 * The meta object literal for the 'Minute' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_SCHEDULE_TYPE__MINUTE = eINSTANCE.getTimerScheduleType_Minute();
>+
>+		/**
>+		 * The meta object literal for the 'Hour' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_SCHEDULE_TYPE__HOUR = eINSTANCE.getTimerScheduleType_Hour();
>+
>+		/**
>+		 * The meta object literal for the 'Day Of Month' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_SCHEDULE_TYPE__DAY_OF_MONTH = eINSTANCE.getTimerScheduleType_DayOfMonth();
>+
>+		/**
>+		 * The meta object literal for the 'Month' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_SCHEDULE_TYPE__MONTH = eINSTANCE.getTimerScheduleType_Month();
>+
>+		/**
>+		 * The meta object literal for the 'Day Of Week' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_SCHEDULE_TYPE__DAY_OF_WEEK = eINSTANCE.getTimerScheduleType_DayOfWeek();
>+
>+		/**
>+		 * The meta object literal for the 'Year' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_SCHEDULE_TYPE__YEAR = eINSTANCE.getTimerScheduleType_Year();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_SCHEDULE_TYPE__ID = eINSTANCE.getTimerScheduleType_Id();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl Timer Type}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTimerType()
>+		 * @generated
>+		 */
>+		EClass TIMER_TYPE = eINSTANCE.getTimerType();
>+
>+		/**
>+		 * The meta object literal for the 'Description' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference TIMER_TYPE__DESCRIPTION = eINSTANCE.getTimerType_Description();
>+
>+		/**
>+		 * The meta object literal for the 'Schedule' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference TIMER_TYPE__SCHEDULE = eINSTANCE.getTimerType_Schedule();
>+
>+		/**
>+		 * The meta object literal for the 'Start' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_TYPE__START = eINSTANCE.getTimerType_Start();
>+
>+		/**
>+		 * The meta object literal for the 'End' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_TYPE__END = eINSTANCE.getTimerType_End();
>+
>+		/**
>+		 * The meta object literal for the 'Timeout Method' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference TIMER_TYPE__TIMEOUT_METHOD = eINSTANCE.getTimerType_TimeoutMethod();
>+
>+		/**
>+		 * The meta object literal for the 'Persistent' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_TYPE__PERSISTENT = eINSTANCE.getTimerType_Persistent();
>+
>+		/**
>+		 * The meta object literal for the 'Timezone' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_TYPE__TIMEZONE = eINSTANCE.getTimerType_Timezone();
>+
>+		/**
>+		 * The meta object literal for the 'Info' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_TYPE__INFO = eINSTANCE.getTimerType_Info();
>+
>+		/**
>+		 * The meta object literal for the 'Id' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute TIMER_TYPE__ID = eINSTANCE.getTimerType_Id();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.CmpVersionType Cmp Version Type}' enum.
> 		 * 
> 		 * 
>@@ -8395,6 +10401,26 @@
> 		EEnum CMR_FIELD_TYPE = eINSTANCE.getCMRFieldType();
> 
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType Concurrency Management Type Type}' enum.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getConcurrencyManagementTypeType()
>+		 * @generated
>+		 */
>+		EEnum CONCURRENCY_MANAGEMENT_TYPE_TYPE = eINSTANCE.getConcurrencyManagementTypeType();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType Concurrent Lock Type Type}' enum.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getConcurrentLockTypeType()
>+		 * @generated
>+		 */
>+		EEnum CONCURRENT_LOCK_TYPE_TYPE = eINSTANCE.getConcurrentLockTypeType();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.MethodInterfaceType Method Interface Type}' enum.
> 		 * 
> 		 * 
>@@ -8445,6 +10471,16 @@
> 		EEnum SESSION_TYPE = eINSTANCE.getSessionType();
> 
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.TimeUnitTypeType Time Unit Type Type}' enum.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.TimeUnitTypeType
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTimeUnitTypeType()
>+		 * @generated
>+		 */
>+		EEnum TIME_UNIT_TYPE_TYPE = eINSTANCE.getTimeUnitTypeType();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.jst.javaee.ejb.TransactionAttributeType Transaction Attribute Type}' enum.
> 		 * 
> 		 * 
>@@ -8485,6 +10521,26 @@
> 		EDataType CMR_FIELD_TYPE_OBJECT = eINSTANCE.getCMRFieldTypeObject();
> 
> 		/**
>+		 * The meta object literal for the 'Concurrency Management Type Type Object' data type.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.ConcurrencyManagementTypeType
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getConcurrencyManagementTypeTypeObject()
>+		 * @generated
>+		 */
>+		EDataType CONCURRENCY_MANAGEMENT_TYPE_TYPE_OBJECT = eINSTANCE.getConcurrencyManagementTypeTypeObject();
>+
>+		/**
>+		 * The meta object literal for the 'Concurrent Lock Type Type Object' data type.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getConcurrentLockTypeTypeObject()
>+		 * @generated
>+		 */
>+		EDataType CONCURRENT_LOCK_TYPE_TYPE_OBJECT = eINSTANCE.getConcurrentLockTypeTypeObject();
>+
>+		/**
> 		 * The meta object literal for the 'Class Type' data type.
> 		 * 
> 		 * 
>@@ -8565,6 +10621,16 @@
> 		EDataType SESSION_TYPE_OBJECT = eINSTANCE.getSessionTypeObject();
> 
> 		/**
>+		 * The meta object literal for the 'Time Unit Type Type Object' data type.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.jst.javaee.ejb.TimeUnitTypeType
>+		 * @see org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl#getTimeUnitTypeTypeObject()
>+		 * @generated
>+		 */
>+		EDataType TIME_UNIT_TYPE_TYPE_OBJECT = eINSTANCE.getTimeUnitTypeTypeObject();
>+
>+		/**
> 		 * The meta object literal for the 'Transaction Attribute Type Object' data type.
> 		 * 
> 		 * 
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbAdapterFactory.java,v
>retrieving revision 1.3
>diff -u -r1.3 EjbAdapterFactory.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbAdapterFactory.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbAdapterFactory.java	14 Oct 2009 21:48:09 -0000
>@@ -70,143 +70,175 @@
> 	}
> 
> 	/**
>-	 * The switch the delegates to the <code>createXXX</code> methods.
>+	 * The switch that delegates to the <code>createXXX</code> methods.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	protected EjbSwitch modelSwitch =
>-		new EjbSwitch() {
>+	protected EjbSwitch<Adapter> modelSwitch =
>+		new EjbSwitch<Adapter>() {
> 			@Override
>-			public Object caseActivationConfig(ActivationConfig object) {
>+			public Adapter caseAccessTimeoutType(AccessTimeoutType object) {
>+				return createAccessTimeoutTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseActivationConfig(ActivationConfig object) {
> 				return createActivationConfigAdapter();
> 			}
> 			@Override
>-			public Object caseActivationConfigProperty(ActivationConfigProperty object) {
>+			public Adapter caseActivationConfigProperty(ActivationConfigProperty object) {
> 				return createActivationConfigPropertyAdapter();
> 			}
> 			@Override
>-			public Object caseApplicationException(ApplicationException object) {
>+			public Adapter caseApplicationException(ApplicationException object) {
> 				return createApplicationExceptionAdapter();
> 			}
> 			@Override
>-			public Object caseAroundInvokeType(AroundInvokeType object) {
>+			public Adapter caseAroundInvokeType(AroundInvokeType object) {
> 				return createAroundInvokeTypeAdapter();
> 			}
> 			@Override
>-			public Object caseAssemblyDescriptor(AssemblyDescriptor object) {
>+			public Adapter caseAroundTimeoutType(AroundTimeoutType object) {
>+				return createAroundTimeoutTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseAssemblyDescriptor(AssemblyDescriptor object) {
> 				return createAssemblyDescriptorAdapter();
> 			}
> 			@Override
>-			public Object caseCMPField(CMPField object) {
>+			public Adapter caseAsyncMethodType(AsyncMethodType object) {
>+				return createAsyncMethodTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseCMPField(CMPField object) {
> 				return createCMPFieldAdapter();
> 			}
> 			@Override
>-			public Object caseCMRField(CMRField object) {
>+			public Adapter caseCMRField(CMRField object) {
> 				return createCMRFieldAdapter();
> 			}
> 			@Override
>-			public Object caseContainerTransactionType(ContainerTransactionType object) {
>+			public Adapter caseConcurrentMethodType(ConcurrentMethodType object) {
>+				return createConcurrentMethodTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseContainerTransactionType(ContainerTransactionType object) {
> 				return createContainerTransactionTypeAdapter();
> 			}
> 			@Override
>-			public Object caseEJBJar(EJBJar object) {
>+			public Adapter caseDependsOnType(DependsOnType object) {
>+				return createDependsOnTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseEJBJar(EJBJar object) {
> 				return createEJBJarAdapter();
> 			}
> 			@Override
>-			public Object caseEJBJarDeploymentDescriptor(EJBJarDeploymentDescriptor object) {
>+			public Adapter caseEJBJarDeploymentDescriptor(EJBJarDeploymentDescriptor object) {
> 				return createEJBJarDeploymentDescriptorAdapter();
> 			}
> 			@Override
>-			public Object caseEJBRelation(EJBRelation object) {
>+			public Adapter caseEJBRelation(EJBRelation object) {
> 				return createEJBRelationAdapter();
> 			}
> 			@Override
>-			public Object caseEJBRelationshipRole(EJBRelationshipRole object) {
>+			public Adapter caseEJBRelationshipRole(EJBRelationshipRole object) {
> 				return createEJBRelationshipRoleAdapter();
> 			}
> 			@Override
>-			public Object caseEnterpriseBeans(EnterpriseBeans object) {
>+			public Adapter caseEnterpriseBeans(EnterpriseBeans object) {
> 				return createEnterpriseBeansAdapter();
> 			}
> 			@Override
>-			public Object caseEntityBean(EntityBean object) {
>+			public Adapter caseEntityBean(EntityBean object) {
> 				return createEntityBeanAdapter();
> 			}
> 			@Override
>-			public Object caseExcludeList(ExcludeList object) {
>+			public Adapter caseExcludeList(ExcludeList object) {
> 				return createExcludeListAdapter();
> 			}
> 			@Override
>-			public Object caseInitMethodType(InitMethodType object) {
>+			public Adapter caseInitMethodType(InitMethodType object) {
> 				return createInitMethodTypeAdapter();
> 			}
> 			@Override
>-			public Object caseInterceptorBindingType(InterceptorBindingType object) {
>+			public Adapter caseInterceptorBindingType(InterceptorBindingType object) {
> 				return createInterceptorBindingTypeAdapter();
> 			}
> 			@Override
>-			public Object caseInterceptorOrderType(InterceptorOrderType object) {
>+			public Adapter caseInterceptorOrderType(InterceptorOrderType object) {
> 				return createInterceptorOrderTypeAdapter();
> 			}
> 			@Override
>-			public Object caseInterceptorsType(InterceptorsType object) {
>+			public Adapter caseInterceptorsType(InterceptorsType object) {
> 				return createInterceptorsTypeAdapter();
> 			}
> 			@Override
>-			public Object caseInterceptorType(InterceptorType object) {
>+			public Adapter caseInterceptorType(InterceptorType object) {
> 				return createInterceptorTypeAdapter();
> 			}
> 			@Override
>-			public Object caseMessageDrivenBean(MessageDrivenBean object) {
>+			public Adapter caseMessageDrivenBean(MessageDrivenBean object) {
> 				return createMessageDrivenBeanAdapter();
> 			}
> 			@Override
>-			public Object caseMethodParams(MethodParams object) {
>+			public Adapter caseMethodParams(MethodParams object) {
> 				return createMethodParamsAdapter();
> 			}
> 			@Override
>-			public Object caseMethodPermission(MethodPermission object) {
>+			public Adapter caseMethodPermission(MethodPermission object) {
> 				return createMethodPermissionAdapter();
> 			}
> 			@Override
>-			public Object caseMethodType(MethodType object) {
>+			public Adapter caseMethodType(MethodType object) {
> 				return createMethodTypeAdapter();
> 			}
> 			@Override
>-			public Object caseNamedMethodType(NamedMethodType object) {
>+			public Adapter caseNamedMethodType(NamedMethodType object) {
> 				return createNamedMethodTypeAdapter();
> 			}
> 			@Override
>-			public Object caseQuery(Query object) {
>+			public Adapter caseQuery(Query object) {
> 				return createQueryAdapter();
> 			}
> 			@Override
>-			public Object caseQueryMethod(QueryMethod object) {
>+			public Adapter caseQueryMethod(QueryMethod object) {
> 				return createQueryMethodAdapter();
> 			}
> 			@Override
>-			public Object caseRelationshipRoleSourceType(RelationshipRoleSourceType object) {
>+			public Adapter caseRelationshipRoleSourceType(RelationshipRoleSourceType object) {
> 				return createRelationshipRoleSourceTypeAdapter();
> 			}
> 			@Override
>-			public Object caseRelationships(Relationships object) {
>+			public Adapter caseRelationships(Relationships object) {
> 				return createRelationshipsAdapter();
> 			}
> 			@Override
>-			public Object caseRemoveMethodType(RemoveMethodType object) {
>+			public Adapter caseRemoveMethodType(RemoveMethodType object) {
> 				return createRemoveMethodTypeAdapter();
> 			}
> 			@Override
>-			public Object caseSecurityIdentityType(SecurityIdentityType object) {
>+			public Adapter caseSecurityIdentityType(SecurityIdentityType object) {
> 				return createSecurityIdentityTypeAdapter();
> 			}
> 			@Override
>-			public Object caseSessionBean(SessionBean object) {
>+			public Adapter caseSessionBean(SessionBean object) {
> 				return createSessionBeanAdapter();
> 			}
> 			@Override
>-			public Object defaultCase(EObject object) {
>+			public Adapter caseStatefulTimeoutType(StatefulTimeoutType object) {
>+				return createStatefulTimeoutTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseTimerScheduleType(TimerScheduleType object) {
>+				return createTimerScheduleTypeAdapter();
>+			}
>+			@Override
>+			public Adapter caseTimerType(TimerType object) {
>+				return createTimerTypeAdapter();
>+			}
>+			@Override
>+			public Adapter defaultCase(EObject object) {
> 				return createEObjectAdapter();
> 			}
> 		};
>@@ -221,11 +253,25 @@
> 	 */
> 	@Override
> 	public Adapter createAdapter(Notifier target) {
>-		return (Adapter)modelSwitch.doSwitch((EObject)target);
>+		return modelSwitch.doSwitch((EObject)target);
> 	}
> 
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType Access Timeout 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.ejb.AccessTimeoutType
>+	 * @generated
>+	 */
>+	public Adapter createAccessTimeoutTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.ActivationConfig Activation Config}'.
> 	 * 
> 	 * This default implementation returns null so that we can easily ignore cases;
>@@ -282,6 +328,20 @@
> 	}
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.AroundTimeoutType Around Timeout 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.ejb.AroundTimeoutType
>+	 * @generated
>+	 */
>+	public Adapter createAroundTimeoutTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.AssemblyDescriptor Assembly Descriptor}'.
> 	 * 
> 	 * This default implementation returns null so that we can easily ignore cases;
>@@ -296,6 +356,20 @@
> 	}
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType Async Method 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.ejb.AsyncMethodType
>+	 * @generated
>+	 */
>+	public Adapter createAsyncMethodTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.CMPField CMP Field}'.
> 	 * 
> 	 * This default implementation returns null so that we can easily ignore cases;
>@@ -324,6 +398,20 @@
> 	}
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType Concurrent Method 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.ejb.ConcurrentMethodType
>+	 * @generated
>+	 */
>+	public Adapter createConcurrentMethodTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.ContainerTransactionType Container Transaction Type}'.
> 	 * 
> 	 * This default implementation returns null so that we can easily ignore cases;
>@@ -338,6 +426,20 @@
> 	}
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.DependsOnType Depends On 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.ejb.DependsOnType
>+	 * @generated
>+	 */
>+	public Adapter createDependsOnTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.EJBJar EJB Jar}'.
> 	 * 
> 	 * This default implementation returns null so that we can easily ignore cases;
>@@ -674,6 +776,48 @@
> 	}
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType Stateful Timeout 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.ejb.StatefulTimeoutType
>+	 * @generated
>+	 */
>+	public Adapter createStatefulTimeoutTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType Timer Schedule 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.ejb.TimerScheduleType
>+	 * @generated
>+	 */
>+	public Adapter createTimerScheduleTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.javaee.ejb.TimerType Timer 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.ejb.TimerType
>+	 * @generated
>+	 */
>+	public Adapter createTimerTypeAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for the default case.
> 	 * 
> 	 * This default implementation returns null.
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLProcessor.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLProcessor.java,v
>retrieving revision 1.3
>diff -u -r1.3 EjbXMLProcessor.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLProcessor.java	9 Jun 2009 19:37:07 -0000	1.3
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLProcessor.java	14 Oct 2009 21:48:09 -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.ejb.internal.metadata.EjbPackage;
>@@ -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 EjbResourceFactoryImpl());
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbSwitch.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbSwitch.java,v
>retrieving revision 1.2
>diff -u -r1.2 EjbSwitch.java
>--- jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbSwitch.java	26 Jul 2007 16:56:15 -0000	1.2
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbSwitch.java	14 Oct 2009 21:48:09 -0000
>@@ -32,7 +32,7 @@
> * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage
> * @generated
> */
>-public class EjbSwitch {
>+public class EjbSwitch<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,197 +91,245 @@
> 	 * @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 EjbPackage.ACCESS_TIMEOUT_TYPE: {
>+				AccessTimeoutType accessTimeoutType = (AccessTimeoutType)theEObject;
>+				T result = caseAccessTimeoutType(accessTimeoutType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
> 			case EjbPackage.ACTIVATION_CONFIG: {
> 				ActivationConfig activationConfig = (ActivationConfig)theEObject;
>-				Object result = caseActivationConfig(activationConfig);
>+				T result = caseActivationConfig(activationConfig);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.ACTIVATION_CONFIG_PROPERTY: {
> 				ActivationConfigProperty activationConfigProperty = (ActivationConfigProperty)theEObject;
>-				Object result = caseActivationConfigProperty(activationConfigProperty);
>+				T result = caseActivationConfigProperty(activationConfigProperty);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.APPLICATION_EXCEPTION: {
> 				ApplicationException applicationException = (ApplicationException)theEObject;
>-				Object result = caseApplicationException(applicationException);
>+				T result = caseApplicationException(applicationException);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.AROUND_INVOKE_TYPE: {
> 				AroundInvokeType aroundInvokeType = (AroundInvokeType)theEObject;
>-				Object result = caseAroundInvokeType(aroundInvokeType);
>+				T result = caseAroundInvokeType(aroundInvokeType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case EjbPackage.AROUND_TIMEOUT_TYPE: {
>+				AroundTimeoutType aroundTimeoutType = (AroundTimeoutType)theEObject;
>+				T result = caseAroundTimeoutType(aroundTimeoutType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.ASSEMBLY_DESCRIPTOR: {
> 				AssemblyDescriptor assemblyDescriptor = (AssemblyDescriptor)theEObject;
>-				Object result = caseAssemblyDescriptor(assemblyDescriptor);
>+				T result = caseAssemblyDescriptor(assemblyDescriptor);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case EjbPackage.ASYNC_METHOD_TYPE: {
>+				AsyncMethodType asyncMethodType = (AsyncMethodType)theEObject;
>+				T result = caseAsyncMethodType(asyncMethodType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.CMP_FIELD: {
> 				CMPField cmpField = (CMPField)theEObject;
>-				Object result = caseCMPField(cmpField);
>+				T result = caseCMPField(cmpField);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.CMR_FIELD: {
> 				CMRField cmrField = (CMRField)theEObject;
>-				Object result = caseCMRField(cmrField);
>+				T result = caseCMRField(cmrField);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case EjbPackage.CONCURRENT_METHOD_TYPE: {
>+				ConcurrentMethodType concurrentMethodType = (ConcurrentMethodType)theEObject;
>+				T result = caseConcurrentMethodType(concurrentMethodType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.CONTAINER_TRANSACTION_TYPE: {
> 				ContainerTransactionType containerTransactionType = (ContainerTransactionType)theEObject;
>-				Object result = caseContainerTransactionType(containerTransactionType);
>+				T result = caseContainerTransactionType(containerTransactionType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case EjbPackage.DEPENDS_ON_TYPE: {
>+				DependsOnType dependsOnType = (DependsOnType)theEObject;
>+				T result = caseDependsOnType(dependsOnType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.EJB_JAR: {
> 				EJBJar ejbJar = (EJBJar)theEObject;
>-				Object result = caseEJBJar(ejbJar);
>+				T result = caseEJBJar(ejbJar);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.EJB_JAR_DEPLOYMENT_DESCRIPTOR: {
> 				EJBJarDeploymentDescriptor ejbJarDeploymentDescriptor = (EJBJarDeploymentDescriptor)theEObject;
>-				Object result = caseEJBJarDeploymentDescriptor(ejbJarDeploymentDescriptor);
>+				T result = caseEJBJarDeploymentDescriptor(ejbJarDeploymentDescriptor);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.EJB_RELATION: {
> 				EJBRelation ejbRelation = (EJBRelation)theEObject;
>-				Object result = caseEJBRelation(ejbRelation);
>+				T result = caseEJBRelation(ejbRelation);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.EJB_RELATIONSHIP_ROLE: {
> 				EJBRelationshipRole ejbRelationshipRole = (EJBRelationshipRole)theEObject;
>-				Object result = caseEJBRelationshipRole(ejbRelationshipRole);
>+				T result = caseEJBRelationshipRole(ejbRelationshipRole);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.ENTERPRISE_BEANS: {
> 				EnterpriseBeans enterpriseBeans = (EnterpriseBeans)theEObject;
>-				Object result = caseEnterpriseBeans(enterpriseBeans);
>+				T result = caseEnterpriseBeans(enterpriseBeans);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.ENTITY_BEAN: {
> 				EntityBean entityBean = (EntityBean)theEObject;
>-				Object result = caseEntityBean(entityBean);
>+				T result = caseEntityBean(entityBean);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.EXCLUDE_LIST: {
> 				ExcludeList excludeList = (ExcludeList)theEObject;
>-				Object result = caseExcludeList(excludeList);
>+				T result = caseExcludeList(excludeList);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.INIT_METHOD_TYPE: {
> 				InitMethodType initMethodType = (InitMethodType)theEObject;
>-				Object result = caseInitMethodType(initMethodType);
>+				T result = caseInitMethodType(initMethodType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.INTERCEPTOR_BINDING_TYPE: {
> 				InterceptorBindingType interceptorBindingType = (InterceptorBindingType)theEObject;
>-				Object result = caseInterceptorBindingType(interceptorBindingType);
>+				T result = caseInterceptorBindingType(interceptorBindingType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.INTERCEPTOR_ORDER_TYPE: {
> 				InterceptorOrderType interceptorOrderType = (InterceptorOrderType)theEObject;
>-				Object result = caseInterceptorOrderType(interceptorOrderType);
>+				T result = caseInterceptorOrderType(interceptorOrderType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.INTERCEPTORS_TYPE: {
> 				InterceptorsType interceptorsType = (InterceptorsType)theEObject;
>-				Object result = caseInterceptorsType(interceptorsType);
>+				T result = caseInterceptorsType(interceptorsType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.INTERCEPTOR_TYPE: {
> 				InterceptorType interceptorType = (InterceptorType)theEObject;
>-				Object result = caseInterceptorType(interceptorType);
>+				T result = caseInterceptorType(interceptorType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.MESSAGE_DRIVEN_BEAN: {
> 				MessageDrivenBean messageDrivenBean = (MessageDrivenBean)theEObject;
>-				Object result = caseMessageDrivenBean(messageDrivenBean);
>+				T result = caseMessageDrivenBean(messageDrivenBean);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.METHOD_PARAMS: {
> 				MethodParams methodParams = (MethodParams)theEObject;
>-				Object result = caseMethodParams(methodParams);
>+				T result = caseMethodParams(methodParams);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.METHOD_PERMISSION: {
> 				MethodPermission methodPermission = (MethodPermission)theEObject;
>-				Object result = caseMethodPermission(methodPermission);
>+				T result = caseMethodPermission(methodPermission);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.METHOD_TYPE: {
> 				MethodType methodType = (MethodType)theEObject;
>-				Object result = caseMethodType(methodType);
>+				T result = caseMethodType(methodType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.NAMED_METHOD_TYPE: {
> 				NamedMethodType namedMethodType = (NamedMethodType)theEObject;
>-				Object result = caseNamedMethodType(namedMethodType);
>+				T result = caseNamedMethodType(namedMethodType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.QUERY: {
> 				Query query = (Query)theEObject;
>-				Object result = caseQuery(query);
>+				T result = caseQuery(query);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.QUERY_METHOD: {
> 				QueryMethod queryMethod = (QueryMethod)theEObject;
>-				Object result = caseQueryMethod(queryMethod);
>+				T result = caseQueryMethod(queryMethod);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.RELATIONSHIP_ROLE_SOURCE_TYPE: {
> 				RelationshipRoleSourceType relationshipRoleSourceType = (RelationshipRoleSourceType)theEObject;
>-				Object result = caseRelationshipRoleSourceType(relationshipRoleSourceType);
>+				T result = caseRelationshipRoleSourceType(relationshipRoleSourceType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.RELATIONSHIPS: {
> 				Relationships relationships = (Relationships)theEObject;
>-				Object result = caseRelationships(relationships);
>+				T result = caseRelationships(relationships);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.REMOVE_METHOD_TYPE: {
> 				RemoveMethodType removeMethodType = (RemoveMethodType)theEObject;
>-				Object result = caseRemoveMethodType(removeMethodType);
>+				T result = caseRemoveMethodType(removeMethodType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.SECURITY_IDENTITY_TYPE: {
> 				SecurityIdentityType securityIdentityType = (SecurityIdentityType)theEObject;
>-				Object result = caseSecurityIdentityType(securityIdentityType);
>+				T result = caseSecurityIdentityType(securityIdentityType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
> 			case EjbPackage.SESSION_BEAN: {
> 				SessionBean sessionBean = (SessionBean)theEObject;
>-				Object result = caseSessionBean(sessionBean);
>+				T result = caseSessionBean(sessionBean);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE: {
>+				StatefulTimeoutType statefulTimeoutType = (StatefulTimeoutType)theEObject;
>+				T result = caseStatefulTimeoutType(statefulTimeoutType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case EjbPackage.TIMER_SCHEDULE_TYPE: {
>+				TimerScheduleType timerScheduleType = (TimerScheduleType)theEObject;
>+				T result = caseTimerScheduleType(timerScheduleType);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case EjbPackage.TIMER_TYPE: {
>+				TimerType timerType = (TimerType)theEObject;
>+				T result = caseTimerType(timerType);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
>@@ -290,497 +338,617 @@
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Activation Config'.
>+	 * Returns the result of interpreting the object as an instance of 'Access Timeout 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 'Access Timeout Type'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseAccessTimeoutType(AccessTimeoutType object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Activation Config'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Activation Config'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseActivationConfig(ActivationConfig object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Activation Config Property'.
>+	 * 
>+	 * 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 'Activation Config Property'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseActivationConfigProperty(ActivationConfigProperty object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Application Exception'.
>+	 * 
>+	 * 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 'Application Exception'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseApplicationException(ApplicationException object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Around Invoke 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 'Around Invoke Type'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseAroundInvokeType(AroundInvokeType object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Around Timeout 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 'Around Timeout Type'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseAroundTimeoutType(AroundTimeoutType object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Assembly Descriptor'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Assembly Descriptor'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseAssemblyDescriptor(AssemblyDescriptor object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Async Method 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 'Async Method Type'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseAsyncMethodType(AsyncMethodType object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'CMP Field'.
> 	 * 
> 	 * 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 'Activation Config'.
>+	 * @return the result of interpreting the object as an instance of 'CMP Field'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseActivationConfig(ActivationConfig object) {
>+	public T caseCMPField(CMPField object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Activation Config Property'.
>+	 * Returns the result of interpreting the object as an instance of 'CMR Field'.
> 	 * 
> 	 * 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 'Activation Config Property'.
>+	 * @return the result of interpreting the object as an instance of 'CMR Field'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseActivationConfigProperty(ActivationConfigProperty object) {
>+	public T caseCMRField(CMRField object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Application Exception'.
>+	 * Returns the result of interpreting the object as an instance of 'Concurrent Method 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 'Application Exception'.
>+	 * @return the result of interpreting the object as an instance of 'Concurrent Method Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseApplicationException(ApplicationException object) {
>+	public T caseConcurrentMethodType(ConcurrentMethodType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Around Invoke Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Container Transaction 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 'Around Invoke Type'.
>+	 * @return the result of interpreting the object as an instance of 'Container Transaction Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseAroundInvokeType(AroundInvokeType object) {
>+	public T caseContainerTransactionType(ContainerTransactionType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Assembly Descriptor'.
>+	 * Returns the result of interpreting the object as an instance of 'Depends On 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 'Assembly Descriptor'.
>+	 * @return the result of interpreting the object as an instance of 'Depends On Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseAssemblyDescriptor(AssemblyDescriptor object) {
>+	public T caseDependsOnType(DependsOnType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'CMP Field'.
>+	 * Returns the result of interpreting the object as an instance of 'EJB Jar'.
> 	 * 
> 	 * 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 'CMP Field'.
>+	 * @return the result of interpreting the object as an instance of 'EJB Jar'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseCMPField(CMPField object) {
>+	public T caseEJBJar(EJBJar object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'CMR Field'.
>+	 * Returns the result of interpreting the object as an instance of 'EJB Jar 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 'CMR Field'.
>+	 * @return the result of interpreting the object as an instance of 'EJB Jar Deployment Descriptor'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseCMRField(CMRField object) {
>+	public T caseEJBJarDeploymentDescriptor(EJBJarDeploymentDescriptor object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Container Transaction Type'.
>+	 * Returns the result of interpreting the object as an instance of 'EJB Relation'.
> 	 * 
> 	 * 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 'Container Transaction Type'.
>+	 * @return the result of interpreting the object as an instance of 'EJB Relation'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseContainerTransactionType(ContainerTransactionType object) {
>+	public T caseEJBRelation(EJBRelation object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'EJB Jar'.
>+	 * Returns the result of interpreting the object as an instance of 'EJB Relationship 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 'EJB Jar'.
>+	 * @return the result of interpreting the object as an instance of 'EJB Relationship Role'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseEJBJar(EJBJar object) {
>+	public T caseEJBRelationshipRole(EJBRelationshipRole object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'EJB Jar Deployment Descriptor'.
>+	 * Returns the result of interpreting the object as an instance of 'Enterprise Beans'.
> 	 * 
> 	 * 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 Jar Deployment Descriptor'.
>+	 * @return the result of interpreting the object as an instance of 'Enterprise Beans'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseEJBJarDeploymentDescriptor(EJBJarDeploymentDescriptor object) {
>+	public T caseEnterpriseBeans(EnterpriseBeans object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'EJB Relation'.
>+	 * Returns the result of interpreting the object as an instance of 'Entity Bean'.
> 	 * 
> 	 * 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 Relation'.
>+	 * @return the result of interpreting the object as an instance of 'Entity Bean'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseEJBRelation(EJBRelation object) {
>+	public T caseEntityBean(EntityBean object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'EJB Relationship Role'.
>+	 * Returns the result of interpreting the object as an instance of 'Exclude List'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpretting the object as an instance of 'EJB Relationship Role'.
>+	 * @return the result of interpreting the object as an instance of 'Exclude List'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseEJBRelationshipRole(EJBRelationshipRole object) {
>+	public T caseExcludeList(ExcludeList object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Enterprise Beans'.
>+	 * Returns the result of interpreting the object as an instance of 'Init Method 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 'Enterprise Beans'.
>+	 * @return the result of interpreting the object as an instance of 'Init Method Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseEnterpriseBeans(EnterpriseBeans object) {
>+	public T caseInitMethodType(InitMethodType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Entity Bean'.
>+	 * Returns the result of interpreting the object as an instance of 'Interceptor 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 'Entity Bean'.
>+	 * @return the result of interpreting the object as an instance of 'Interceptor Binding Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseEntityBean(EntityBean object) {
>+	public T caseInterceptorBindingType(InterceptorBindingType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Exclude List'.
>+	 * Returns the result of interpreting the object as an instance of 'Interceptor Order 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 'Exclude List'.
>+	 * @return the result of interpreting the object as an instance of 'Interceptor Order Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseExcludeList(ExcludeList object) {
>+	public T caseInterceptorOrderType(InterceptorOrderType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Init Method Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Interceptors 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 'Init Method Type'.
>+	 * @return the result of interpreting the object as an instance of 'Interceptors Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseInitMethodType(InitMethodType object) {
>+	public T caseInterceptorsType(InterceptorsType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Interceptor Binding Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Interceptor 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 'Interceptor Binding Type'.
>+	 * @return the result of interpreting the object as an instance of 'Interceptor Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseInterceptorBindingType(InterceptorBindingType object) {
>+	public T caseInterceptorType(InterceptorType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Interceptor Order Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Message Driven Bean'.
> 	 * 
> 	 * 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 'Interceptor Order Type'.
>+	 * @return the result of interpreting the object as an instance of 'Message Driven Bean'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseInterceptorOrderType(InterceptorOrderType object) {
>+	public T caseMessageDrivenBean(MessageDrivenBean object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Interceptors Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Method Params'.
> 	 * 
> 	 * 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 'Interceptors Type'.
>+	 * @return the result of interpreting the object as an instance of 'Method Params'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseInterceptorsType(InterceptorsType object) {
>+	public T caseMethodParams(MethodParams object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Interceptor Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Method Permission'.
> 	 * 
> 	 * 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 'Interceptor Type'.
>+	 * @return the result of interpreting the object as an instance of 'Method Permission'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseInterceptorType(InterceptorType object) {
>+	public T caseMethodPermission(MethodPermission object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Message Driven Bean'.
>+	 * Returns the result of interpreting the object as an instance of 'Method 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 'Message Driven Bean'.
>+	 * @return the result of interpreting the object as an instance of 'Method Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseMessageDrivenBean(MessageDrivenBean object) {
>+	public T caseMethodType(MethodType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Method Params'.
>+	 * Returns the result of interpreting the object as an instance of 'Named Method 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 'Method Params'.
>+	 * @return the result of interpreting the object as an instance of 'Named Method Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseMethodParams(MethodParams object) {
>+	public T caseNamedMethodType(NamedMethodType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Method Permission'.
>+	 * Returns the result of interpreting the object as an instance of 'Query'.
> 	 * 
> 	 * 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 'Method Permission'.
>+	 * @return the result of interpreting the object as an instance of 'Query'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseMethodPermission(MethodPermission object) {
>+	public T caseQuery(Query object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Method Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Query Method'.
> 	 * 
> 	 * 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 'Method Type'.
>+	 * @return the result of interpreting the object as an instance of 'Query Method'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseMethodType(MethodType object) {
>+	public T caseQueryMethod(QueryMethod object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Named Method Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Relationship Role 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 interpretting the object as an instance of 'Named Method Type'.
>+	 * @return the result of interpreting the object as an instance of 'Relationship Role Source Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseNamedMethodType(NamedMethodType object) {
>+	public T caseRelationshipRoleSourceType(RelationshipRoleSourceType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Query'.
>+	 * Returns the result of interpreting the object as an instance of 'Relationships'.
> 	 * 
> 	 * 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 'Query'.
>+	 * @return the result of interpreting the object as an instance of 'Relationships'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseQuery(Query object) {
>+	public T caseRelationships(Relationships object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Query Method'.
>+	 * Returns the result of interpreting the object as an instance of 'Remove Method 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 'Query Method'.
>+	 * @return the result of interpreting the object as an instance of 'Remove Method Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseQueryMethod(QueryMethod object) {
>+	public T caseRemoveMethodType(RemoveMethodType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Relationship Role Source Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Security Identity 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 'Relationship Role Source Type'.
>+	 * @return the result of interpreting the object as an instance of 'Security Identity Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseRelationshipRoleSourceType(RelationshipRoleSourceType object) {
>+	public T caseSecurityIdentityType(SecurityIdentityType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Relationships'.
>+	 * Returns the result of interpreting the object as an instance of 'Session Bean'.
> 	 * 
> 	 * 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 'Relationships'.
>+	 * @return the result of interpreting the object as an instance of 'Session Bean'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseRelationships(Relationships object) {
>+	public T caseSessionBean(SessionBean object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Remove Method Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Stateful Timeout 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 'Remove Method Type'.
>+	 * @return the result of interpreting the object as an instance of 'Stateful Timeout Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseRemoveMethodType(RemoveMethodType object) {
>+	public T caseStatefulTimeoutType(StatefulTimeoutType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Security Identity Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Timer Schedule 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 'Security Identity Type'.
>+	 * @return the result of interpreting the object as an instance of 'Timer Schedule Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseSecurityIdentityType(SecurityIdentityType object) {
>+	public T caseTimerScheduleType(TimerScheduleType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpretting the object as an instance of 'Session Bean'.
>+	 * Returns the result of interpreting the object as an instance of 'Timer 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 'Session Bean'.
>+	 * @return the result of interpreting the object as an instance of 'Timer Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public Object caseSessionBean(SessionBean object) {
>+	public T caseTimerType(TimerType 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/ejb/internal/impl/DependsOnTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/DependsOnTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/internal/impl/DependsOnTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/DependsOnTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,212 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb.internal.impl;
>+
>+import java.util.Collection;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.common.util.EList;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.emf.ecore.util.EDataTypeEList;
>+
>+import org.eclipse.jst.javaee.ejb.DependsOnType;
>+
>+import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Depends On Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.DependsOnTypeImpl#getEjbName Ejb Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.DependsOnTypeImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class DependsOnTypeImpl extends EObjectImpl implements DependsOnType {
>+	/**
>+	 * The cached value of the '{@link #getEjbName() Ejb Name}' attribute list.
>+	 * 
>+	 * 
>+	 * @see #getEjbName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<String> ejbName;
>+
>+	/**
>+	 * 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 DependsOnTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return EjbPackage.Literals.DEPENDS_ON_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<String> getEjbName() {
>+		if (ejbName == null) {
>+			ejbName = new EDataTypeEList<String>(String.class, this, EjbPackage.DEPENDS_ON_TYPE__EJB_NAME);
>+		}
>+		return ejbName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @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, EjbPackage.DEPENDS_ON_TYPE__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case EjbPackage.DEPENDS_ON_TYPE__EJB_NAME:
>+				return getEjbName();
>+			case EjbPackage.DEPENDS_ON_TYPE__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case EjbPackage.DEPENDS_ON_TYPE__EJB_NAME:
>+				getEjbName().clear();
>+				getEjbName().addAll((Collection<? extends String>)newValue);
>+				return;
>+			case EjbPackage.DEPENDS_ON_TYPE__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.DEPENDS_ON_TYPE__EJB_NAME:
>+				getEjbName().clear();
>+				return;
>+			case EjbPackage.DEPENDS_ON_TYPE__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.DEPENDS_ON_TYPE__EJB_NAME:
>+				return ejbName != null && !ejbName.isEmpty();
>+			case EjbPackage.DEPENDS_ON_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(" (ejbName: "); //$NON-NLS-1$
>+		result.append(ejbName);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //DependsOnTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/TimerTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/TimerTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/internal/impl/TimerTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/TimerTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,669 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb.internal.impl;
>+
>+import java.util.Collection;
>+import java.util.List;
>+
>+import javax.xml.datatype.XMLGregorianCalendar;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+
>+import org.eclipse.emf.common.util.EList;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
>+import org.eclipse.emf.ecore.util.InternalEList;
>+
>+import org.eclipse.jst.javaee.core.Description;
>+
>+import org.eclipse.jst.javaee.ejb.NamedMethodType;
>+import org.eclipse.jst.javaee.ejb.TimerScheduleType;
>+import org.eclipse.jst.javaee.ejb.TimerType;
>+
>+import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Timer Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl#getSchedule Schedule}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl#getStart Start}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl#getEnd End}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl#getTimeoutMethod Timeout Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl#isPersistent Persistent}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl#getTimezone Timezone}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl#getInfo Info}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerTypeImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class TimerTypeImpl extends EObjectImpl implements TimerType {
>+	/**
>+	 * The cached value of the '{@link #getDescription() Description}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getDescription()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<Description> description;
>+
>+	/**
>+	 * The cached value of the '{@link #getSchedule() Schedule}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getSchedule()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected TimerScheduleType schedule;
>+
>+	/**
>+	 * The default value of the '{@link #getStart() Start}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getStart()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final XMLGregorianCalendar START_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getStart() Start}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getStart()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected XMLGregorianCalendar start = START_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getEnd() End}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getEnd()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final XMLGregorianCalendar END_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getEnd() End}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getEnd()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected XMLGregorianCalendar end = END_EDEFAULT;
>+
>+	/**
>+	 * The cached value of the '{@link #getTimeoutMethod() Timeout Method}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getTimeoutMethod()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected NamedMethodType timeoutMethod;
>+
>+	/**
>+	 * The default value of the '{@link #isPersistent() Persistent}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isPersistent()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final boolean PERSISTENT_EDEFAULT = false;
>+
>+	/**
>+	 * The cached value of the '{@link #isPersistent() Persistent}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isPersistent()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean persistent = PERSISTENT_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Persistent attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean persistentESet;
>+
>+	/**
>+	 * The default value of the '{@link #getTimezone() Timezone}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getTimezone()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String TIMEZONE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getTimezone() Timezone}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getTimezone()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String timezone = TIMEZONE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getInfo() Info}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getInfo()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String INFO_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getInfo() Info}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getInfo()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String info = INFO_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 TimerTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return EjbPackage.Literals.TIMER_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public List<Description> getDescription() {
>+		if (description == null) {
>+			description = new EObjectContainmentEList<Description>(Description.class, this, EjbPackage.TIMER_TYPE__DESCRIPTION);
>+		}
>+		return description;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public TimerScheduleType getSchedule() {
>+		return schedule;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetSchedule(TimerScheduleType newSchedule, NotificationChain msgs) {
>+		TimerScheduleType oldSchedule = schedule;
>+		schedule = newSchedule;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_TYPE__SCHEDULE, oldSchedule, newSchedule);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setSchedule(TimerScheduleType newSchedule) {
>+		if (newSchedule != schedule) {
>+			NotificationChain msgs = null;
>+			if (schedule != null)
>+				msgs = ((InternalEObject)schedule).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.TIMER_TYPE__SCHEDULE, null, msgs);
>+			if (newSchedule != null)
>+				msgs = ((InternalEObject)newSchedule).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.TIMER_TYPE__SCHEDULE, null, msgs);
>+			msgs = basicSetSchedule(newSchedule, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_TYPE__SCHEDULE, newSchedule, newSchedule));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public XMLGregorianCalendar getStart() {
>+		return start;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setStart(XMLGregorianCalendar newStart) {
>+		XMLGregorianCalendar oldStart = start;
>+		start = newStart;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_TYPE__START, oldStart, start));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public XMLGregorianCalendar getEnd() {
>+		return end;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setEnd(XMLGregorianCalendar newEnd) {
>+		XMLGregorianCalendar oldEnd = end;
>+		end = newEnd;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_TYPE__END, oldEnd, end));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NamedMethodType getTimeoutMethod() {
>+		return timeoutMethod;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetTimeoutMethod(NamedMethodType newTimeoutMethod, NotificationChain msgs) {
>+		NamedMethodType oldTimeoutMethod = timeoutMethod;
>+		timeoutMethod = newTimeoutMethod;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_TYPE__TIMEOUT_METHOD, oldTimeoutMethod, newTimeoutMethod);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setTimeoutMethod(NamedMethodType newTimeoutMethod) {
>+		if (newTimeoutMethod != timeoutMethod) {
>+			NotificationChain msgs = null;
>+			if (timeoutMethod != null)
>+				msgs = ((InternalEObject)timeoutMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.TIMER_TYPE__TIMEOUT_METHOD, null, msgs);
>+			if (newTimeoutMethod != null)
>+				msgs = ((InternalEObject)newTimeoutMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.TIMER_TYPE__TIMEOUT_METHOD, null, msgs);
>+			msgs = basicSetTimeoutMethod(newTimeoutMethod, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_TYPE__TIMEOUT_METHOD, newTimeoutMethod, newTimeoutMethod));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isPersistent() {
>+		return persistent;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setPersistent(boolean newPersistent) {
>+		boolean oldPersistent = persistent;
>+		persistent = newPersistent;
>+		boolean oldPersistentESet = persistentESet;
>+		persistentESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_TYPE__PERSISTENT, oldPersistent, persistent, !oldPersistentESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetPersistent() {
>+		boolean oldPersistent = persistent;
>+		boolean oldPersistentESet = persistentESet;
>+		persistent = PERSISTENT_EDEFAULT;
>+		persistentESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.TIMER_TYPE__PERSISTENT, oldPersistent, PERSISTENT_EDEFAULT, oldPersistentESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetPersistent() {
>+		return persistentESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getTimezone() {
>+		return timezone;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setTimezone(String newTimezone) {
>+		String oldTimezone = timezone;
>+		timezone = newTimezone;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_TYPE__TIMEZONE, oldTimezone, timezone));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getInfo() {
>+		return info;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setInfo(String newInfo) {
>+		String oldInfo = info;
>+		info = newInfo;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_TYPE__INFO, oldInfo, info));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @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, EjbPackage.TIMER_TYPE__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case EjbPackage.TIMER_TYPE__DESCRIPTION:
>+				return ((InternalEList<?>)getDescription()).basicRemove(otherEnd, msgs);
>+			case EjbPackage.TIMER_TYPE__SCHEDULE:
>+				return basicSetSchedule(null, msgs);
>+			case EjbPackage.TIMER_TYPE__TIMEOUT_METHOD:
>+				return basicSetTimeoutMethod(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case EjbPackage.TIMER_TYPE__DESCRIPTION:
>+				return getDescription();
>+			case EjbPackage.TIMER_TYPE__SCHEDULE:
>+				return getSchedule();
>+			case EjbPackage.TIMER_TYPE__START:
>+				return getStart();
>+			case EjbPackage.TIMER_TYPE__END:
>+				return getEnd();
>+			case EjbPackage.TIMER_TYPE__TIMEOUT_METHOD:
>+				return getTimeoutMethod();
>+			case EjbPackage.TIMER_TYPE__PERSISTENT:
>+				return isPersistent();
>+			case EjbPackage.TIMER_TYPE__TIMEZONE:
>+				return getTimezone();
>+			case EjbPackage.TIMER_TYPE__INFO:
>+				return getInfo();
>+			case EjbPackage.TIMER_TYPE__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case EjbPackage.TIMER_TYPE__DESCRIPTION:
>+				getDescription().clear();
>+				getDescription().addAll((Collection<? extends Description>)newValue);
>+				return;
>+			case EjbPackage.TIMER_TYPE__SCHEDULE:
>+				setSchedule((TimerScheduleType)newValue);
>+				return;
>+			case EjbPackage.TIMER_TYPE__START:
>+				setStart((XMLGregorianCalendar)newValue);
>+				return;
>+			case EjbPackage.TIMER_TYPE__END:
>+				setEnd((XMLGregorianCalendar)newValue);
>+				return;
>+			case EjbPackage.TIMER_TYPE__TIMEOUT_METHOD:
>+				setTimeoutMethod((NamedMethodType)newValue);
>+				return;
>+			case EjbPackage.TIMER_TYPE__PERSISTENT:
>+				setPersistent((Boolean)newValue);
>+				return;
>+			case EjbPackage.TIMER_TYPE__TIMEZONE:
>+				setTimezone((String)newValue);
>+				return;
>+			case EjbPackage.TIMER_TYPE__INFO:
>+				setInfo((String)newValue);
>+				return;
>+			case EjbPackage.TIMER_TYPE__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.TIMER_TYPE__DESCRIPTION:
>+				getDescription().clear();
>+				return;
>+			case EjbPackage.TIMER_TYPE__SCHEDULE:
>+				setSchedule((TimerScheduleType)null);
>+				return;
>+			case EjbPackage.TIMER_TYPE__START:
>+				setStart(START_EDEFAULT);
>+				return;
>+			case EjbPackage.TIMER_TYPE__END:
>+				setEnd(END_EDEFAULT);
>+				return;
>+			case EjbPackage.TIMER_TYPE__TIMEOUT_METHOD:
>+				setTimeoutMethod((NamedMethodType)null);
>+				return;
>+			case EjbPackage.TIMER_TYPE__PERSISTENT:
>+				unsetPersistent();
>+				return;
>+			case EjbPackage.TIMER_TYPE__TIMEZONE:
>+				setTimezone(TIMEZONE_EDEFAULT);
>+				return;
>+			case EjbPackage.TIMER_TYPE__INFO:
>+				setInfo(INFO_EDEFAULT);
>+				return;
>+			case EjbPackage.TIMER_TYPE__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.TIMER_TYPE__DESCRIPTION:
>+				return description != null && !description.isEmpty();
>+			case EjbPackage.TIMER_TYPE__SCHEDULE:
>+				return schedule != null;
>+			case EjbPackage.TIMER_TYPE__START:
>+				return START_EDEFAULT == null ? start != null : !START_EDEFAULT.equals(start);
>+			case EjbPackage.TIMER_TYPE__END:
>+				return END_EDEFAULT == null ? end != null : !END_EDEFAULT.equals(end);
>+			case EjbPackage.TIMER_TYPE__TIMEOUT_METHOD:
>+				return timeoutMethod != null;
>+			case EjbPackage.TIMER_TYPE__PERSISTENT:
>+				return isSetPersistent();
>+			case EjbPackage.TIMER_TYPE__TIMEZONE:
>+				return TIMEZONE_EDEFAULT == null ? timezone != null : !TIMEZONE_EDEFAULT.equals(timezone);
>+			case EjbPackage.TIMER_TYPE__INFO:
>+				return INFO_EDEFAULT == null ? info != null : !INFO_EDEFAULT.equals(info);
>+			case EjbPackage.TIMER_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(" (start: "); //$NON-NLS-1$
>+		result.append(start);
>+		result.append(", end: "); //$NON-NLS-1$
>+		result.append(end);
>+		result.append(", persistent: "); //$NON-NLS-1$
>+		if (persistentESet) result.append(persistent); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", timezone: "); //$NON-NLS-1$
>+		result.append(timezone);
>+		result.append(", info: "); //$NON-NLS-1$
>+		result.append(info);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //TimerTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/ejb/DependsOnType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/DependsOnType.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/DependsOnType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/DependsOnType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,90 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb;
>+
>+import java.util.List;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Depends On Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The depends-onType is used to express initialization 
>+ * ordering dependencies between Singleton components.
>+ * The depends-onType specifies the names of one or more
>+ * Singleton beans in the same application as the referring
>+ * Singleton, each of which must be initialized before
>+ * the referring bean. 
>+ * 
>+ * Each dependent bean is expressed using ejb-link syntax.
>+ * The order in which dependent beans are initialized at 
>+ * runtime is not guaranteed to match the order in which
>+ * they are listed.
>+ * 
>+ * @since Java EE 6, EJB 3.1
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.DependsOnType#getEjbName Ejb Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.DependsOnType#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getDependsOnType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface DependsOnType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Ejb Name' attribute list.
>+	 * The list contents are of type {@link java.lang.String}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Ejb Name' attribute list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Ejb Name' attribute list.
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getDependsOnType_EjbName()
>+	 * @generated
>+	 */
>+	List<String> getEjbName();
>+
>+	/**
>+	 * 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.ejb.internal.metadata.EjbPackage#getDependsOnType_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.DependsOnType#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // DependsOnType
>Index: jee-models/org/eclipse/jst/javaee/ejb/TimerType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/TimerType.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/TimerType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/TimerType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,324 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb;
>+
>+import java.util.List;
>+
>+import javax.xml.datatype.XMLGregorianCalendar;
>+
>+import org.eclipse.jst.javaee.core.Description;
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Timer Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The timerType specifies an enterprise bean timer. Each
>+ * timer is automatically created by the container upon
>+ * deployment. Timer callbacks occur based on the 
>+ * schedule attributes. All callbacks are made to the
>+ * timeout-method associated with the timer. 
>+ * 
>+ * A timer can have an optional start and/or end date. If
>+ * a start date is specified, it takes precedence over the
>+ * associated timer schedule such that any matching
>+ * expirations prior to the start time will not occur.
>+ * Likewise, no matching expirations will occur after any
>+ * end date. Start/End dates are specified using the
>+ * XML Schema dateTime type, which follows the ISO-8601
>+ * standard for date(and optional time-within-the-day) 
>+ * representation.
>+ * 
>+ * An optional flag can be used to control whether
>+ * this timer has persistent(true) delivery semantics or
>+ * non-persistent(false) delivery semantics. If not specified,
>+ * the value defaults to persistent(true).
>+ * 
>+ * A time zone can optionally be associated with a timer.
>+ * If specified, the timer's schedule is evaluated in the context
>+ * of that time zone, regardless of the default time zone in which
>+ * the container is executing. Time zones are specified as an
>+ * ID string. The set of required time zone IDs is defined by
>+ * the Zone Name(TZ) column of the public domain zoneinfo database.
>+ * 
>+ * An optional info string can be assigned to the timer and 
>+ * retrieved at runtime through the Timer.getInfo() method.
>+ * 
>+ * The timerType can only be specified on stateless session
>+ * beans, singleton session beans, and message-driven beans.
>+ * 
>+ * @since Java EE 6, EJB 3.1
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerType#getDescription Description}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerType#getSchedule Schedule}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerType#getStart Start}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerType#getEnd End}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerType#getTimeoutMethod Timeout Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerType#isPersistent Persistent}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerType#getTimezone Timezone}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerType#getInfo Info}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerType#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface TimerType 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.ejb.internal.metadata.EjbPackage#getTimerType_Description()
>+	 * @generated
>+	 */
>+	List<Description> getDescription();
>+
>+	/**
>+	 * Returns the value of the 'Schedule' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Schedule' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Schedule' containment reference.
>+	 * @see #setSchedule(TimerScheduleType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerType_Schedule()
>+	 * @generated
>+	 */
>+	TimerScheduleType getSchedule();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerType#getSchedule Schedule}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Schedule' containment reference.
>+	 * @see #getSchedule()
>+	 * @generated
>+	 */
>+	void setSchedule(TimerScheduleType value);
>+
>+	/**
>+	 * Returns the value of the 'Start' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Start' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Start' attribute.
>+	 * @see #setStart(XMLGregorianCalendar)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerType_Start()
>+	 * @generated
>+	 */
>+	XMLGregorianCalendar getStart();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerType#getStart Start}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Start' attribute.
>+	 * @see #getStart()
>+	 * @generated
>+	 */
>+	void setStart(XMLGregorianCalendar value);
>+
>+	/**
>+	 * Returns the value of the 'End' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'End' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'End' attribute.
>+	 * @see #setEnd(XMLGregorianCalendar)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerType_End()
>+	 * @generated
>+	 */
>+	XMLGregorianCalendar getEnd();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerType#getEnd End}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'End' attribute.
>+	 * @see #getEnd()
>+	 * @generated
>+	 */
>+	void setEnd(XMLGregorianCalendar value);
>+
>+	/**
>+	 * Returns the value of the 'Timeout Method' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Timeout Method' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Timeout Method' containment reference.
>+	 * @see #setTimeoutMethod(NamedMethodType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerType_TimeoutMethod()
>+	 * @generated
>+	 */
>+	NamedMethodType getTimeoutMethod();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerType#getTimeoutMethod Timeout Method}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Timeout Method' containment reference.
>+	 * @see #getTimeoutMethod()
>+	 * @generated
>+	 */
>+	void setTimeoutMethod(NamedMethodType value);
>+
>+	/**
>+	 * Returns the value of the 'Persistent' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Persistent' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Persistent' attribute.
>+	 * @see #isSetPersistent()
>+	 * @see #unsetPersistent()
>+	 * @see #setPersistent(boolean)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerType_Persistent()
>+	 * @generated
>+	 */
>+	boolean isPersistent();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerType#isPersistent Persistent}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Persistent' attribute.
>+	 * @see #isSetPersistent()
>+	 * @see #unsetPersistent()
>+	 * @see #isPersistent()
>+	 * @generated
>+	 */
>+	void setPersistent(boolean value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerType#isPersistent Persistent}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetPersistent()
>+	 * @see #isPersistent()
>+	 * @see #setPersistent(boolean)
>+	 * @generated
>+	 */
>+	void unsetPersistent();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.TimerType#isPersistent Persistent}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Persistent' attribute is set.
>+	 * @see #unsetPersistent()
>+	 * @see #isPersistent()
>+	 * @see #setPersistent(boolean)
>+	 * @generated
>+	 */
>+	boolean isSetPersistent();
>+
>+	/**
>+	 * Returns the value of the 'Timezone' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Timezone' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Timezone' attribute.
>+	 * @see #setTimezone(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerType_Timezone()
>+	 * @generated
>+	 */
>+	String getTimezone();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerType#getTimezone Timezone}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Timezone' attribute.
>+	 * @see #getTimezone()
>+	 * @generated
>+	 */
>+	void setTimezone(String value);
>+
>+	/**
>+	 * Returns the value of the 'Info' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Info' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Info' attribute.
>+	 * @see #setInfo(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerType_Info()
>+	 * @generated
>+	 */
>+	String getInfo();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerType#getInfo Info}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Info' attribute.
>+	 * @see #getInfo()
>+	 * @generated
>+	 */
>+	void setInfo(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.ejb.internal.metadata.EjbPackage#getTimerType_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerType#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // TimerType
>Index: jee-models/org/eclipse/jst/javaee/ejb/ConcurrentLockTypeType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/ConcurrentLockTypeType.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/ConcurrentLockTypeType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/ConcurrentLockTypeType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,225 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb;
>+
>+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 'Concurrent Lock Type Type',
>+ * and utility methods for working with them.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * The concurrent-lock-typeType specifies how the container must
>+ * manage concurrent access to a method of a Singleton bean 
>+ * with container-managed concurrency.
>+ * 
>+ * The container managed concurrency lock type must be one 
>+ * of the following :
>+ * 
>+ * Read
>+ * Write
>+ * 
>+ * @since Java EE 6, EJB 3.1
>+ * 
>+ * 
>+ * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getConcurrentLockTypeType()
>+ * @generated
>+ */
>+public enum ConcurrentLockTypeType implements Enumerator {
>+	/**
>+	 * The 'Read' literal object.
>+	 * 
>+	 * 
>+	 * @see #READ_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	READ(0, "Read", "Read"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Write' literal object.
>+	 * 
>+	 * 
>+	 * @see #WRITE_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	WRITE(1, "Write", "Write"); //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Read' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Read' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #READ
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int READ_VALUE = 0;
>+
>+	/**
>+	 * The 'Write' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Write' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #WRITE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int WRITE_VALUE = 1;
>+
>+	/**
>+	 * An array of all the 'Concurrent Lock Type Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private static final ConcurrentLockTypeType[] VALUES_ARRAY =
>+		new ConcurrentLockTypeType[] {
>+			READ,
>+			WRITE,
>+		};
>+
>+	/**
>+	 * A public read-only list of all the 'Concurrent Lock Type Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final List<ConcurrentLockTypeType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+
>+	/**
>+	 * Returns the 'Concurrent Lock Type Type' literal with the specified literal value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static ConcurrentLockTypeType get(String literal) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			ConcurrentLockTypeType result = VALUES_ARRAY[i];
>+			if (result.toString().equals(literal)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Concurrent Lock Type Type' literal with the specified name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static ConcurrentLockTypeType getByName(String name) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			ConcurrentLockTypeType result = VALUES_ARRAY[i];
>+			if (result.getName().equals(name)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Concurrent Lock Type Type' literal with the specified integer value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static ConcurrentLockTypeType get(int value) {
>+		switch (value) {
>+			case READ_VALUE: return READ;
>+			case WRITE_VALUE: return WRITE;
>+		}
>+		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 ConcurrentLockTypeType(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;
>+	}
>+	
>+} //ConcurrentLockTypeType
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AsyncMethodTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AsyncMethodTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AsyncMethodTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AsyncMethodTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,392 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb.internal.impl;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.ejb.AsyncMethodType;
>+import org.eclipse.jst.javaee.ejb.MethodInterfaceType;
>+import org.eclipse.jst.javaee.ejb.MethodParams;
>+
>+import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Async Method Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getMethodName Method Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getMethodParams Method Params}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getMethodIntf Method Intf}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class AsyncMethodTypeImpl extends EObjectImpl implements AsyncMethodType {
>+	/**
>+	 * The default value of the '{@link #getMethodName() Method Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMethodName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String METHOD_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getMethodName() Method Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMethodName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String methodName = METHOD_NAME_EDEFAULT;
>+
>+	/**
>+	 * The cached value of the '{@link #getMethodParams() Method Params}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getMethodParams()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected MethodParams methodParams;
>+
>+	/**
>+	 * The default value of the '{@link #getMethodIntf() Method Intf}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMethodIntf()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final MethodInterfaceType METHOD_INTF_EDEFAULT = MethodInterfaceType.HOME_LITERAL;
>+
>+	/**
>+	 * The cached value of the '{@link #getMethodIntf() Method Intf}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMethodIntf()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected MethodInterfaceType methodIntf = METHOD_INTF_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Method Intf attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean methodIntfESet;
>+
>+	/**
>+	 * 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 AsyncMethodTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return EjbPackage.Literals.ASYNC_METHOD_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getMethodName() {
>+		return methodName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMethodName(String newMethodName) {
>+		String oldMethodName = methodName;
>+		methodName = newMethodName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ASYNC_METHOD_TYPE__METHOD_NAME, oldMethodName, methodName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public MethodParams getMethodParams() {
>+		return methodParams;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetMethodParams(MethodParams newMethodParams, NotificationChain msgs) {
>+		MethodParams oldMethodParams = methodParams;
>+		methodParams = newMethodParams;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS, oldMethodParams, newMethodParams);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMethodParams(MethodParams newMethodParams) {
>+		if (newMethodParams != methodParams) {
>+			NotificationChain msgs = null;
>+			if (methodParams != null)
>+				msgs = ((InternalEObject)methodParams).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS, null, msgs);
>+			if (newMethodParams != null)
>+				msgs = ((InternalEObject)newMethodParams).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS, null, msgs);
>+			msgs = basicSetMethodParams(newMethodParams, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS, newMethodParams, newMethodParams));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public MethodInterfaceType getMethodIntf() {
>+		return methodIntf;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMethodIntf(MethodInterfaceType newMethodIntf) {
>+		MethodInterfaceType oldMethodIntf = methodIntf;
>+		methodIntf = newMethodIntf == null ? METHOD_INTF_EDEFAULT : newMethodIntf;
>+		boolean oldMethodIntfESet = methodIntfESet;
>+		methodIntfESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF, oldMethodIntf, methodIntf, !oldMethodIntfESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetMethodIntf() {
>+		MethodInterfaceType oldMethodIntf = methodIntf;
>+		boolean oldMethodIntfESet = methodIntfESet;
>+		methodIntf = METHOD_INTF_EDEFAULT;
>+		methodIntfESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF, oldMethodIntf, METHOD_INTF_EDEFAULT, oldMethodIntfESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetMethodIntf() {
>+		return methodIntfESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @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, EjbPackage.ASYNC_METHOD_TYPE__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
>+				return basicSetMethodParams(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_NAME:
>+				return getMethodName();
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
>+				return getMethodParams();
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF:
>+				return getMethodIntf();
>+			case EjbPackage.ASYNC_METHOD_TYPE__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_NAME:
>+				setMethodName((String)newValue);
>+				return;
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
>+				setMethodParams((MethodParams)newValue);
>+				return;
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF:
>+				setMethodIntf((MethodInterfaceType)newValue);
>+				return;
>+			case EjbPackage.ASYNC_METHOD_TYPE__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_NAME:
>+				setMethodName(METHOD_NAME_EDEFAULT);
>+				return;
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
>+				setMethodParams((MethodParams)null);
>+				return;
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF:
>+				unsetMethodIntf();
>+				return;
>+			case EjbPackage.ASYNC_METHOD_TYPE__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_NAME:
>+				return METHOD_NAME_EDEFAULT == null ? methodName != null : !METHOD_NAME_EDEFAULT.equals(methodName);
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
>+				return methodParams != null;
>+			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF:
>+				return isSetMethodIntf();
>+			case EjbPackage.ASYNC_METHOD_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(" (methodName: "); //$NON-NLS-1$
>+		result.append(methodName);
>+		result.append(", methodIntf: "); //$NON-NLS-1$
>+		if (methodIntfESet) result.append(methodIntf); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //AsyncMethodTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AccessTimeoutTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AccessTimeoutTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AccessTimeoutTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AccessTimeoutTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,313 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb.internal.impl;
>+
>+import java.math.BigInteger;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.ejb.AccessTimeoutType;
>+import org.eclipse.jst.javaee.ejb.TimeUnitTypeType;
>+
>+import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Access Timeout Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AccessTimeoutTypeImpl#getTimeout Timeout}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AccessTimeoutTypeImpl#getUnit Unit}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AccessTimeoutTypeImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class AccessTimeoutTypeImpl extends EObjectImpl implements AccessTimeoutType {
>+	/**
>+	 * The default value of the '{@link #getTimeout() Timeout}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getTimeout()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final BigInteger TIMEOUT_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getTimeout() Timeout}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getTimeout()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected BigInteger timeout = TIMEOUT_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getUnit() Unit}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getUnit()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final TimeUnitTypeType UNIT_EDEFAULT = TimeUnitTypeType.DAYS;
>+
>+	/**
>+	 * The cached value of the '{@link #getUnit() Unit}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getUnit()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected TimeUnitTypeType unit = UNIT_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Unit attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean unitESet;
>+
>+	/**
>+	 * 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 AccessTimeoutTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return EjbPackage.Literals.ACCESS_TIMEOUT_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public BigInteger getTimeout() {
>+		return timeout;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setTimeout(BigInteger newTimeout) {
>+		BigInteger oldTimeout = timeout;
>+		timeout = newTimeout;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ACCESS_TIMEOUT_TYPE__TIMEOUT, oldTimeout, timeout));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public TimeUnitTypeType getUnit() {
>+		return unit;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setUnit(TimeUnitTypeType newUnit) {
>+		TimeUnitTypeType oldUnit = unit;
>+		unit = newUnit == null ? UNIT_EDEFAULT : newUnit;
>+		boolean oldUnitESet = unitESet;
>+		unitESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ACCESS_TIMEOUT_TYPE__UNIT, oldUnit, unit, !oldUnitESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetUnit() {
>+		TimeUnitTypeType oldUnit = unit;
>+		boolean oldUnitESet = unitESet;
>+		unit = UNIT_EDEFAULT;
>+		unitESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.ACCESS_TIMEOUT_TYPE__UNIT, oldUnit, UNIT_EDEFAULT, oldUnitESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetUnit() {
>+		return unitESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @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, EjbPackage.ACCESS_TIMEOUT_TYPE__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case EjbPackage.ACCESS_TIMEOUT_TYPE__TIMEOUT:
>+				return getTimeout();
>+			case EjbPackage.ACCESS_TIMEOUT_TYPE__UNIT:
>+				return getUnit();
>+			case EjbPackage.ACCESS_TIMEOUT_TYPE__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case EjbPackage.ACCESS_TIMEOUT_TYPE__TIMEOUT:
>+				setTimeout((BigInteger)newValue);
>+				return;
>+			case EjbPackage.ACCESS_TIMEOUT_TYPE__UNIT:
>+				setUnit((TimeUnitTypeType)newValue);
>+				return;
>+			case EjbPackage.ACCESS_TIMEOUT_TYPE__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.ACCESS_TIMEOUT_TYPE__TIMEOUT:
>+				setTimeout(TIMEOUT_EDEFAULT);
>+				return;
>+			case EjbPackage.ACCESS_TIMEOUT_TYPE__UNIT:
>+				unsetUnit();
>+				return;
>+			case EjbPackage.ACCESS_TIMEOUT_TYPE__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.ACCESS_TIMEOUT_TYPE__TIMEOUT:
>+				return TIMEOUT_EDEFAULT == null ? timeout != null : !TIMEOUT_EDEFAULT.equals(timeout);
>+			case EjbPackage.ACCESS_TIMEOUT_TYPE__UNIT:
>+				return isSetUnit();
>+			case EjbPackage.ACCESS_TIMEOUT_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(" (timeout: "); //$NON-NLS-1$
>+		result.append(timeout);
>+		result.append(", unit: "); //$NON-NLS-1$
>+		if (unitESet) result.append(unit); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //AccessTimeoutTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/TimerScheduleTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/TimerScheduleTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/internal/impl/TimerScheduleTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/TimerScheduleTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,546 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb.internal.impl;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.ejb.TimerScheduleType;
>+
>+import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Timer Schedule Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerScheduleTypeImpl#getSecond Second}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerScheduleTypeImpl#getMinute Minute}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerScheduleTypeImpl#getHour Hour}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerScheduleTypeImpl#getDayOfMonth Day Of Month}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerScheduleTypeImpl#getMonth Month}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerScheduleTypeImpl#getDayOfWeek Day Of Week}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerScheduleTypeImpl#getYear Year}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.TimerScheduleTypeImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class TimerScheduleTypeImpl extends EObjectImpl implements TimerScheduleType {
>+	/**
>+	 * The default value of the '{@link #getSecond() Second}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getSecond()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String SECOND_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getSecond() Second}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getSecond()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String second = SECOND_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getMinute() Minute}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMinute()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String MINUTE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getMinute() Minute}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMinute()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String minute = MINUTE_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getHour() Hour}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getHour()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String HOUR_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getHour() Hour}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getHour()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String hour = HOUR_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getDayOfMonth() Day Of Month}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getDayOfMonth()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String DAY_OF_MONTH_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getDayOfMonth() Day Of Month}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getDayOfMonth()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String dayOfMonth = DAY_OF_MONTH_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getMonth() Month}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMonth()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String MONTH_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getMonth() Month}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMonth()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String month = MONTH_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getDayOfWeek() Day Of Week}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getDayOfWeek()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String DAY_OF_WEEK_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getDayOfWeek() Day Of Week}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getDayOfWeek()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String dayOfWeek = DAY_OF_WEEK_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getYear() Year}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getYear()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String YEAR_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getYear() Year}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getYear()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String year = YEAR_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 TimerScheduleTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return EjbPackage.Literals.TIMER_SCHEDULE_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getSecond() {
>+		return second;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setSecond(String newSecond) {
>+		String oldSecond = second;
>+		second = newSecond;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_SCHEDULE_TYPE__SECOND, oldSecond, second));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getMinute() {
>+		return minute;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMinute(String newMinute) {
>+		String oldMinute = minute;
>+		minute = newMinute;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_SCHEDULE_TYPE__MINUTE, oldMinute, minute));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getHour() {
>+		return hour;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setHour(String newHour) {
>+		String oldHour = hour;
>+		hour = newHour;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_SCHEDULE_TYPE__HOUR, oldHour, hour));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getDayOfMonth() {
>+		return dayOfMonth;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setDayOfMonth(String newDayOfMonth) {
>+		String oldDayOfMonth = dayOfMonth;
>+		dayOfMonth = newDayOfMonth;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_SCHEDULE_TYPE__DAY_OF_MONTH, oldDayOfMonth, dayOfMonth));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getMonth() {
>+		return month;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMonth(String newMonth) {
>+		String oldMonth = month;
>+		month = newMonth;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_SCHEDULE_TYPE__MONTH, oldMonth, month));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getDayOfWeek() {
>+		return dayOfWeek;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setDayOfWeek(String newDayOfWeek) {
>+		String oldDayOfWeek = dayOfWeek;
>+		dayOfWeek = newDayOfWeek;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_SCHEDULE_TYPE__DAY_OF_WEEK, oldDayOfWeek, dayOfWeek));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getYear() {
>+		return year;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setYear(String newYear) {
>+		String oldYear = year;
>+		year = newYear;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.TIMER_SCHEDULE_TYPE__YEAR, oldYear, year));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @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, EjbPackage.TIMER_SCHEDULE_TYPE__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__SECOND:
>+				return getSecond();
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__MINUTE:
>+				return getMinute();
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__HOUR:
>+				return getHour();
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__DAY_OF_MONTH:
>+				return getDayOfMonth();
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__MONTH:
>+				return getMonth();
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__DAY_OF_WEEK:
>+				return getDayOfWeek();
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__YEAR:
>+				return getYear();
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__SECOND:
>+				setSecond((String)newValue);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__MINUTE:
>+				setMinute((String)newValue);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__HOUR:
>+				setHour((String)newValue);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__DAY_OF_MONTH:
>+				setDayOfMonth((String)newValue);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__MONTH:
>+				setMonth((String)newValue);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__DAY_OF_WEEK:
>+				setDayOfWeek((String)newValue);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__YEAR:
>+				setYear((String)newValue);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__SECOND:
>+				setSecond(SECOND_EDEFAULT);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__MINUTE:
>+				setMinute(MINUTE_EDEFAULT);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__HOUR:
>+				setHour(HOUR_EDEFAULT);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__DAY_OF_MONTH:
>+				setDayOfMonth(DAY_OF_MONTH_EDEFAULT);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__MONTH:
>+				setMonth(MONTH_EDEFAULT);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__DAY_OF_WEEK:
>+				setDayOfWeek(DAY_OF_WEEK_EDEFAULT);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__YEAR:
>+				setYear(YEAR_EDEFAULT);
>+				return;
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__SECOND:
>+				return SECOND_EDEFAULT == null ? second != null : !SECOND_EDEFAULT.equals(second);
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__MINUTE:
>+				return MINUTE_EDEFAULT == null ? minute != null : !MINUTE_EDEFAULT.equals(minute);
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__HOUR:
>+				return HOUR_EDEFAULT == null ? hour != null : !HOUR_EDEFAULT.equals(hour);
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__DAY_OF_MONTH:
>+				return DAY_OF_MONTH_EDEFAULT == null ? dayOfMonth != null : !DAY_OF_MONTH_EDEFAULT.equals(dayOfMonth);
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__MONTH:
>+				return MONTH_EDEFAULT == null ? month != null : !MONTH_EDEFAULT.equals(month);
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__DAY_OF_WEEK:
>+				return DAY_OF_WEEK_EDEFAULT == null ? dayOfWeek != null : !DAY_OF_WEEK_EDEFAULT.equals(dayOfWeek);
>+			case EjbPackage.TIMER_SCHEDULE_TYPE__YEAR:
>+				return YEAR_EDEFAULT == null ? year != null : !YEAR_EDEFAULT.equals(year);
>+			case EjbPackage.TIMER_SCHEDULE_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(" (second: "); //$NON-NLS-1$
>+		result.append(second);
>+		result.append(", minute: "); //$NON-NLS-1$
>+		result.append(minute);
>+		result.append(", hour: "); //$NON-NLS-1$
>+		result.append(hour);
>+		result.append(", dayOfMonth: "); //$NON-NLS-1$
>+		result.append(dayOfMonth);
>+		result.append(", month: "); //$NON-NLS-1$
>+		result.append(month);
>+		result.append(", dayOfWeek: "); //$NON-NLS-1$
>+		result.append(dayOfWeek);
>+		result.append(", year: "); //$NON-NLS-1$
>+		result.append(year);
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //TimerScheduleTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/ejb/ConcurrentMethodType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/ConcurrentMethodType.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/ConcurrentMethodType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/ConcurrentMethodType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,178 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Concurrent Method Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The concurrent-methodType specifies information about a method
>+ * of a bean with container managed concurrency.
>+ * 
>+ * The optional lock element specifies the kind of concurrency 
>+ * lock asssociated with the method.
>+ * 
>+ * The optional access-timeout element specifies the amount of
>+ * time (in a given time unit) the container should wait for a
>+ * concurrency lock before throwing an exception to the client.
>+ * 
>+ * @since Java EE 6, EJB 3.1
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getMethod Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getLock Lock}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getAccessTimeout Access Timeout}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getConcurrentMethodType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface ConcurrentMethodType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Method' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Method' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Method' containment reference.
>+	 * @see #setMethod(NamedMethodType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getConcurrentMethodType_Method()
>+	 * @generated
>+	 */
>+	NamedMethodType getMethod();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getMethod Method}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Method' containment reference.
>+	 * @see #getMethod()
>+	 * @generated
>+	 */
>+	void setMethod(NamedMethodType value);
>+
>+	/**
>+	 * Returns the value of the 'Lock' attribute.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Lock' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Lock' attribute.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType
>+	 * @see #isSetLock()
>+	 * @see #unsetLock()
>+	 * @see #setLock(ConcurrentLockTypeType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getConcurrentMethodType_Lock()
>+	 * @generated
>+	 */
>+	ConcurrentLockTypeType getLock();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getLock Lock}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Lock' attribute.
>+	 * @see org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType
>+	 * @see #isSetLock()
>+	 * @see #unsetLock()
>+	 * @see #getLock()
>+	 * @generated
>+	 */
>+	void setLock(ConcurrentLockTypeType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getLock Lock}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetLock()
>+	 * @see #getLock()
>+	 * @see #setLock(ConcurrentLockTypeType)
>+	 * @generated
>+	 */
>+	void unsetLock();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getLock Lock}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Lock' attribute is set.
>+	 * @see #unsetLock()
>+	 * @see #getLock()
>+	 * @see #setLock(ConcurrentLockTypeType)
>+	 * @generated
>+	 */
>+	boolean isSetLock();
>+
>+	/**
>+	 * Returns the value of the 'Access Timeout' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Access Timeout' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Access Timeout' containment reference.
>+	 * @see #setAccessTimeout(AccessTimeoutType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getConcurrentMethodType_AccessTimeout()
>+	 * @generated
>+	 */
>+	AccessTimeoutType getAccessTimeout();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getAccessTimeout Access Timeout}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Access Timeout' containment reference.
>+	 * @see #getAccessTimeout()
>+	 * @generated
>+	 */
>+	void setAccessTimeout(AccessTimeoutType 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.ejb.internal.metadata.EjbPackage#getConcurrentMethodType_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.ConcurrentMethodType#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // ConcurrentMethodType
>Index: jee-models/org/eclipse/jst/javaee/ejb/AccessTimeoutType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/AccessTimeoutType.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/AccessTimeoutType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/AccessTimeoutType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,149 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb;
>+
>+import java.math.BigInteger;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Access Timeout Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The access-timeoutType represents the maximum amount of
>+ * time (in a given time unit) that the container should wait for
>+ * a concurrency lock before throwing a timeout exception to the
>+ * client.
>+ * 
>+ * @since Java EE 6, EJB 3.1
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType#getTimeout Timeout}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType#getUnit Unit}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAccessTimeoutType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface AccessTimeoutType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Timeout' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Timeout' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Timeout' attribute.
>+	 * @see #setTimeout(BigInteger)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAccessTimeoutType_Timeout()
>+	 * @generated
>+	 */
>+	BigInteger getTimeout();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType#getTimeout Timeout}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Timeout' attribute.
>+	 * @see #getTimeout()
>+	 * @generated
>+	 */
>+	void setTimeout(BigInteger value);
>+
>+	/**
>+	 * Returns the value of the 'Unit' attribute.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.TimeUnitTypeType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Unit' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Unit' attribute.
>+	 * @see org.eclipse.jst.javaee.ejb.TimeUnitTypeType
>+	 * @see #isSetUnit()
>+	 * @see #unsetUnit()
>+	 * @see #setUnit(TimeUnitTypeType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAccessTimeoutType_Unit()
>+	 * @generated
>+	 */
>+	TimeUnitTypeType getUnit();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType#getUnit Unit}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Unit' attribute.
>+	 * @see org.eclipse.jst.javaee.ejb.TimeUnitTypeType
>+	 * @see #isSetUnit()
>+	 * @see #unsetUnit()
>+	 * @see #getUnit()
>+	 * @generated
>+	 */
>+	void setUnit(TimeUnitTypeType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType#getUnit Unit}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetUnit()
>+	 * @see #getUnit()
>+	 * @see #setUnit(TimeUnitTypeType)
>+	 * @generated
>+	 */
>+	void unsetUnit();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType#getUnit Unit}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Unit' attribute is set.
>+	 * @see #unsetUnit()
>+	 * @see #getUnit()
>+	 * @see #setUnit(TimeUnitTypeType)
>+	 * @generated
>+	 */
>+	boolean isSetUnit();
>+
>+	/**
>+	 * 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.ejb.internal.metadata.EjbPackage#getAccessTimeoutType_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AccessTimeoutType#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // AccessTimeoutType
>Index: jee-models/org/eclipse/jst/javaee/ejb/AsyncMethodType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/AsyncMethodType.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/AsyncMethodType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/AsyncMethodType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,175 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Async Method Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The async-methodType element specifies that a session
>+ * bean method has asynchronous invocation semantics.
>+ * 
>+ * The optional method-intf element constrains the async
>+ * method behavior to the client views of the given method-intf 
>+ * type. This value must be either Remote or Local. 
>+ * 
>+ * @since Java EE 6, EJB 3.1
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodName Method Name}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodParams Method Params}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf Method Intf}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAsyncMethodType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface AsyncMethodType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Method Name' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Method Name' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Method Name' attribute.
>+	 * @see #setMethodName(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAsyncMethodType_MethodName()
>+	 * @generated
>+	 */
>+	String getMethodName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodName Method Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Method Name' attribute.
>+	 * @see #getMethodName()
>+	 * @generated
>+	 */
>+	void setMethodName(String value);
>+
>+	/**
>+	 * Returns the value of the 'Method Params' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Method Params' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Method Params' containment reference.
>+	 * @see #setMethodParams(MethodParams)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAsyncMethodType_MethodParams()
>+	 * @generated
>+	 */
>+	MethodParams getMethodParams();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodParams Method Params}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Method Params' containment reference.
>+	 * @see #getMethodParams()
>+	 * @generated
>+	 */
>+	void setMethodParams(MethodParams value);
>+
>+	/**
>+	 * Returns the value of the 'Method Intf' attribute.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.MethodInterfaceType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Method Intf' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Method Intf' attribute.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
>+	 * @see #isSetMethodIntf()
>+	 * @see #unsetMethodIntf()
>+	 * @see #setMethodIntf(MethodInterfaceType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAsyncMethodType_MethodIntf()
>+	 * @generated
>+	 */
>+	MethodInterfaceType getMethodIntf();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf Method Intf}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Method Intf' attribute.
>+	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
>+	 * @see #isSetMethodIntf()
>+	 * @see #unsetMethodIntf()
>+	 * @see #getMethodIntf()
>+	 * @generated
>+	 */
>+	void setMethodIntf(MethodInterfaceType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf Method Intf}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetMethodIntf()
>+	 * @see #getMethodIntf()
>+	 * @see #setMethodIntf(MethodInterfaceType)
>+	 * @generated
>+	 */
>+	void unsetMethodIntf();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf Method Intf}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Method Intf' attribute is set.
>+	 * @see #unsetMethodIntf()
>+	 * @see #getMethodIntf()
>+	 * @see #setMethodIntf(MethodInterfaceType)
>+	 * @generated
>+	 */
>+	boolean isSetMethodIntf();
>+
>+	/**
>+	 * 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.ejb.internal.metadata.EjbPackage#getAsyncMethodType_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // AsyncMethodType
>Index: jee-models/org/eclipse/jst/javaee/ejb/TimerScheduleType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/TimerScheduleType.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/TimerScheduleType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/TimerScheduleType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,241 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Timer Schedule Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * @since Java EE 6, EJB 3.1
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getSecond Second}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getMinute Minute}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getHour Hour}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getDayOfMonth Day Of Month}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getMonth Month}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getDayOfWeek Day Of Week}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getYear Year}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerScheduleType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface TimerScheduleType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Second' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Second' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Second' attribute.
>+	 * @see #setSecond(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerScheduleType_Second()
>+	 * @generated
>+	 */
>+	String getSecond();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getSecond Second}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Second' attribute.
>+	 * @see #getSecond()
>+	 * @generated
>+	 */
>+	void setSecond(String value);
>+
>+	/**
>+	 * Returns the value of the 'Minute' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Minute' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Minute' attribute.
>+	 * @see #setMinute(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerScheduleType_Minute()
>+	 * @generated
>+	 */
>+	String getMinute();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getMinute Minute}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Minute' attribute.
>+	 * @see #getMinute()
>+	 * @generated
>+	 */
>+	void setMinute(String value);
>+
>+	/**
>+	 * Returns the value of the 'Hour' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Hour' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Hour' attribute.
>+	 * @see #setHour(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerScheduleType_Hour()
>+	 * @generated
>+	 */
>+	String getHour();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getHour Hour}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Hour' attribute.
>+	 * @see #getHour()
>+	 * @generated
>+	 */
>+	void setHour(String value);
>+
>+	/**
>+	 * Returns the value of the 'Day Of Month' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Day Of Month' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Day Of Month' attribute.
>+	 * @see #setDayOfMonth(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerScheduleType_DayOfMonth()
>+	 * @generated
>+	 */
>+	String getDayOfMonth();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getDayOfMonth Day Of Month}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Day Of Month' attribute.
>+	 * @see #getDayOfMonth()
>+	 * @generated
>+	 */
>+	void setDayOfMonth(String value);
>+
>+	/**
>+	 * Returns the value of the 'Month' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Month' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Month' attribute.
>+	 * @see #setMonth(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerScheduleType_Month()
>+	 * @generated
>+	 */
>+	String getMonth();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getMonth Month}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Month' attribute.
>+	 * @see #getMonth()
>+	 * @generated
>+	 */
>+	void setMonth(String value);
>+
>+	/**
>+	 * Returns the value of the 'Day Of Week' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Day Of Week' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Day Of Week' attribute.
>+	 * @see #setDayOfWeek(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerScheduleType_DayOfWeek()
>+	 * @generated
>+	 */
>+	String getDayOfWeek();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getDayOfWeek Day Of Week}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Day Of Week' attribute.
>+	 * @see #getDayOfWeek()
>+	 * @generated
>+	 */
>+	void setDayOfWeek(String value);
>+
>+	/**
>+	 * Returns the value of the 'Year' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Year' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Year' attribute.
>+	 * @see #setYear(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimerScheduleType_Year()
>+	 * @generated
>+	 */
>+	String getYear();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getYear Year}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Year' attribute.
>+	 * @see #getYear()
>+	 * @generated
>+	 */
>+	void setYear(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.ejb.internal.metadata.EjbPackage#getTimerScheduleType_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.TimerScheduleType#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // TimerScheduleType
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ConcurrentMethodTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ConcurrentMethodTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ConcurrentMethodTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/ConcurrentMethodTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,405 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb.internal.impl;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.ejb.AccessTimeoutType;
>+import org.eclipse.jst.javaee.ejb.ConcurrentLockTypeType;
>+import org.eclipse.jst.javaee.ejb.ConcurrentMethodType;
>+import org.eclipse.jst.javaee.ejb.NamedMethodType;
>+
>+import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Concurrent Method Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ConcurrentMethodTypeImpl#getMethod Method}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ConcurrentMethodTypeImpl#getLock Lock}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ConcurrentMethodTypeImpl#getAccessTimeout Access Timeout}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.ConcurrentMethodTypeImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ConcurrentMethodTypeImpl extends EObjectImpl implements ConcurrentMethodType {
>+	/**
>+	 * The cached value of the '{@link #getMethod() Method}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getMethod()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected NamedMethodType method;
>+
>+	/**
>+	 * The default value of the '{@link #getLock() Lock}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLock()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final ConcurrentLockTypeType LOCK_EDEFAULT = ConcurrentLockTypeType.READ;
>+
>+	/**
>+	 * The cached value of the '{@link #getLock() Lock}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getLock()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected ConcurrentLockTypeType lock = LOCK_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Lock attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean lockESet;
>+
>+	/**
>+	 * The cached value of the '{@link #getAccessTimeout() Access Timeout}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getAccessTimeout()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected AccessTimeoutType accessTimeout;
>+
>+	/**
>+	 * 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 ConcurrentMethodTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return EjbPackage.Literals.CONCURRENT_METHOD_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NamedMethodType getMethod() {
>+		return method;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetMethod(NamedMethodType newMethod, NotificationChain msgs) {
>+		NamedMethodType oldMethod = method;
>+		method = newMethod;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.CONCURRENT_METHOD_TYPE__METHOD, oldMethod, newMethod);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMethod(NamedMethodType newMethod) {
>+		if (newMethod != method) {
>+			NotificationChain msgs = null;
>+			if (method != null)
>+				msgs = ((InternalEObject)method).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.CONCURRENT_METHOD_TYPE__METHOD, null, msgs);
>+			if (newMethod != null)
>+				msgs = ((InternalEObject)newMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.CONCURRENT_METHOD_TYPE__METHOD, null, msgs);
>+			msgs = basicSetMethod(newMethod, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CONCURRENT_METHOD_TYPE__METHOD, newMethod, newMethod));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ConcurrentLockTypeType getLock() {
>+		return lock;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setLock(ConcurrentLockTypeType newLock) {
>+		ConcurrentLockTypeType oldLock = lock;
>+		lock = newLock == null ? LOCK_EDEFAULT : newLock;
>+		boolean oldLockESet = lockESet;
>+		lockESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CONCURRENT_METHOD_TYPE__LOCK, oldLock, lock, !oldLockESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetLock() {
>+		ConcurrentLockTypeType oldLock = lock;
>+		boolean oldLockESet = lockESet;
>+		lock = LOCK_EDEFAULT;
>+		lockESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.CONCURRENT_METHOD_TYPE__LOCK, oldLock, LOCK_EDEFAULT, oldLockESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetLock() {
>+		return lockESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public AccessTimeoutType getAccessTimeout() {
>+		return accessTimeout;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetAccessTimeout(AccessTimeoutType newAccessTimeout, NotificationChain msgs) {
>+		AccessTimeoutType oldAccessTimeout = accessTimeout;
>+		accessTimeout = newAccessTimeout;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.CONCURRENT_METHOD_TYPE__ACCESS_TIMEOUT, oldAccessTimeout, newAccessTimeout);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setAccessTimeout(AccessTimeoutType newAccessTimeout) {
>+		if (newAccessTimeout != accessTimeout) {
>+			NotificationChain msgs = null;
>+			if (accessTimeout != null)
>+				msgs = ((InternalEObject)accessTimeout).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.CONCURRENT_METHOD_TYPE__ACCESS_TIMEOUT, null, msgs);
>+			if (newAccessTimeout != null)
>+				msgs = ((InternalEObject)newAccessTimeout).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.CONCURRENT_METHOD_TYPE__ACCESS_TIMEOUT, null, msgs);
>+			msgs = basicSetAccessTimeout(newAccessTimeout, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CONCURRENT_METHOD_TYPE__ACCESS_TIMEOUT, newAccessTimeout, newAccessTimeout));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @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, EjbPackage.CONCURRENT_METHOD_TYPE__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__METHOD:
>+				return basicSetMethod(null, msgs);
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__ACCESS_TIMEOUT:
>+				return basicSetAccessTimeout(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__METHOD:
>+				return getMethod();
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__LOCK:
>+				return getLock();
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__ACCESS_TIMEOUT:
>+				return getAccessTimeout();
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__METHOD:
>+				setMethod((NamedMethodType)newValue);
>+				return;
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__LOCK:
>+				setLock((ConcurrentLockTypeType)newValue);
>+				return;
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__ACCESS_TIMEOUT:
>+				setAccessTimeout((AccessTimeoutType)newValue);
>+				return;
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__METHOD:
>+				setMethod((NamedMethodType)null);
>+				return;
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__LOCK:
>+				unsetLock();
>+				return;
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__ACCESS_TIMEOUT:
>+				setAccessTimeout((AccessTimeoutType)null);
>+				return;
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__METHOD:
>+				return method != null;
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__LOCK:
>+				return isSetLock();
>+			case EjbPackage.CONCURRENT_METHOD_TYPE__ACCESS_TIMEOUT:
>+				return accessTimeout != null;
>+			case EjbPackage.CONCURRENT_METHOD_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(" (lock: "); //$NON-NLS-1$
>+		if (lockESet) result.append(lock); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //ConcurrentMethodTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/StatefulTimeoutTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/StatefulTimeoutTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/internal/impl/StatefulTimeoutTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/StatefulTimeoutTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,313 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb.internal.impl;
>+
>+import java.math.BigInteger;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.ejb.StatefulTimeoutType;
>+import org.eclipse.jst.javaee.ejb.TimeUnitTypeType;
>+
>+import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Stateful Timeout Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.StatefulTimeoutTypeImpl#getTimeout Timeout}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.StatefulTimeoutTypeImpl#getUnit Unit}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.StatefulTimeoutTypeImpl#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class StatefulTimeoutTypeImpl extends EObjectImpl implements StatefulTimeoutType {
>+	/**
>+	 * The default value of the '{@link #getTimeout() Timeout}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getTimeout()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final BigInteger TIMEOUT_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getTimeout() Timeout}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getTimeout()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected BigInteger timeout = TIMEOUT_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getUnit() Unit}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getUnit()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final TimeUnitTypeType UNIT_EDEFAULT = TimeUnitTypeType.DAYS;
>+
>+	/**
>+	 * The cached value of the '{@link #getUnit() Unit}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getUnit()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected TimeUnitTypeType unit = UNIT_EDEFAULT;
>+
>+	/**
>+	 * This is true if the Unit attribute has been set.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected boolean unitESet;
>+
>+	/**
>+	 * 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 StatefulTimeoutTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return EjbPackage.Literals.STATEFUL_TIMEOUT_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public BigInteger getTimeout() {
>+		return timeout;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setTimeout(BigInteger newTimeout) {
>+		BigInteger oldTimeout = timeout;
>+		timeout = newTimeout;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.STATEFUL_TIMEOUT_TYPE__TIMEOUT, oldTimeout, timeout));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public TimeUnitTypeType getUnit() {
>+		return unit;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setUnit(TimeUnitTypeType newUnit) {
>+		TimeUnitTypeType oldUnit = unit;
>+		unit = newUnit == null ? UNIT_EDEFAULT : newUnit;
>+		boolean oldUnitESet = unitESet;
>+		unitESet = true;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.STATEFUL_TIMEOUT_TYPE__UNIT, oldUnit, unit, !oldUnitESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void unsetUnit() {
>+		TimeUnitTypeType oldUnit = unit;
>+		boolean oldUnitESet = unitESet;
>+		unit = UNIT_EDEFAULT;
>+		unitESet = false;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.STATEFUL_TIMEOUT_TYPE__UNIT, oldUnit, UNIT_EDEFAULT, oldUnitESet));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean isSetUnit() {
>+		return unitESet;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @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, EjbPackage.STATEFUL_TIMEOUT_TYPE__ID, oldId, id));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE__TIMEOUT:
>+				return getTimeout();
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE__UNIT:
>+				return getUnit();
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE__ID:
>+				return getId();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE__TIMEOUT:
>+				setTimeout((BigInteger)newValue);
>+				return;
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE__UNIT:
>+				setUnit((TimeUnitTypeType)newValue);
>+				return;
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE__ID:
>+				setId((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE__TIMEOUT:
>+				setTimeout(TIMEOUT_EDEFAULT);
>+				return;
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE__UNIT:
>+				unsetUnit();
>+				return;
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE__ID:
>+				setId(ID_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE__TIMEOUT:
>+				return TIMEOUT_EDEFAULT == null ? timeout != null : !TIMEOUT_EDEFAULT.equals(timeout);
>+			case EjbPackage.STATEFUL_TIMEOUT_TYPE__UNIT:
>+				return isSetUnit();
>+			case EjbPackage.STATEFUL_TIMEOUT_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(" (timeout: "); //$NON-NLS-1$
>+		result.append(timeout);
>+		result.append(", unit: "); //$NON-NLS-1$
>+		if (unitESet) result.append(unit); else result.append("<unset>"); //$NON-NLS-1$
>+		result.append(", id: "); //$NON-NLS-1$
>+		result.append(id);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //StatefulTimeoutTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AroundTimeoutTypeImpl.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AroundTimeoutTypeImpl.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AroundTimeoutTypeImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AroundTimeoutTypeImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,222 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb.internal.impl;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.jst.javaee.ejb.AroundTimeoutType;
>+
>+import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Around Timeout Type'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AroundTimeoutTypeImpl#getClass_ Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AroundTimeoutTypeImpl#getMethodName Method Name}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class AroundTimeoutTypeImpl extends EObjectImpl implements AroundTimeoutType {
>+	/**
>+	 * The default value of the '{@link #getClass_() Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getClass_()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String CLASS_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getClass_() Class}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getClass_()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String class_ = CLASS_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getMethodName() Method Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMethodName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String METHOD_NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getMethodName() Method Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getMethodName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String methodName = METHOD_NAME_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected AroundTimeoutTypeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return EjbPackage.Literals.AROUND_TIMEOUT_TYPE;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getClass_() {
>+		return class_;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setClass(String newClass) {
>+		String oldClass = class_;
>+		class_ = newClass;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.AROUND_TIMEOUT_TYPE__CLASS, oldClass, class_));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getMethodName() {
>+		return methodName;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setMethodName(String newMethodName) {
>+		String oldMethodName = methodName;
>+		methodName = newMethodName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.AROUND_TIMEOUT_TYPE__METHOD_NAME, oldMethodName, methodName));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case EjbPackage.AROUND_TIMEOUT_TYPE__CLASS:
>+				return getClass_();
>+			case EjbPackage.AROUND_TIMEOUT_TYPE__METHOD_NAME:
>+				return getMethodName();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case EjbPackage.AROUND_TIMEOUT_TYPE__CLASS:
>+				setClass((String)newValue);
>+				return;
>+			case EjbPackage.AROUND_TIMEOUT_TYPE__METHOD_NAME:
>+				setMethodName((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.AROUND_TIMEOUT_TYPE__CLASS:
>+				setClass(CLASS_EDEFAULT);
>+				return;
>+			case EjbPackage.AROUND_TIMEOUT_TYPE__METHOD_NAME:
>+				setMethodName(METHOD_NAME_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case EjbPackage.AROUND_TIMEOUT_TYPE__CLASS:
>+				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
>+			case EjbPackage.AROUND_TIMEOUT_TYPE__METHOD_NAME:
>+				return METHOD_NAME_EDEFAULT == null ? methodName != null : !METHOD_NAME_EDEFAULT.equals(methodName);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (class: "); //$NON-NLS-1$
>+		result.append(class_);
>+		result.append(", methodName: "); //$NON-NLS-1$
>+		result.append(methodName);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //AroundTimeoutTypeImpl
>Index: jee-models/org/eclipse/jst/javaee/ejb/StatefulTimeoutType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/StatefulTimeoutType.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/StatefulTimeoutType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/StatefulTimeoutType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,148 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb;
>+
>+import java.math.BigInteger;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Stateful Timeout Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The stateful-timeoutType represents the amount of time
>+ * a stateful session bean can be idle(not receive any client
>+ * invocations) before it is eligible for removal by the container.
>+ * 
>+ * @since Java EE 6, EJB 3.1
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getTimeout Timeout}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getUnit Unit}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getId Id}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getStatefulTimeoutType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface StatefulTimeoutType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Timeout' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Timeout' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Timeout' attribute.
>+	 * @see #setTimeout(BigInteger)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getStatefulTimeoutType_Timeout()
>+	 * @generated
>+	 */
>+	BigInteger getTimeout();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getTimeout Timeout}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Timeout' attribute.
>+	 * @see #getTimeout()
>+	 * @generated
>+	 */
>+	void setTimeout(BigInteger value);
>+
>+	/**
>+	 * Returns the value of the 'Unit' attribute.
>+	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.TimeUnitTypeType}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Unit' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Unit' attribute.
>+	 * @see org.eclipse.jst.javaee.ejb.TimeUnitTypeType
>+	 * @see #isSetUnit()
>+	 * @see #unsetUnit()
>+	 * @see #setUnit(TimeUnitTypeType)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getStatefulTimeoutType_Unit()
>+	 * @generated
>+	 */
>+	TimeUnitTypeType getUnit();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getUnit Unit}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Unit' attribute.
>+	 * @see org.eclipse.jst.javaee.ejb.TimeUnitTypeType
>+	 * @see #isSetUnit()
>+	 * @see #unsetUnit()
>+	 * @see #getUnit()
>+	 * @generated
>+	 */
>+	void setUnit(TimeUnitTypeType value);
>+
>+	/**
>+	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getUnit Unit}' attribute.
>+	 * 
>+	 * 
>+	 * @see #isSetUnit()
>+	 * @see #getUnit()
>+	 * @see #setUnit(TimeUnitTypeType)
>+	 * @generated
>+	 */
>+	void unsetUnit();
>+
>+	/**
>+	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getUnit Unit}' attribute is set.
>+	 * 
>+	 * 
>+	 * @return whether the value of the 'Unit' attribute is set.
>+	 * @see #unsetUnit()
>+	 * @see #getUnit()
>+	 * @see #setUnit(TimeUnitTypeType)
>+	 * @generated
>+	 */
>+	boolean isSetUnit();
>+
>+	/**
>+	 * 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.ejb.internal.metadata.EjbPackage#getStatefulTimeoutType_Id()
>+	 * @generated
>+	 */
>+	String getId();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.StatefulTimeoutType#getId Id}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Id' attribute.
>+	 * @see #getId()
>+	 * @generated
>+	 */
>+	void setId(String value);
>+
>+} // StatefulTimeoutType
>Index: jee-models/org/eclipse/jst/javaee/ejb/AroundTimeoutType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/AroundTimeoutType.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/AroundTimeoutType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/AroundTimeoutType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,98 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb;
>+
>+import org.eclipse.jst.javaee.core.JavaEEObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Around Timeout Type'.
>+ * 
>+ *
>+ * 
>+ * 
>+ * 
>+ * The around-timeout type specifies a method on a
>+ * class to be called during the around-timeout portion of
>+ * a timer timeout callback. Note that each class may have 
>+ * only one around-timeout method and that the method may not 
>+ * be overloaded.
>+ * 
>+ * If the class element is missing then
>+ * the class defining the callback is assumed to be the
>+ * interceptor class or component class in scope at the
>+ * location in the descriptor in which the around-timeout
>+ * definition appears.
>+ * 
>+ * @since Java EE 6, EJB 3.1
>+ * 
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.AroundTimeoutType#getClass_ Class}</li>
>+ * <li>{@link org.eclipse.jst.javaee.ejb.AroundTimeoutType#getMethodName Method Name}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAroundTimeoutType()
>+ * @extends JavaEEObject
>+ * @generated
>+ */
>+public interface AroundTimeoutType extends JavaEEObject {
>+	/**
>+	 * Returns the value of the 'Class' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Class' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Class' attribute.
>+	 * @see #setClass(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAroundTimeoutType_Class()
>+	 * @generated
>+	 */
>+	String getClass_();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AroundTimeoutType#getClass_ Class}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Class' attribute.
>+	 * @see #getClass_()
>+	 * @generated
>+	 */
>+	void setClass(String value);
>+
>+	/**
>+	 * Returns the value of the 'Method Name' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Method Name' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Method Name' attribute.
>+	 * @see #setMethodName(String)
>+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAroundTimeoutType_MethodName()
>+	 * @generated
>+	 */
>+	String getMethodName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AroundTimeoutType#getMethodName Method Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Method Name' attribute.
>+	 * @see #getMethodName()
>+	 * @generated
>+	 */
>+	void setMethodName(String value);
>+
>+} // AroundTimeoutType
>Index: jee-models/org/eclipse/jst/javaee/ejb/TimeUnitTypeType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/TimeUnitTypeType.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/TimeUnitTypeType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/TimeUnitTypeType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,358 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb;
>+
>+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 'Time Unit Type Type',
>+ * and utility methods for working with them.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * The time-unit-typeType represents a time duration at a given
>+ * unit of granularity. 
>+ * 
>+ * The time unit type must be one of the following :
>+ * 
>+ * Days
>+ * Hours
>+ * Minutes
>+ * Seconds
>+ * Milliseconds
>+ * Microseconds
>+ * Nanoseconds
>+ * 
>+ * @since Java EE 6, EJB 3.1
>+ * 
>+ * 
>+ * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getTimeUnitTypeType()
>+ * @generated
>+ */
>+public enum TimeUnitTypeType implements Enumerator {
>+	/**
>+	 * The 'Days' literal object.
>+	 * 
>+	 * 
>+	 * @see #DAYS_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	DAYS(0, "Days", "Days"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Hours' literal object.
>+	 * 
>+	 * 
>+	 * @see #HOURS_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	HOURS(1, "Hours", "Hours"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Minutes' literal object.
>+	 * 
>+	 * 
>+	 * @see #MINUTES_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	MINUTES(2, "Minutes", "Minutes"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Seconds' literal object.
>+	 * 
>+	 * 
>+	 * @see #SECONDS_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	SECONDS(3, "Seconds", "Seconds"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Milliseconds' literal object.
>+	 * 
>+	 * 
>+	 * @see #MILLISECONDS_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	MILLISECONDS(4, "Milliseconds", "Milliseconds"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Microseconds' literal object.
>+	 * 
>+	 * 
>+	 * @see #MICROSECONDS_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	MICROSECONDS(5, "Microseconds", "Microseconds"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Nanoseconds' literal object.
>+	 * 
>+	 * 
>+	 * @see #NANOSECONDS_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	NANOSECONDS(6, "Nanoseconds", "Nanoseconds"); //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Days' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Days' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #DAYS
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int DAYS_VALUE = 0;
>+
>+	/**
>+	 * The 'Hours' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Hours' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #HOURS
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int HOURS_VALUE = 1;
>+
>+	/**
>+	 * The 'Minutes' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Minutes' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #MINUTES
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int MINUTES_VALUE = 2;
>+
>+	/**
>+	 * The 'Seconds' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Seconds' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #SECONDS
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int SECONDS_VALUE = 3;
>+
>+	/**
>+	 * The 'Milliseconds' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Milliseconds' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #MILLISECONDS
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int MILLISECONDS_VALUE = 4;
>+
>+	/**
>+	 * The 'Microseconds' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Microseconds' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #MICROSECONDS
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int MICROSECONDS_VALUE = 5;
>+
>+	/**
>+	 * The 'Nanoseconds' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Nanoseconds' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #NANOSECONDS
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int NANOSECONDS_VALUE = 6;
>+
>+	/**
>+	 * An array of all the 'Time Unit Type Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private static final TimeUnitTypeType[] VALUES_ARRAY =
>+		new TimeUnitTypeType[] {
>+			DAYS,
>+			HOURS,
>+			MINUTES,
>+			SECONDS,
>+			MILLISECONDS,
>+			MICROSECONDS,
>+			NANOSECONDS,
>+		};
>+
>+	/**
>+	 * A public read-only list of all the 'Time Unit Type Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final List<TimeUnitTypeType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+
>+	/**
>+	 * Returns the 'Time Unit Type Type' literal with the specified literal value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static TimeUnitTypeType get(String literal) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			TimeUnitTypeType result = VALUES_ARRAY[i];
>+			if (result.toString().equals(literal)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Time Unit Type Type' literal with the specified name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static TimeUnitTypeType getByName(String name) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			TimeUnitTypeType result = VALUES_ARRAY[i];
>+			if (result.getName().equals(name)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Time Unit Type Type' literal with the specified integer value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static TimeUnitTypeType get(int value) {
>+		switch (value) {
>+			case DAYS_VALUE: return DAYS;
>+			case HOURS_VALUE: return HOURS;
>+			case MINUTES_VALUE: return MINUTES;
>+			case SECONDS_VALUE: return SECONDS;
>+			case MILLISECONDS_VALUE: return MILLISECONDS;
>+			case MICROSECONDS_VALUE: return MICROSECONDS;
>+			case NANOSECONDS_VALUE: return NANOSECONDS;
>+		}
>+		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 TimeUnitTypeType(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;
>+	}
>+	
>+} //TimeUnitTypeType
>Index: jee-models/org/eclipse/jst/javaee/ejb/ConcurrencyManagementTypeType.java
>===================================================================
>RCS file: jee-models/org/eclipse/jst/javaee/ejb/ConcurrencyManagementTypeType.java
>diff -N jee-models/org/eclipse/jst/javaee/ejb/ConcurrencyManagementTypeType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jee-models/org/eclipse/jst/javaee/ejb/ConcurrencyManagementTypeType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,252 @@
>+/**
>+ * <copyright>
>+ * </copyright>
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.jst.javaee.ejb;
>+
>+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 'Concurrency Management Type Type',
>+ * and utility methods for working with them.
>+ * 
>+ * 
>+ * 
>+ * 
>+ * The concurrency-management-typeType specifies the way concurrency
>+ * is managed for a singleton or stateful session bean. 
>+ * 
>+ * The concurrency management type must be one of the following:
>+ * 
>+ * Bean
>+ * Container
>+ * NotAllowed
>+ * 
>+ * Bean managed concurrency can only be specified for a singleton bean.
>+ * 
>+ * @since Java EE 6, EJB 3.1
>+ * 
>+ * 
>+ * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getConcurrencyManagementTypeType()
>+ * @generated
>+ */
>+public enum ConcurrencyManagementTypeType implements Enumerator {
>+	/**
>+	 * The 'Bean' literal object.
>+	 * 
>+	 * 
>+	 * @see #BEAN_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	BEAN(0, "Bean", "Bean"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Container' literal object.
>+	 * 
>+	 * 
>+	 * @see #CONTAINER_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	CONTAINER(1, "Container", "Container"), //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Not Allowed' literal object.
>+	 * 
>+	 * 
>+	 * @see #NOT_ALLOWED_VALUE
>+	 * @generated
>+	 * @ordered
>+	 */
>+	NOT_ALLOWED(2, "NotAllowed", "NotAllowed"); //$NON-NLS-1$ //$NON-NLS-2$
>+
>+	/**
>+	 * The 'Bean' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Bean' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #BEAN
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int BEAN_VALUE = 0;
>+
>+	/**
>+	 * The 'Container' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Container' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #CONTAINER
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int CONTAINER_VALUE = 1;
>+
>+	/**
>+	 * The 'Not Allowed' literal value.
>+	 * 
>+	 * 
>+	 * If the meaning of 'Not Allowed' literal object isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @see #NOT_ALLOWED
>+	 * @generated
>+	 * @ordered
>+	 */
>+	public static final int NOT_ALLOWED_VALUE = 2;
>+
>+	/**
>+	 * An array of all the 'Concurrency Management Type Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private static final ConcurrencyManagementTypeType[] VALUES_ARRAY =
>+		new ConcurrencyManagementTypeType[] {
>+			BEAN,
>+			CONTAINER,
>+			NOT_ALLOWED,
>+		};
>+
>+	/**
>+	 * A public read-only list of all the 'Concurrency Management Type Type' enumerators.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final List<ConcurrencyManagementTypeType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
>+
>+	/**
>+	 * Returns the 'Concurrency Management Type Type' literal with the specified literal value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static ConcurrencyManagementTypeType get(String literal) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			ConcurrencyManagementTypeType result = VALUES_ARRAY[i];
>+			if (result.toString().equals(literal)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Concurrency Management Type Type' literal with the specified name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static ConcurrencyManagementTypeType getByName(String name) {
>+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
>+			ConcurrencyManagementTypeType result = VALUES_ARRAY[i];
>+			if (result.getName().equals(name)) {
>+				return result;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the 'Concurrency Management Type Type' literal with the specified integer value.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static ConcurrencyManagementTypeType get(int value) {
>+		switch (value) {
>+			case BEAN_VALUE: return BEAN;
>+			case CONTAINER_VALUE: return CONTAINER;
>+			case NOT_ALLOWED_VALUE: return NOT_ALLOWED;
>+		}
>+		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 ConcurrencyManagementTypeType(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;
>+	}
>+	
>+} //ConcurrencyManagementTypeType
>#P org.eclipse.jst.jee.ui
>Index: src/org/eclipse/jst/jee/ui/internal/navigator/Web25LabelProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25LabelProvider.java,v
>retrieving revision 1.4
>diff -u -r1.4 Web25LabelProvider.java
>--- src/org/eclipse/jst/jee/ui/internal/navigator/Web25LabelProvider.java	18 Feb 2009 13:07:39 -0000	1.4
>+++ src/org/eclipse/jst/jee/ui/internal/navigator/Web25LabelProvider.java	14 Oct 2009 21:48:15 -0000
>@@ -110,7 +110,7 @@
> 		UrlPatternType urlPatterns = null;
> 		String value = null;
> 		if (element.getUrlPatterns().size() > 0){
>-			urlPatterns = (UrlPatternType) element.getUrlPatterns().get(0);
>+			urlPatterns = element.getUrlPatterns().get(0);
> 			value = urlPatterns.getValue();
> 		}else{
> 			FeatureMap group = element.getGroup();
>@@ -123,7 +123,7 @@
> 	}
> 
> 	private String getServletMappingDisplay(ServletMapping element) {
>-		UrlPatternType urlPatterns = (UrlPatternType) element.getUrlPatterns().get(0);
>+		UrlPatternType urlPatterns = element.getUrlPatterns().get(0);
> 		return urlPatterns.getValue() + " -> " + element.getServletName(); //$NON-NLS-1$;
> 	}
> 
>Index: src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java,v
>retrieving revision 1.13
>diff -u -r1.13 WebDeployableArtifactUtil.java
>--- src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java	13 Oct 2009 17:57:27 -0000	1.13
>+++ src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java	14 Oct 2009 21:48:15 -0000
>@@ -94,7 +94,7 @@
> 
> 				if (mappings != null && !mappings.isEmpty()) {
> 					ServletMapping map = (ServletMapping) mappings.get(0);
>-					UrlPatternType urlPattern = (UrlPatternType)map.getUrlPatterns().get(0);
>+					UrlPatternType urlPattern = map.getUrlPatterns().get(0);
> 					mapping = urlPattern.getValue();
> 				}
> 				if (mapping != null) {
>@@ -332,7 +332,7 @@
> 							while( it.hasNext() ){
> 								org.eclipse.jst.javaee.web.ServletMapping map = (org.eclipse.jst.javaee.web.ServletMapping) it.next();
> 								if( map.getServletName().equals(servlet.getServletName())){
>-									org.eclipse.jst.javaee.core.UrlPatternType urlPattern = (org.eclipse.jst.javaee.core.UrlPatternType)map.getUrlPatterns().get(0);
>+									org.eclipse.jst.javaee.core.UrlPatternType urlPattern = map.getUrlPatterns().get(0);
> 									return urlPattern.getValue();
> 								}
> 							}

Actions: View | Diff

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