### Eclipse Workspace Patch 1.0
#P org.eclipse.jst.j2ee.core
diff --git jee-models/org/eclipse/jst/javaee/core/ConnectionFactoryResourceType.java jee-models/org/eclipse/jst/javaee/core/ConnectionFactoryResourceType.java
index 55a80ed..47bf8a7 100644
--- jee-models/org/eclipse/jst/javaee/core/ConnectionFactoryResourceType.java
+++ jee-models/org/eclipse/jst/javaee/core/ConnectionFactoryResourceType.java
@@ -33,7 +33,7 @@
  * <ul>
  *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getClassName <em>Class Name</em>}</li>
+ *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getInterfaceName <em>Interface Name</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getResourceAdapter <em>Resource Adapter</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getMaxPoolSize <em>Max Pool Size</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getMinPoolSize <em>Min Pool Size</em>}</li>
@@ -106,33 +106,33 @@
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
+	 * Returns the value of the '<em><b>Interface Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * 
 	 * 
-	 *             The fully qualified domain name of the connection factory 
-	 *             interface class. 
+	 *             The fully qualified class name of the connection factory 
+	 *             interface.  
 	 *             
 	 *           
 	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Class Name</em>' attribute.
-	 * @see #setClassName(String)
-	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getConnectionFactoryResourceType_ClassName()
+	 * @return the value of the '<em>Interface Name</em>' attribute.
+	 * @see #setInterfaceName(String)
+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getConnectionFactoryResourceType_InterfaceName()
 	 * @generated
 	 */
-	String getClassName();
+	String getInterfaceName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getClassName <em>Class Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getInterfaceName <em>Interface Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
+	 * @param value the new value of the '<em>Interface Name</em>' attribute.
+	 * @see #getInterfaceName()
 	 * @generated
 	 */
-	void setClassName(String value);
+	void setInterfaceName(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Resource Adapter</b></em>' attribute.
diff --git jee-models/org/eclipse/jst/javaee/core/JmsConnectionFactoryType.java jee-models/org/eclipse/jst/javaee/core/JmsConnectionFactoryType.java
index 27ec1d5..1486369 100644
--- jee-models/org/eclipse/jst/javaee/core/JmsConnectionFactoryType.java
+++ jee-models/org/eclipse/jst/javaee/core/JmsConnectionFactoryType.java
@@ -33,6 +33,7 @@
  * <ul>
  *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getInterfaceName <em>Interface Name</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getClassName <em>Class Name</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getResourceAdapter <em>Resource Adapter</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getUser <em>User</em>}</li>
@@ -109,13 +110,47 @@
 	void setName(String value);
 
 	/**
+	 * Returns the value of the '<em><b>Interface Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 
+	 * 
+	 *             Fully-qualified name of the JMS connection factory
+	 *             interface.  Permitted values are javax.jms.ConnectionFactory,
+	 *             javax.jms.QueueConnectionFactory, or 
+	 *             javax.jms.TopicConnectionFactory.  If not specified,
+	 *             javax.jms.ConnectionFactory will be used.
+	 *             
+	 *           
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Interface Name</em>' attribute.
+	 * @see #setInterfaceName(String)
+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getJmsConnectionFactoryType_InterfaceName()
+	 * @generated
+	 */
+	String getInterfaceName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getInterfaceName <em>Interface Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Interface Name</em>' attribute.
+	 * @see #getInterfaceName()
+	 * @generated
+	 */
+	void setInterfaceName(String value);
+
+	/**
 	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * 
 	 * 
-	 *             javax.jms.ConnectionFactory, javax.jms.QueueConnectionFactory, or javax.jms.TopicConnectionFactory
+	 *             Fully-qualified name of the JMS connection factory
+	 *             implementation class.  Ignored if a resource adapter  
+	 *             is used.
 	 *             
 	 *           
 	 * <!-- end-model-doc -->
@@ -143,7 +178,9 @@
 	 * <!-- begin-model-doc -->
 	 * 
 	 * 
-	 *             Resource adapter name.
+	 *             Resource adapter name.  If not specified, the application
+	 *             server will define the default behavior, which may or may
+	 *             not involve the use of a resource adapter.
 	 *             
 	 *           
 	 * <!-- end-model-doc -->
diff --git jee-models/org/eclipse/jst/javaee/core/JmsDestinationType.java jee-models/org/eclipse/jst/javaee/core/JmsDestinationType.java
index 0a1b40b..4da68e7 100644
--- jee-models/org/eclipse/jst/javaee/core/JmsDestinationType.java
+++ jee-models/org/eclipse/jst/javaee/core/JmsDestinationType.java
@@ -31,6 +31,7 @@
  * <ul>
  *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getInterfaceName <em>Interface Name</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getClassName <em>Class Name</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getResourceAdapter <em>Resource Adapter</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getDestinationName <em>Destination Name</em>}</li>
@@ -102,13 +103,45 @@
 	void setName(String value);
 
 	/**
+	 * Returns the value of the '<em><b>Interface Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 
+	 * 
+	 *             Fully-qualified name of the JMS destination interface.
+	 *             Permitted values are javax.jms.Queue and javax.jms.Topic
+	 *             
+	 *           
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Interface Name</em>' attribute.
+	 * @see #setInterfaceName(String)
+	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getJmsDestinationType_InterfaceName()
+	 * @generated
+	 */
+	String getInterfaceName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.JmsDestinationType#getInterfaceName <em>Interface Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Interface Name</em>' attribute.
+	 * @see #getInterfaceName()
+	 * @generated
+	 */
+	void setInterfaceName(String value);
+
+	/**
 	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * 
 	 * 
-	 *             javax.jms.Queue or javax.jms.Topic
+	 *             Fully-qualified name of the JMS destination implementation
+	 *             class.  Ignored if a resource adapter is used unless the
+	 *             resource adapter defines more than one destination implementation
+	 *             class for the specified interface.
 	 *             
 	 *           
 	 * <!-- end-model-doc -->
@@ -136,7 +169,9 @@
 	 * <!-- begin-model-doc -->
 	 * 
 	 * 
-	 *             Resource adapter name.
+	 *             Resource adapter name.  If not specified, the application
+	 *             server will define the default behavior, which may or may
+	 *             not involve the use of a resource adapter.
 	 *             
 	 *           
 	 * <!-- end-model-doc -->
diff --git jee-models/org/eclipse/jst/javaee/core/internal/impl/ConnectionFactoryResourceTypeImpl.java jee-models/org/eclipse/jst/javaee/core/internal/impl/ConnectionFactoryResourceTypeImpl.java
index c2acf97..0dd606c 100644
--- jee-models/org/eclipse/jst/javaee/core/internal/impl/ConnectionFactoryResourceTypeImpl.java
+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/ConnectionFactoryResourceTypeImpl.java
@@ -37,7 +37,7 @@
  * <ul>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getClassName <em>Class Name</em>}</li>
+ *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getInterfaceName <em>Interface Name</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getResourceAdapter <em>Resource Adapter</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getMaxPoolSize <em>Max Pool Size</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getMinPoolSize <em>Min Pool Size</em>}</li>
@@ -81,24 +81,24 @@
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
+	 * The default value of the '{@link #getInterfaceName() <em>Interface Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getClassName()
+	 * @see #getInterfaceName()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String CLASS_NAME_EDEFAULT = null;
+	protected static final String INTERFACE_NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
+	 * The cached value of the '{@link #getInterfaceName() <em>Interface Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getClassName()
+	 * @see #getInterfaceName()
 	 * @generated
 	 * @ordered
 	 */
-	protected String className = CLASS_NAME_EDEFAULT;
+	protected String interfaceName = INTERFACE_NAME_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #getResourceAdapter() <em>Resource Adapter</em>}' attribute.
@@ -307,8 +307,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getClassName() {
-		return className;
+	public String getInterfaceName() {
+		return interfaceName;
 	}
 
 	/**
@@ -316,11 +316,11 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setClassName(String newClassName) {
-		String oldClassName = className;
-		className = newClassName;
+	public void setInterfaceName(String newInterfaceName) {
+		String oldInterfaceName = interfaceName;
+		interfaceName = newInterfaceName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME, oldClassName, className));
+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME, oldInterfaceName, interfaceName));
 	}
 
 	/**
@@ -493,8 +493,8 @@
 				return getDescription();
 			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__NAME:
 				return getName();
-			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME:
-				return getClassName();
+			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME:
+				return getInterfaceName();
 			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER:
 				return getResourceAdapter();
 			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__MAX_POOL_SIZE:
@@ -526,8 +526,8 @@
 			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__NAME:
 				setName((String)newValue);
 				return;
-			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME:
-				setClassName((String)newValue);
+			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME:
+				setInterfaceName((String)newValue);
 				return;
 			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER:
 				setResourceAdapter((String)newValue);
@@ -566,8 +566,8 @@
 			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__NAME:
 				setName(NAME_EDEFAULT);
 				return;
-			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME:
-				setClassName(CLASS_NAME_EDEFAULT);
+			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME:
+				setInterfaceName(INTERFACE_NAME_EDEFAULT);
 				return;
 			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER:
 				setResourceAdapter(RESOURCE_ADAPTER_EDEFAULT);
@@ -603,8 +603,8 @@
 				return description != null;
 			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME:
-				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
+			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME:
+				return INTERFACE_NAME_EDEFAULT == null ? interfaceName != null : !INTERFACE_NAME_EDEFAULT.equals(interfaceName);
 			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER:
 				return RESOURCE_ADAPTER_EDEFAULT == null ? resourceAdapter != null : !RESOURCE_ADAPTER_EDEFAULT.equals(resourceAdapter);
 			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__MAX_POOL_SIZE:
@@ -633,8 +633,8 @@
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
-		result.append(", className: "); //$NON-NLS-1$
-		result.append(className);
+		result.append(", interfaceName: "); //$NON-NLS-1$
+		result.append(interfaceName);
 		result.append(", resourceAdapter: "); //$NON-NLS-1$
 		result.append(resourceAdapter);
 		result.append(", maxPoolSize: "); //$NON-NLS-1$
diff --git jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
index cb3fe25..1e07259 100644
--- jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
@@ -843,7 +843,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getConnectionFactoryResourceType_ClassName() {
+	public EAttribute getConnectionFactoryResourceType_InterfaceName() {
 		return (EAttribute)connectionFactoryResourceTypeEClass.getEStructuralFeatures().get(2);
 	}
 
@@ -1536,7 +1536,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getJmsConnectionFactoryType_ClassName() {
+	public EAttribute getJmsConnectionFactoryType_InterfaceName() {
 		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(2);
 	}
 
@@ -1545,7 +1545,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getJmsConnectionFactoryType_ResourceAdapter() {
+	public EAttribute getJmsConnectionFactoryType_ClassName() {
 		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(3);
 	}
 
@@ -1554,7 +1554,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getJmsConnectionFactoryType_User() {
+	public EAttribute getJmsConnectionFactoryType_ResourceAdapter() {
 		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(4);
 	}
 
@@ -1563,7 +1563,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getJmsConnectionFactoryType_Password() {
+	public EAttribute getJmsConnectionFactoryType_User() {
 		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(5);
 	}
 
@@ -1572,7 +1572,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getJmsConnectionFactoryType_ClientId() {
+	public EAttribute getJmsConnectionFactoryType_Password() {
 		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(6);
 	}
 
@@ -1581,8 +1581,17 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getJmsConnectionFactoryType_ClientId() {
+		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EReference getJmsConnectionFactoryType_Property() {
-		return (EReference)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(7);
+		return (EReference)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -1591,15 +1600,6 @@
 	 * @generated
 	 */
 	public EAttribute getJmsConnectionFactoryType_Transactional() {
-		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJmsConnectionFactoryType_MaxPoolSize() {
 		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(9);
 	}
 
@@ -1608,7 +1608,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getJmsConnectionFactoryType_MinPoolSize() {
+	public EAttribute getJmsConnectionFactoryType_MaxPoolSize() {
 		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(10);
 	}
 
@@ -1617,8 +1617,17 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getJmsConnectionFactoryType_Id() {
+	public EAttribute getJmsConnectionFactoryType_MinPoolSize() {
 		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getJmsConnectionFactoryType_Id() {
+		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(12);
 	}
 
 	/**
@@ -1653,7 +1662,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getJmsDestinationType_ClassName() {
+	public EAttribute getJmsDestinationType_InterfaceName() {
 		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(2);
 	}
 
@@ -1662,7 +1671,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getJmsDestinationType_ResourceAdapter() {
+	public EAttribute getJmsDestinationType_ClassName() {
 		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(3);
 	}
 
@@ -1671,7 +1680,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getJmsDestinationType_DestinationName() {
+	public EAttribute getJmsDestinationType_ResourceAdapter() {
 		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(4);
 	}
 
@@ -1680,8 +1689,17 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getJmsDestinationType_DestinationName() {
+		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EReference getJmsDestinationType_Property() {
-		return (EReference)jmsDestinationTypeEClass.getEStructuralFeatures().get(5);
+		return (EReference)jmsDestinationTypeEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -1690,7 +1708,7 @@
 	 * @generated
 	 */
 	public EAttribute getJmsDestinationType_Id() {
-		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(6);
+		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
@@ -3439,7 +3457,7 @@
 		connectionFactoryResourceTypeEClass = createEClass(CONNECTION_FACTORY_RESOURCE_TYPE);
 		createEReference(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__DESCRIPTION);
 		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__NAME);
-		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME);
+		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME);
 		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER);
 		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__MAX_POOL_SIZE);
 		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__MIN_POOL_SIZE);
@@ -3526,6 +3544,7 @@
 		jmsConnectionFactoryTypeEClass = createEClass(JMS_CONNECTION_FACTORY_TYPE);
 		createEReference(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__DESCRIPTION);
 		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__NAME);
+		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME);
 		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME);
 		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER);
 		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__USER);
@@ -3540,6 +3559,7 @@
 		jmsDestinationTypeEClass = createEClass(JMS_DESTINATION_TYPE);
 		createEReference(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__DESCRIPTION);
 		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__NAME);
+		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__INTERFACE_NAME);
 		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__CLASS_NAME);
 		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__RESOURCE_ADAPTER);
 		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__DESTINATION_NAME);
@@ -3820,7 +3840,7 @@
 		initEClass(connectionFactoryResourceTypeEClass, ConnectionFactoryResourceType.class, "ConnectionFactoryResourceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getConnectionFactoryResourceType_Description(), this.getDescription(), null, "description", null, 0, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getConnectionFactoryResourceType_Name(), this.getJNDIName(), "name", null, 1, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getConnectionFactoryResourceType_ClassName(), this.getFullyQualifiedClassType(), "className", null, 1, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getConnectionFactoryResourceType_InterfaceName(), this.getFullyQualifiedClassType(), "interfaceName", null, 1, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getConnectionFactoryResourceType_ResourceAdapter(), theXMLTypePackage.getToken(), "resourceAdapter", null, 1, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getConnectionFactoryResourceType_MaxPoolSize(), theXMLTypePackage.getInteger(), "maxPoolSize", null, 0, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getConnectionFactoryResourceType_MinPoolSize(), theXMLTypePackage.getInteger(), "minPoolSize", null, 0, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -3907,6 +3927,7 @@
 		initEClass(jmsConnectionFactoryTypeEClass, JmsConnectionFactoryType.class, "JmsConnectionFactoryType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getJmsConnectionFactoryType_Description(), this.getDescription(), null, "description", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getJmsConnectionFactoryType_Name(), this.getJNDIName(), "name", null, 1, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getJmsConnectionFactoryType_InterfaceName(), this.getFullyQualifiedClassType(), "interfaceName", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getJmsConnectionFactoryType_ClassName(), this.getFullyQualifiedClassType(), "className", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getJmsConnectionFactoryType_ResourceAdapter(), theXMLTypePackage.getToken(), "resourceAdapter", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getJmsConnectionFactoryType_User(), theXMLTypePackage.getToken(), "user", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -3921,6 +3942,7 @@
 		initEClass(jmsDestinationTypeEClass, JmsDestinationType.class, "JmsDestinationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getJmsDestinationType_Description(), this.getDescription(), null, "description", null, 0, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getJmsDestinationType_Name(), this.getJNDIName(), "name", null, 1, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getJmsDestinationType_InterfaceName(), this.getFullyQualifiedClassType(), "interfaceName", null, 1, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getJmsDestinationType_ClassName(), this.getFullyQualifiedClassType(), "className", null, 0, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getJmsDestinationType_ResourceAdapter(), theXMLTypePackage.getToken(), "resourceAdapter", null, 0, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getJmsDestinationType_DestinationName(), theXMLTypePackage.getToken(), "destinationName", null, 0, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -4182,7 +4204,7 @@
 
 		// Create annotations
 		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-			createExtendedMetaDataAnnotations();
+		createExtendedMetaDataAnnotations();
 		}finally{
 			if( hasLock )
 				J2EEInit.releaseInitializePackageContentsLock();
@@ -4327,11 +4349,11 @@
 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
 		   });			
 		addAnnotation
-		  (getConnectionFactoryResourceType_ClassName(), 
+		  (getConnectionFactoryResourceType_InterfaceName(), 
 		   source, 
 		   new String[] {
 			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "class-name", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "interface-name", //$NON-NLS-1$ //$NON-NLS-2$
 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
 		   });			
 		addAnnotation
@@ -5026,6 +5048,14 @@
 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
 		   });			
 		addAnnotation
+		  (getJmsConnectionFactoryType_InterfaceName(), 
+		   source, 
+		   new String[] {
+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "interface-name", //$NON-NLS-1$ //$NON-NLS-2$
+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
 		  (getJmsConnectionFactoryType_ClassName(), 
 		   source, 
 		   new String[] {
@@ -5128,6 +5158,14 @@
 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
 		   });			
 		addAnnotation
+		  (getJmsDestinationType_InterfaceName(), 
+		   source, 
+		   new String[] {
+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "interface-name", //$NON-NLS-1$ //$NON-NLS-2$
+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
 		  (getJmsDestinationType_ClassName(), 
 		   source, 
 		   new String[] {
diff --git jee-models/org/eclipse/jst/javaee/core/internal/impl/JmsConnectionFactoryTypeImpl.java jee-models/org/eclipse/jst/javaee/core/internal/impl/JmsConnectionFactoryTypeImpl.java
index b7faf0b..9087ae7 100644
--- jee-models/org/eclipse/jst/javaee/core/internal/impl/JmsConnectionFactoryTypeImpl.java
+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/JmsConnectionFactoryTypeImpl.java
@@ -44,6 +44,7 @@
  * <ul>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getInterfaceName <em>Interface Name</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getClassName <em>Class Name</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getResourceAdapter <em>Resource Adapter</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getUser <em>User</em>}</li>
@@ -89,6 +90,26 @@
 	 * @ordered
 	 */
 	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getInterfaceName() <em>Interface Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getInterfaceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String INTERFACE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getInterfaceName() <em>Interface Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getInterfaceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String interfaceName = INTERFACE_NAME_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
@@ -377,6 +398,27 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getInterfaceName() {
+		return interfaceName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setInterfaceName(String newInterfaceName) {
+		String oldInterfaceName = interfaceName;
+		interfaceName = newInterfaceName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME, oldInterfaceName, interfaceName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public String getClassName() {
 		return className;
 	}
@@ -626,6 +668,8 @@
 				return getDescription();
 			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__NAME:
 				return getName();
+			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME:
+				return getInterfaceName();
 			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME:
 				return getClassName();
 			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER:
@@ -664,6 +708,9 @@
 				return;
 			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__NAME:
 				setName((String)newValue);
+				return;
+			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME:
+				setInterfaceName((String)newValue);
 				return;
 			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME:
 				setClassName((String)newValue);
@@ -714,6 +761,9 @@
 			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__NAME:
 				setName(NAME_EDEFAULT);
 				return;
+			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME:
+				setInterfaceName(INTERFACE_NAME_EDEFAULT);
+				return;
 			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME:
 				setClassName(CLASS_NAME_EDEFAULT);
 				return;
@@ -760,6 +810,8 @@
 				return description != null;
 			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME:
+				return INTERFACE_NAME_EDEFAULT == null ? interfaceName != null : !INTERFACE_NAME_EDEFAULT.equals(interfaceName);
 			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME:
 				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
 			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER:
@@ -796,6 +848,8 @@
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
+		result.append(", interfaceName: "); //$NON-NLS-1$
+		result.append(interfaceName);
 		result.append(", className: "); //$NON-NLS-1$
 		result.append(className);
 		result.append(", resourceAdapter: "); //$NON-NLS-1$
diff --git jee-models/org/eclipse/jst/javaee/core/internal/impl/JmsDestinationTypeImpl.java jee-models/org/eclipse/jst/javaee/core/internal/impl/JmsDestinationTypeImpl.java
index 3145aa7..98757dd 100644
--- jee-models/org/eclipse/jst/javaee/core/internal/impl/JmsDestinationTypeImpl.java
+++ jee-models/org/eclipse/jst/javaee/core/internal/impl/JmsDestinationTypeImpl.java
@@ -42,6 +42,7 @@
  * <ul>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getInterfaceName <em>Interface Name</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getClassName <em>Class Name</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getResourceAdapter <em>Resource Adapter</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getDestinationName <em>Destination Name</em>}</li>
@@ -82,6 +83,26 @@
 	 * @ordered
 	 */
 	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getInterfaceName() <em>Interface Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getInterfaceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String INTERFACE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getInterfaceName() <em>Interface Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getInterfaceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String interfaceName = INTERFACE_NAME_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
@@ -261,6 +282,27 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getInterfaceName() {
+		return interfaceName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setInterfaceName(String newInterfaceName) {
+		String oldInterfaceName = interfaceName;
+		interfaceName = newInterfaceName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.JMS_DESTINATION_TYPE__INTERFACE_NAME, oldInterfaceName, interfaceName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public String getClassName() {
 		return className;
 	}
@@ -380,6 +422,8 @@
 				return getDescription();
 			case JavaeePackage.JMS_DESTINATION_TYPE__NAME:
 				return getName();
+			case JavaeePackage.JMS_DESTINATION_TYPE__INTERFACE_NAME:
+				return getInterfaceName();
 			case JavaeePackage.JMS_DESTINATION_TYPE__CLASS_NAME:
 				return getClassName();
 			case JavaeePackage.JMS_DESTINATION_TYPE__RESOURCE_ADAPTER:
@@ -408,6 +452,9 @@
 				return;
 			case JavaeePackage.JMS_DESTINATION_TYPE__NAME:
 				setName((String)newValue);
+				return;
+			case JavaeePackage.JMS_DESTINATION_TYPE__INTERFACE_NAME:
+				setInterfaceName((String)newValue);
 				return;
 			case JavaeePackage.JMS_DESTINATION_TYPE__CLASS_NAME:
 				setClassName((String)newValue);
@@ -443,6 +490,9 @@
 			case JavaeePackage.JMS_DESTINATION_TYPE__NAME:
 				setName(NAME_EDEFAULT);
 				return;
+			case JavaeePackage.JMS_DESTINATION_TYPE__INTERFACE_NAME:
+				setInterfaceName(INTERFACE_NAME_EDEFAULT);
+				return;
 			case JavaeePackage.JMS_DESTINATION_TYPE__CLASS_NAME:
 				setClassName(CLASS_NAME_EDEFAULT);
 				return;
@@ -474,6 +524,8 @@
 				return description != null;
 			case JavaeePackage.JMS_DESTINATION_TYPE__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case JavaeePackage.JMS_DESTINATION_TYPE__INTERFACE_NAME:
+				return INTERFACE_NAME_EDEFAULT == null ? interfaceName != null : !INTERFACE_NAME_EDEFAULT.equals(interfaceName);
 			case JavaeePackage.JMS_DESTINATION_TYPE__CLASS_NAME:
 				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
 			case JavaeePackage.JMS_DESTINATION_TYPE__RESOURCE_ADAPTER:
@@ -500,6 +552,8 @@
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
+		result.append(", interfaceName: "); //$NON-NLS-1$
+		result.append(interfaceName);
 		result.append(", className: "); //$NON-NLS-1$
 		result.append(className);
 		result.append(", resourceAdapter: "); //$NON-NLS-1$
diff --git jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java
index b1f7552..0ad6a40 100644
--- jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java
+++ jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java
@@ -416,13 +416,13 @@
 	int CONNECTION_FACTORY_RESOURCE_TYPE__NAME = 1;
 
 	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Interface Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME = 2;
+	int CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME = 2;
 
 	/**
 	 * The feature id for the '<em><b>Resource Adapter</b></em>' attribute.
@@ -1209,13 +1209,22 @@
 	int JMS_CONNECTION_FACTORY_TYPE__NAME = 1;
 
 	/**
+	 * The feature id for the '<em><b>Interface Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME = 2;
+
+	/**
 	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME = 2;
+	int JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME = 3;
 
 	/**
 	 * The feature id for the '<em><b>Resource Adapter</b></em>' attribute.
@@ -1224,7 +1233,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER = 3;
+	int JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER = 4;
 
 	/**
 	 * The feature id for the '<em><b>User</b></em>' attribute.
@@ -1233,7 +1242,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_CONNECTION_FACTORY_TYPE__USER = 4;
+	int JMS_CONNECTION_FACTORY_TYPE__USER = 5;
 
 	/**
 	 * The feature id for the '<em><b>Password</b></em>' attribute.
@@ -1242,7 +1251,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_CONNECTION_FACTORY_TYPE__PASSWORD = 5;
+	int JMS_CONNECTION_FACTORY_TYPE__PASSWORD = 6;
 
 	/**
 	 * The feature id for the '<em><b>Client Id</b></em>' attribute.
@@ -1251,7 +1260,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_CONNECTION_FACTORY_TYPE__CLIENT_ID = 6;
+	int JMS_CONNECTION_FACTORY_TYPE__CLIENT_ID = 7;
 
 	/**
 	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
@@ -1260,7 +1269,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_CONNECTION_FACTORY_TYPE__PROPERTY = 7;
+	int JMS_CONNECTION_FACTORY_TYPE__PROPERTY = 8;
 
 	/**
 	 * The feature id for the '<em><b>Transactional</b></em>' attribute.
@@ -1269,7 +1278,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_CONNECTION_FACTORY_TYPE__TRANSACTIONAL = 8;
+	int JMS_CONNECTION_FACTORY_TYPE__TRANSACTIONAL = 9;
 
 	/**
 	 * The feature id for the '<em><b>Max Pool Size</b></em>' attribute.
@@ -1278,7 +1287,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_CONNECTION_FACTORY_TYPE__MAX_POOL_SIZE = 9;
+	int JMS_CONNECTION_FACTORY_TYPE__MAX_POOL_SIZE = 10;
 
 	/**
 	 * The feature id for the '<em><b>Min Pool Size</b></em>' attribute.
@@ -1287,7 +1296,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_CONNECTION_FACTORY_TYPE__MIN_POOL_SIZE = 10;
+	int JMS_CONNECTION_FACTORY_TYPE__MIN_POOL_SIZE = 11;
 
 	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
@@ -1296,7 +1305,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_CONNECTION_FACTORY_TYPE__ID = 11;
+	int JMS_CONNECTION_FACTORY_TYPE__ID = 12;
 
 	/**
 	 * The number of structural features of the '<em>Jms Connection Factory Type</em>' class.
@@ -1305,7 +1314,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_CONNECTION_FACTORY_TYPE_FEATURE_COUNT = 12;
+	int JMS_CONNECTION_FACTORY_TYPE_FEATURE_COUNT = 13;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl <em>Jms Destination Type</em>}' class.
@@ -1336,13 +1345,22 @@
 	int JMS_DESTINATION_TYPE__NAME = 1;
 
 	/**
+	 * The feature id for the '<em><b>Interface Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JMS_DESTINATION_TYPE__INTERFACE_NAME = 2;
+
+	/**
 	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_DESTINATION_TYPE__CLASS_NAME = 2;
+	int JMS_DESTINATION_TYPE__CLASS_NAME = 3;
 
 	/**
 	 * The feature id for the '<em><b>Resource Adapter</b></em>' attribute.
@@ -1351,7 +1369,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_DESTINATION_TYPE__RESOURCE_ADAPTER = 3;
+	int JMS_DESTINATION_TYPE__RESOURCE_ADAPTER = 4;
 
 	/**
 	 * The feature id for the '<em><b>Destination Name</b></em>' attribute.
@@ -1360,7 +1378,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_DESTINATION_TYPE__DESTINATION_NAME = 4;
+	int JMS_DESTINATION_TYPE__DESTINATION_NAME = 5;
 
 	/**
 	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
@@ -1369,7 +1387,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_DESTINATION_TYPE__PROPERTY = 5;
+	int JMS_DESTINATION_TYPE__PROPERTY = 6;
 
 	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
@@ -1378,7 +1396,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_DESTINATION_TYPE__ID = 6;
+	int JMS_DESTINATION_TYPE__ID = 7;
 
 	/**
 	 * The number of structural features of the '<em>Jms Destination Type</em>' class.
@@ -1387,7 +1405,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JMS_DESTINATION_TYPE_FEATURE_COUNT = 7;
+	int JMS_DESTINATION_TYPE_FEATURE_COUNT = 8;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.LifecycleCallbackImpl <em>Lifecycle Callback</em>}' class.
@@ -3506,15 +3524,15 @@
 	EAttribute getConnectionFactoryResourceType_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getClassName <em>Class Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getInterfaceName <em>Interface Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Class Name</em>'.
-	 * @see org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getClassName()
+	 * @return the meta object for the attribute '<em>Interface Name</em>'.
+	 * @see org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getInterfaceName()
 	 * @see #getConnectionFactoryResourceType()
 	 * @generated
 	 */
-	EAttribute getConnectionFactoryResourceType_ClassName();
+	EAttribute getConnectionFactoryResourceType_InterfaceName();
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getResourceAdapter <em>Resource Adapter</em>}'.
@@ -4343,6 +4361,17 @@
 	EAttribute getJmsConnectionFactoryType_Name();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getInterfaceName <em>Interface Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Interface Name</em>'.
+	 * @see org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getInterfaceName()
+	 * @see #getJmsConnectionFactoryType()
+	 * @generated
+	 */
+	EAttribute getJmsConnectionFactoryType_InterfaceName();
+
+	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getClassName <em>Class Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4483,6 +4512,17 @@
 	 * @generated
 	 */
 	EAttribute getJmsDestinationType_Name();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.JmsDestinationType#getInterfaceName <em>Interface Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Interface Name</em>'.
+	 * @see org.eclipse.jst.javaee.core.JmsDestinationType#getInterfaceName()
+	 * @see #getJmsDestinationType()
+	 * @generated
+	 */
+	EAttribute getJmsDestinationType_InterfaceName();
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.JmsDestinationType#getClassName <em>Class Name</em>}'.
@@ -6702,12 +6742,12 @@
 		EAttribute CONNECTION_FACTORY_RESOURCE_TYPE__NAME = eINSTANCE.getConnectionFactoryResourceType_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Interface Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME = eINSTANCE.getConnectionFactoryResourceType_ClassName();
+		EAttribute CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME = eINSTANCE.getConnectionFactoryResourceType_InterfaceName();
 
 		/**
 		 * The meta object literal for the '<em><b>Resource Adapter</b></em>' attribute feature.
@@ -7338,6 +7378,14 @@
 		EAttribute JMS_CONNECTION_FACTORY_TYPE__NAME = eINSTANCE.getJmsConnectionFactoryType_Name();
 
 		/**
+		 * The meta object literal for the '<em><b>Interface Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME = eINSTANCE.getJmsConnectionFactoryType_InterfaceName();
+
+		/**
 		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -7444,6 +7492,14 @@
 		EAttribute JMS_DESTINATION_TYPE__NAME = eINSTANCE.getJmsDestinationType_Name();
 
 		/**
+		 * The meta object literal for the '<em><b>Interface Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute JMS_DESTINATION_TYPE__INTERFACE_NAME = eINSTANCE.getJmsDestinationType_InterfaceName();
+
+		/**
 		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git jee-models/org/eclipse/jst/javaee/ejb/CMPField.java jee-models/org/eclipse/jst/javaee/ejb/CMPField.java
index 21bb9a1..5247942 100644
--- jee-models/org/eclipse/jst/javaee/ejb/CMPField.java
+++ jee-models/org/eclipse/jst/javaee/ejb/CMPField.java
@@ -81,6 +81,8 @@
 	 *             cmp-version 1.x must denote a public field of the
 	 *             enterprise bean class or one of its superclasses.
 	 *             
+	 *             Support for entity beans is optional as of EJB 3.2.
+	 *             
 	 *             @since Java EE 5, EJB 3.0
 	 *           
 	 * <!-- end-model-doc -->
diff --git jee-models/org/eclipse/jst/javaee/ejb/CMRField.java jee-models/org/eclipse/jst/javaee/ejb/CMRField.java
index cecb0c8..1b8bc8f 100644
--- jee-models/org/eclipse/jst/javaee/ejb/CMRField.java
+++ jee-models/org/eclipse/jst/javaee/ejb/CMRField.java
@@ -32,6 +32,8 @@
  *         used only for collection-valued cmr-fields. It specifies the
  *         type of the collection that is used.
  *         
+ *         Support for entity beans is optional as of EJB 3.2.
+ *         
  *         @since Java EE 5, EJB 3.0
  *       
  * <!-- end-model-doc -->
@@ -81,6 +83,8 @@
 	 *             specified by cmr-field-name in which the first
 	 *             letter is uppercased, prefixed by "get" or "set".
 	 *             
+	 *             Support for entity beans is optional as of EJB 3.2.
+	 *             
 	 *             @since Java EE 5, EJB 3.0
 	 *           
 	 * <!-- end-model-doc -->
diff --git jee-models/org/eclipse/jst/javaee/ejb/CmpVersionType.java jee-models/org/eclipse/jst/javaee/ejb/CmpVersionType.java
index f334d91..9edeb20 100644
--- jee-models/org/eclipse/jst/javaee/ejb/CmpVersionType.java
+++ jee-models/org/eclipse/jst/javaee/ejb/CmpVersionType.java
@@ -33,6 +33,8 @@
  *         1.x
  *         2.x
  *         
+ *         Support for entity beans is optional as of EJB 3.2.
+ *         
  *         @since Java EE 5, EJB 3.0
  *       
  * <!-- end-model-doc -->
diff --git jee-models/org/eclipse/jst/javaee/ejb/EJBRelation.java jee-models/org/eclipse/jst/javaee/ejb/EJBRelation.java
index 74d011d..eccd1de 100644
--- jee-models/org/eclipse/jst/javaee/ejb/EJBRelation.java
+++ jee-models/org/eclipse/jst/javaee/ejb/EJBRelation.java
@@ -32,6 +32,8 @@
  *         relationship, if specified, is unique within the ejb-jar
  *         file.
  *         
+ *         Support for entity beans is optional as of EJB 3.2.
+ *         
  *         @since Java EE 5, EJB 3.0
  *       
  * <!-- end-model-doc -->
diff --git jee-models/org/eclipse/jst/javaee/ejb/EJBRelationshipRole.java jee-models/org/eclipse/jst/javaee/ejb/EJBRelationshipRole.java
index 71d7dd8..cc96289 100644
--- jee-models/org/eclipse/jst/javaee/ejb/EJBRelationshipRole.java
+++ jee-models/org/eclipse/jst/javaee/ejb/EJBRelationshipRole.java
@@ -61,6 +61,7 @@
  *         </ejb-relationship-role>
  *         </ejb-relation>
  *         
+ *         Support for entity beans is optional as of EJB 3.2.
  * 
  *         @since Java EE 5, EJB 3.0
  *       
@@ -202,6 +203,8 @@
 	 *             which the other ejb-relationship-role
 	 *             element specifies a multiplicity of One.
 	 *             
+	 *             Support for entity beans is optional as of EJB 3.2.
+	 *             
 	 *             @since Java EE 5, EJB 3.0
 	 *           
 	 * <!-- end-model-doc -->
diff --git jee-models/org/eclipse/jst/javaee/ejb/EntityBean.java jee-models/org/eclipse/jst/javaee/ejb/EntityBean.java
index 7fa572e..aff68d6 100644
--- jee-models/org/eclipse/jst/javaee/ejb/EntityBean.java
+++ jee-models/org/eclipse/jst/javaee/ejb/EntityBean.java
@@ -42,6 +42,8 @@
  * <!-- begin-model-doc -->
  * 
  * 
+ *         Support for entity beans is optional as of EJB 3.2.
+ * 
  *         The entity-beanType declares an entity bean. The declaration
  *         consists of:
  *         
@@ -475,6 +477,8 @@
 	 *             deferred to deployment time, the prim-key-class 
 	 *             element should specify java.lang.Object.
 	 *             
+	 *             Support for entity beans is optional as of EJB 3.2.
+	 *             
 	 *             @since Java EE 5, EJB 3.0
 	 *           
 	 * <!-- end-model-doc -->
@@ -623,7 +627,9 @@
 	 *             
 	 *             For example, the abstract-schema-name for an entity 
 	 *             bean whose local interface is 
-	 *             com.acme.commerce.Order might be Order. 
+	 *             com.acme.commerce.Order might be Order.
+	 *             
+	 *             Support for entity beans is optional as of EJB 3.2.
 	 *             
 	 *             @since Java EE 5, EJB 3.0
 	 *           
@@ -682,6 +688,8 @@
 	 *             their names must correspond to the field names of
 	 *             the entity bean class that comprise the key.
 	 *             
+	 *             Support for entity beans is optional as of EJB 3.2.
+	 *             
 	 *             @since Java EE 5, EJB 3.0
 	 *           
 	 * <!-- end-model-doc -->
diff --git jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java
index 8c43409..20d568d 100644
--- jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java
+++ jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java
@@ -52,7 +52,13 @@
  *         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. 
+ *         method-level will apply.
+ *         
+ *         The method-name element may be used to bind a constructor-level 
+ *         interceptor using the unqualified name of the bean class as the value; 
+ *         the optional method-params elements identify the constructor if a bean 
+ *         class has a constructor annotated with the Inject annotation in addition 
+ *         to a no-arg constructor. 
  *         
  *         There are four possible styles of the interceptor element syntax :
  *         
diff --git jee-models/org/eclipse/jst/javaee/ejb/InterceptorType.java jee-models/org/eclipse/jst/javaee/ejb/InterceptorType.java
index c1438a6..64bd0b7 100644
--- jee-models/org/eclipse/jst/javaee/ejb/InterceptorType.java
+++ jee-models/org/eclipse/jst/javaee/ejb/InterceptorType.java
@@ -66,6 +66,7 @@
  *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getInterceptorClass <em>Interceptor Class</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundInvokes <em>Around Invokes</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundTimeouts <em>Around Timeouts</em>}</li>
+ *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundConstruct <em>Around Construct</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries <em>Env Entries</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbRefs <em>Ejb Refs</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
@@ -165,6 +166,21 @@
 	List<AroundTimeoutType> getAroundTimeouts();
 
 	/**
+	 * Returns the value of the '<em><b>Around Construct</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Around Construct</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Around Construct</em>' containment reference list.
+	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_AroundConstruct()
+	 * @generated
+	 */
+	List<LifecycleCallback> getAroundConstruct();
+
+	/**
 	 * Returns the value of the '<em><b>Env Entries</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EnvEntry}.
 	 * <!-- begin-user-doc -->
diff --git jee-models/org/eclipse/jst/javaee/ejb/MethodInterfaceType.java jee-models/org/eclipse/jst/javaee/ejb/MethodInterfaceType.java
index 9fba206..9866614 100644
--- jee-models/org/eclipse/jst/javaee/ejb/MethodInterfaceType.java
+++ jee-models/org/eclipse/jst/javaee/ejb/MethodInterfaceType.java
@@ -46,8 +46,10 @@
  *         MessageEndpoint refers to the methods of a message-driven bean's
  *         message-listener interface.
  *         
- *         LifecycleCallback refers to the lifecycle callback methods of 
- *         a singleton or stateful session bean.
+ *         LifecycleCallback refers to the PostConstruct and PreDestroy
+ *         lifecycle callback methods of a singleton session bean and
+ *         to the PostConstruct, PreDestroy, PrePassivate, and PostActivate
+ *         lifecycle callback methods of a stateful session bean.
  *         
  *         The method-intf element must be one of the following:
  *         
@@ -117,6 +119,11 @@
 	 * The '<em><b>Timer</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 
+	 *               @since Java EE 6, EJB 3.1
+	 *             
+	 * <!-- end-model-doc -->
 	 * @see #TIMER
 	 * @generated
 	 * @ordered
@@ -126,6 +133,11 @@
 	 * The '<em><b>Message Endpoint</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 
+	 *               @since Java EE 6, EJB 3.1
+	 *             
+	 * <!-- end-model-doc -->
 	 * @see #MESSAGE_ENDPOINT
 	 * @generated
 	 * @ordered
diff --git jee-models/org/eclipse/jst/javaee/ejb/MethodPermission.java jee-models/org/eclipse/jst/javaee/ejb/MethodPermission.java
index 0aa0569..8fcd365 100644
--- jee-models/org/eclipse/jst/javaee/ejb/MethodPermission.java
+++ jee-models/org/eclipse/jst/javaee/ejb/MethodPermission.java
@@ -31,12 +31,18 @@
  *         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 no-interface view, 
- *         business, home, component and/or web service endpoint 
- *         interfaces.
+ *         Except as noted below 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 no-interface
+ *         view, business, home, component and/or web service endpoint
+ *         interfaces. 
+ *         
+ *         If the role name "**" is included in the list of allowed 
+ *         roles, and the application has not defined in its deployment 
+ *         descriptor an application security role with this name, 
+ *         then the list of allowed roles includes every and any 
+ *         authenticated user.
  *         
  *         @since Java EE 5, EJB 3.0
  *       
diff --git jee-models/org/eclipse/jst/javaee/ejb/MethodType.java jee-models/org/eclipse/jst/javaee/ejb/MethodType.java
index c3b66c6..11a0e82 100644
--- jee-models/org/eclipse/jst/javaee/ejb/MethodType.java
+++ jee-models/org/eclipse/jst/javaee/ejb/MethodType.java
@@ -66,10 +66,13 @@
  *         timeout callback methods
  *         message-driven bean message listener method
  *         
- *         This style may be used for stateful session bean lifecycle 
- *         callback methods to specify their transaction attributes, 
- *         if used with the method-intf element that contains 
- *         LifecycleCallback as the value.
+ *         This style may also be used in combination with the 
+ *         method-intf element that contains LifecycleCallback as 
+ *         the value to specify transaction attributes of a stateful 
+ *         session bean PostConstruct, PreDestroy, PrePassivate, 
+ *         and PostActivate lifecycle callback methods or to override 
+ *         transaction attributes of a singleton session bean 
+ *         PostConstruct and PreDestroy lifecycle callback methods.
  *         
  *         2.
  *         <method>
@@ -84,6 +87,7 @@
  *         name.
  *         
  *         This style may be used to refer to stateful session bean
+ *         PostConstruct, PreDestroy, PrePassivate, and PostActivate 
  *         lifecycle callback methods to specify their transaction
  *         attributes if any of the following is true:
  *         there is only one method with this name in the specified 
diff --git jee-models/org/eclipse/jst/javaee/ejb/MultiplicityType.java jee-models/org/eclipse/jst/javaee/ejb/MultiplicityType.java
index 8cd7f92..fbd82fd 100644
--- jee-models/org/eclipse/jst/javaee/ejb/MultiplicityType.java
+++ jee-models/org/eclipse/jst/javaee/ejb/MultiplicityType.java
@@ -32,6 +32,8 @@
  *         One
  *         Many
  *         
+ *         Support for entity beans is optional as of EJB 3.2.
+ *         
  *         @since Java EE 5, EJB 3.0
  *       
  * <!-- end-model-doc -->
diff --git jee-models/org/eclipse/jst/javaee/ejb/PersistenceType.java jee-models/org/eclipse/jst/javaee/ejb/PersistenceType.java
index 658e245..5cad1e4 100644
--- jee-models/org/eclipse/jst/javaee/ejb/PersistenceType.java
+++ jee-models/org/eclipse/jst/javaee/ejb/PersistenceType.java
@@ -32,6 +32,8 @@
  *         Bean
  *         Container
  *         
+ *         Support for entity beans is optional as of EJB 3.2.
+ *         
  *         @since Java EE 5, EJB 3.0
  *       
  * <!-- end-model-doc -->
diff --git jee-models/org/eclipse/jst/javaee/ejb/QueryMethod.java jee-models/org/eclipse/jst/javaee/ejb/QueryMethod.java
index f55c738..c20b7c2 100644
--- jee-models/org/eclipse/jst/javaee/ejb/QueryMethod.java
+++ jee-models/org/eclipse/jst/javaee/ejb/QueryMethod.java
@@ -45,6 +45,7 @@
  *         </ejb-ql>
  *         </query>
  *         
+ *         Support for entity beans is optional as of EJB 3.2.
  * 
  *         @since Java EE 5, EJB 3.0
  *       
diff --git jee-models/org/eclipse/jst/javaee/ejb/RelationshipRoleSourceType.java jee-models/org/eclipse/jst/javaee/ejb/RelationshipRoleSourceType.java
index 6fc42ea..136f2f6 100644
--- jee-models/org/eclipse/jst/javaee/ejb/RelationshipRoleSourceType.java
+++ jee-models/org/eclipse/jst/javaee/ejb/RelationshipRoleSourceType.java
@@ -29,6 +29,8 @@
  *         relationship-role-source elements to uniquely identify an
  *         entity bean.
  *         
+ *         Support for entity beans is optional as of EJB 3.2.
+ *         
  *         @since Java EE 5, EJB 3.0
  *       
  * <!-- end-model-doc -->
diff --git jee-models/org/eclipse/jst/javaee/ejb/Relationships.java jee-models/org/eclipse/jst/javaee/ejb/Relationships.java
index 479d5b4..fd1022c 100644
--- jee-models/org/eclipse/jst/javaee/ejb/Relationships.java
+++ jee-models/org/eclipse/jst/javaee/ejb/Relationships.java
@@ -29,6 +29,8 @@
  *         description; and a list of ejb-relation elements, which
  *         specify the container managed relationships.
  *         
+ *         Support for entity beans is optional as of EJB 3.2.
+ *         
  *         @since Java EE 5, EJB 3.0
  *       
  * <!-- end-model-doc -->
diff --git jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
index 79719f5..d9302c4 100644
--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
@@ -2094,7 +2094,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_EnvEntries() {
+	public EReference getInterceptorType_AroundConstruct() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(4);
 	}
 
@@ -2103,7 +2103,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_EjbRefs() {
+	public EReference getInterceptorType_EnvEntries() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(5);
 	}
 
@@ -2112,7 +2112,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_EjbLocalRefs() {
+	public EReference getInterceptorType_EjbRefs() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(6);
 	}
 
@@ -2121,7 +2121,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_ServiceRefs() {
+	public EReference getInterceptorType_EjbLocalRefs() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(7);
 	}
 
@@ -2130,7 +2130,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_ResourceRefs() {
+	public EReference getInterceptorType_ServiceRefs() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(8);
 	}
 
@@ -2139,7 +2139,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_ResourceEnvRefs() {
+	public EReference getInterceptorType_ResourceRefs() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(9);
 	}
 
@@ -2148,7 +2148,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_MessageDestinationRefs() {
+	public EReference getInterceptorType_ResourceEnvRefs() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(10);
 	}
 
@@ -2157,7 +2157,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_PersistenceContextRefs() {
+	public EReference getInterceptorType_MessageDestinationRefs() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(11);
 	}
 
@@ -2166,7 +2166,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_PersistenceUnitRefs() {
+	public EReference getInterceptorType_PersistenceContextRefs() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(12);
 	}
 
@@ -2175,7 +2175,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_PostConstructs() {
+	public EReference getInterceptorType_PersistenceUnitRefs() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(13);
 	}
 
@@ -2184,7 +2184,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_PreDestroys() {
+	public EReference getInterceptorType_PostConstructs() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(14);
 	}
 
@@ -2193,7 +2193,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_DataSource() {
+	public EReference getInterceptorType_PreDestroys() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(15);
 	}
 
@@ -2202,7 +2202,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_JmsConnectionFactory() {
+	public EReference getInterceptorType_DataSource() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(16);
 	}
 
@@ -2211,7 +2211,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_JmsDestination() {
+	public EReference getInterceptorType_JmsConnectionFactory() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(17);
 	}
 
@@ -2220,7 +2220,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_MailSession() {
+	public EReference getInterceptorType_JmsDestination() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(18);
 	}
 
@@ -2229,7 +2229,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_ConnectionFactory() {
+	public EReference getInterceptorType_MailSession() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(19);
 	}
 
@@ -2238,7 +2238,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_AdministeredObject() {
+	public EReference getInterceptorType_ConnectionFactory() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(20);
 	}
 
@@ -2247,7 +2247,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_PostActivates() {
+	public EReference getInterceptorType_AdministeredObject() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(21);
 	}
 
@@ -2256,7 +2256,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInterceptorType_PrePassivates() {
+	public EReference getInterceptorType_PostActivates() {
 		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(22);
 	}
 
@@ -2265,8 +2265,17 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getInterceptorType_PrePassivates() {
+		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(23);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EAttribute getInterceptorType_Id() {
-		return (EAttribute)interceptorTypeEClass.getEStructuralFeatures().get(23);
+		return (EAttribute)interceptorTypeEClass.getEStructuralFeatures().get(24);
 	}
 
 	/**
@@ -4176,6 +4185,7 @@
 		createEAttribute(interceptorTypeEClass, INTERCEPTOR_TYPE__INTERCEPTOR_CLASS);
 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__AROUND_INVOKES);
 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__AROUND_TIMEOUTS);
+		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__AROUND_CONSTRUCT);
 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__ENV_ENTRIES);
 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__EJB_REFS);
 		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__EJB_LOCAL_REFS);
@@ -4634,6 +4644,7 @@
 		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_AroundConstruct(), theJavaeePackage.getLifecycleCallback(), null, "aroundConstruct", 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$
@@ -6255,6 +6266,14 @@
 			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
 		   });		
 		addAnnotation
+		  (getInterceptorType_AroundConstruct(), 
+		   source, 
+		   new String[] {
+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "around-construct", //$NON-NLS-1$ //$NON-NLS-2$
+			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  (getInterceptorType_EnvEntries(), 
 		   source, 
 		   new String[] {
diff --git jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorTypeImpl.java jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorTypeImpl.java
index e81ecd3..84d5563 100644
--- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorTypeImpl.java
+++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorTypeImpl.java
@@ -62,6 +62,7 @@
  *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getInterceptorClass <em>Interceptor Class</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getAroundInvokes <em>Around Invokes</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getAroundTimeouts <em>Around Timeouts</em>}</li>
+ *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getAroundConstruct <em>Around Construct</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEnvEntries <em>Env Entries</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEjbRefs <em>Ejb Refs</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
@@ -137,6 +138,16 @@
 	 * @ordered
 	 */
 	protected EList<AroundTimeoutType> aroundTimeouts;
+
+	/**
+	 * The cached value of the '{@link #getAroundConstruct() <em>Around Construct</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAroundConstruct()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<LifecycleCallback> aroundConstruct;
 
 	/**
 	 * The cached value of the '{@link #getEnvEntries() <em>Env Entries</em>}' containment reference list.
@@ -429,6 +440,18 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public List<LifecycleCallback> getAroundConstruct() {
+		if (aroundConstruct == null) {
+			aroundConstruct = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__AROUND_CONSTRUCT);
+		}
+		return aroundConstruct;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public List<EnvEntry> getEnvEntries() {
 		if (envEntries == null) {
 			envEntries = new EObjectContainmentEList<EnvEntry>(EnvEntry.class, this, EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES);
@@ -687,6 +710,8 @@
 				return ((InternalEList<?>)getAroundInvokes()).basicRemove(otherEnd, msgs);
 			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
 				return ((InternalEList<?>)getAroundTimeouts()).basicRemove(otherEnd, msgs);
+			case EjbPackage.INTERCEPTOR_TYPE__AROUND_CONSTRUCT:
+				return ((InternalEList<?>)getAroundConstruct()).basicRemove(otherEnd, msgs);
 			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
 				return ((InternalEList<?>)getEnvEntries()).basicRemove(otherEnd, msgs);
 			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
@@ -745,6 +770,8 @@
 				return getAroundInvokes();
 			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
 				return getAroundTimeouts();
+			case EjbPackage.INTERCEPTOR_TYPE__AROUND_CONSTRUCT:
+				return getAroundConstruct();
 			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
 				return getEnvEntries();
 			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
@@ -812,6 +839,10 @@
 			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
 				getAroundTimeouts().clear();
 				getAroundTimeouts().addAll((Collection<? extends AroundTimeoutType>)newValue);
+				return;
+			case EjbPackage.INTERCEPTOR_TYPE__AROUND_CONSTRUCT:
+				getAroundConstruct().clear();
+				getAroundConstruct().addAll((Collection<? extends LifecycleCallback>)newValue);
 				return;
 			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
 				getEnvEntries().clear();
@@ -916,6 +947,9 @@
 			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
 				getAroundTimeouts().clear();
 				return;
+			case EjbPackage.INTERCEPTOR_TYPE__AROUND_CONSTRUCT:
+				getAroundConstruct().clear();
+				return;
 			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
 				getEnvEntries().clear();
 				return;
@@ -996,6 +1030,8 @@
 				return aroundInvokes != null && !aroundInvokes.isEmpty();
 			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
 				return aroundTimeouts != null && !aroundTimeouts.isEmpty();
+			case EjbPackage.INTERCEPTOR_TYPE__AROUND_CONSTRUCT:
+				return aroundConstruct != null && !aroundConstruct.isEmpty();
 			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
 				return envEntries != null && !envEntries.isEmpty();
 			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
diff --git jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java
index be40adf..104b090 100644
--- jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java
+++ jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java
@@ -2017,13 +2017,22 @@
 	int INTERCEPTOR_TYPE__AROUND_TIMEOUTS = 3;
 
 	/**
+	 * The feature id for the '<em><b>Around Construct</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERCEPTOR_TYPE__AROUND_CONSTRUCT = 4;
+
+	/**
 	 * The feature id for the '<em><b>Env Entries</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__ENV_ENTRIES = 4;
+	int INTERCEPTOR_TYPE__ENV_ENTRIES = 5;
 
 	/**
 	 * The feature id for the '<em><b>Ejb Refs</b></em>' containment reference list.
@@ -2032,7 +2041,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__EJB_REFS = 5;
+	int INTERCEPTOR_TYPE__EJB_REFS = 6;
 
 	/**
 	 * The feature id for the '<em><b>Ejb Local Refs</b></em>' containment reference list.
@@ -2041,7 +2050,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__EJB_LOCAL_REFS = 6;
+	int INTERCEPTOR_TYPE__EJB_LOCAL_REFS = 7;
 
 	/**
 	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
@@ -2050,7 +2059,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__SERVICE_REFS = 7;
+	int INTERCEPTOR_TYPE__SERVICE_REFS = 8;
 
 	/**
 	 * The feature id for the '<em><b>Resource Refs</b></em>' containment reference list.
@@ -2059,7 +2068,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__RESOURCE_REFS = 8;
+	int INTERCEPTOR_TYPE__RESOURCE_REFS = 9;
 
 	/**
 	 * The feature id for the '<em><b>Resource Env Refs</b></em>' containment reference list.
@@ -2068,7 +2077,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__RESOURCE_ENV_REFS = 9;
+	int INTERCEPTOR_TYPE__RESOURCE_ENV_REFS = 10;
 
 	/**
 	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
@@ -2077,7 +2086,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS = 10;
+	int INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS = 11;
 
 	/**
 	 * The feature id for the '<em><b>Persistence Context Refs</b></em>' containment reference list.
@@ -2086,7 +2095,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS = 11;
+	int INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS = 12;
 
 	/**
 	 * The feature id for the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
@@ -2095,7 +2104,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS = 12;
+	int INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS = 13;
 
 	/**
 	 * The feature id for the '<em><b>Post Constructs</b></em>' containment reference list.
@@ -2104,7 +2113,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__POST_CONSTRUCTS = 13;
+	int INTERCEPTOR_TYPE__POST_CONSTRUCTS = 14;
 
 	/**
 	 * The feature id for the '<em><b>Pre Destroys</b></em>' containment reference list.
@@ -2113,7 +2122,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__PRE_DESTROYS = 14;
+	int INTERCEPTOR_TYPE__PRE_DESTROYS = 15;
 
 	/**
 	 * The feature id for the '<em><b>Data Source</b></em>' containment reference list.
@@ -2122,7 +2131,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__DATA_SOURCE = 15;
+	int INTERCEPTOR_TYPE__DATA_SOURCE = 16;
 
 	/**
 	 * The feature id for the '<em><b>Jms Connection Factory</b></em>' containment reference list.
@@ -2131,7 +2140,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__JMS_CONNECTION_FACTORY = 16;
+	int INTERCEPTOR_TYPE__JMS_CONNECTION_FACTORY = 17;
 
 	/**
 	 * The feature id for the '<em><b>Jms Destination</b></em>' containment reference list.
@@ -2140,7 +2149,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__JMS_DESTINATION = 17;
+	int INTERCEPTOR_TYPE__JMS_DESTINATION = 18;
 
 	/**
 	 * The feature id for the '<em><b>Mail Session</b></em>' containment reference list.
@@ -2149,7 +2158,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__MAIL_SESSION = 18;
+	int INTERCEPTOR_TYPE__MAIL_SESSION = 19;
 
 	/**
 	 * The feature id for the '<em><b>Connection Factory</b></em>' containment reference list.
@@ -2158,7 +2167,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__CONNECTION_FACTORY = 19;
+	int INTERCEPTOR_TYPE__CONNECTION_FACTORY = 20;
 
 	/**
 	 * The feature id for the '<em><b>Administered Object</b></em>' containment reference list.
@@ -2167,7 +2176,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__ADMINISTERED_OBJECT = 20;
+	int INTERCEPTOR_TYPE__ADMINISTERED_OBJECT = 21;
 
 	/**
 	 * The feature id for the '<em><b>Post Activates</b></em>' containment reference list.
@@ -2176,7 +2185,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__POST_ACTIVATES = 21;
+	int INTERCEPTOR_TYPE__POST_ACTIVATES = 22;
 
 	/**
 	 * The feature id for the '<em><b>Pre Passivates</b></em>' containment reference list.
@@ -2185,7 +2194,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__PRE_PASSIVATES = 22;
+	int INTERCEPTOR_TYPE__PRE_PASSIVATES = 23;
 
 	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
@@ -2194,7 +2203,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE__ID = 23;
+	int INTERCEPTOR_TYPE__ID = 24;
 
 	/**
 	 * The number of structural features of the '<em>Interceptor Type</em>' class.
@@ -2203,7 +2212,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERCEPTOR_TYPE_FEATURE_COUNT = 24;
+	int INTERCEPTOR_TYPE_FEATURE_COUNT = 25;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl <em>Message Driven Bean</em>}' class.
@@ -5844,6 +5853,17 @@
 	EReference getInterceptorType_AroundTimeouts();
 
 	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundConstruct <em>Around Construct</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Around Construct</em>'.
+	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getAroundConstruct()
+	 * @see #getInterceptorType()
+	 * @generated
+	 */
+	EReference getInterceptorType_AroundConstruct();
+
+	/**
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries <em>Env Entries</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -9466,6 +9486,14 @@
 		EReference INTERCEPTOR_TYPE__AROUND_TIMEOUTS = eINSTANCE.getInterceptorType_AroundTimeouts();
 
 		/**
+		 * The meta object literal for the '<em><b>Around Construct</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INTERCEPTOR_TYPE__AROUND_CONSTRUCT = eINSTANCE.getInterceptorType_AroundConstruct();
+
+		/**
 		 * The meta object literal for the '<em><b>Env Entries</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git jee-models/org/eclipse/jst/javaee/web/CookieConfigType.java jee-models/org/eclipse/jst/javaee/web/CookieConfigType.java
index 997ce3b..3b95b57 100644
--- jee-models/org/eclipse/jst/javaee/web/CookieConfigType.java
+++ jee-models/org/eclipse/jst/javaee/web/CookieConfigType.java
@@ -232,9 +232,12 @@
 	 * 
 	 * 
 	 *             Specifies whether any session tracking cookies created 
-	 *             by this web application will be marked as secure
-	 *             even if the request that initiated the corresponding session
-	 *             is using plain HTTP instead of HTTPS
+	 *             by this web application will be marked as secure.
+	 *             When true, all session tracking cookies must be marked
+	 *             as secure independent of the nature of the request that
+	 *             initiated the corresponding session.
+	 *             When false, the session cookie should only be marked secure
+	 *             if the request that initiated the session was secure.
 	 *             
 	 *             @since Java EE 6, Web 3.0
 	 *           
diff --git jee-models/org/eclipse/jst/javaee/web/WebApp.java jee-models/org/eclipse/jst/javaee/web/WebApp.java
index 9f9d6bd..74d5456 100644
--- jee-models/org/eclipse/jst/javaee/web/WebApp.java
+++ jee-models/org/eclipse/jst/javaee/web/WebApp.java
@@ -85,6 +85,7 @@
  *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getAdministeredObject <em>Administered Object</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinations <em>Message Destinations</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists <em>Local Encoding Mappings Lists</em>}</li>
+ *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDenyUncoveredHttpMethods <em>Deny Uncovered Http Methods</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getAbsoluteOrdering <em>Absolute Ordering</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete <em>Metadata Complete</em>}</li>
@@ -697,6 +698,29 @@
 	List<LocaleEncodingMappingList> getLocalEncodingMappingsLists();
 
 	/**
+	 * Returns the value of the '<em><b>Deny Uncovered Http Methods</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EmptyType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 
+	 * 
+	 *             When specified, this element causes uncovered http methods
+	 *             to be denied. For every url-pattern that is the target of a 
+	 *             security-constrant, this element causes all HTTP methods that
+	 *             are NOT covered (by a security constraint) at the url-pattern
+	 *             to be denied.
+	 *             
+	 *             @since Java EE 7, Web 3.1
+	 *           
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Deny Uncovered Http Methods</em>' containment reference list.
+	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_DenyUncoveredHttpMethods()
+	 * @generated
+	 */
+	List<EmptyType> getDenyUncoveredHttpMethods();
+
+	/**
 	 * Returns the value of the '<em><b>Absolute Ordering</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.jst.javaee.web.AbsoluteOrderingType}.
 	 * <!-- begin-user-doc -->
diff --git jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java
index 4d13538..4980ec2 100644
--- jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java
+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java
@@ -114,6 +114,7 @@
  *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getAdministeredObject <em>Administered Object</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getMessageDestinations <em>Message Destinations</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getLocalEncodingMappingsLists <em>Local Encoding Mappings Lists</em>}</li>
+ *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDenyUncoveredHttpMethods <em>Deny Uncovered Http Methods</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getAbsoluteOrdering <em>Absolute Ordering</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#isMetadataComplete <em>Metadata Complete</em>}</li>
@@ -581,6 +582,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public List<EmptyType> getDenyUncoveredHttpMethods() {
+		return getGroup().list(WebPackage.Literals.WEB_APP__DENY_UNCOVERED_HTTP_METHODS);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public List<String> getModuleName() {
 		return getGroup().list(WebPackage.Literals.WEB_APP__MODULE_NAME);
 	}
@@ -791,6 +801,8 @@
 				return ((InternalEList<?>)getMessageDestinations()).basicRemove(otherEnd, msgs);
 			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
 				return ((InternalEList<?>)getLocalEncodingMappingsLists()).basicRemove(otherEnd, msgs);
+			case WebPackage.WEB_APP__DENY_UNCOVERED_HTTP_METHODS:
+				return ((InternalEList<?>)getDenyUncoveredHttpMethods()).basicRemove(otherEnd, msgs);
 			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
 				return ((InternalEList<?>)getAbsoluteOrdering()).basicRemove(otherEnd, msgs);
 		}
@@ -884,6 +896,8 @@
 				return getMessageDestinations();
 			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
 				return getLocalEncodingMappingsLists();
+			case WebPackage.WEB_APP__DENY_UNCOVERED_HTTP_METHODS:
+				return getDenyUncoveredHttpMethods();
 			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
 				return getAbsoluteOrdering();
 			case WebPackage.WEB_APP__ID:
@@ -1060,6 +1074,10 @@
 				getLocalEncodingMappingsLists().clear();
 				getLocalEncodingMappingsLists().addAll((Collection<? extends LocaleEncodingMappingList>)newValue);
 				return;
+			case WebPackage.WEB_APP__DENY_UNCOVERED_HTTP_METHODS:
+				getDenyUncoveredHttpMethods().clear();
+				getDenyUncoveredHttpMethods().addAll((Collection<? extends EmptyType>)newValue);
+				return;
 			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
 				getAbsoluteOrdering().clear();
 				getAbsoluteOrdering().addAll((Collection<? extends AbsoluteOrderingType>)newValue);
@@ -1202,6 +1220,9 @@
 			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
 				getLocalEncodingMappingsLists().clear();
 				return;
+			case WebPackage.WEB_APP__DENY_UNCOVERED_HTTP_METHODS:
+				getDenyUncoveredHttpMethods().clear();
+				return;
 			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
 				getAbsoluteOrdering().clear();
 				return;
@@ -1304,6 +1325,8 @@
 				return !getMessageDestinations().isEmpty();
 			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
 				return !getLocalEncodingMappingsLists().isEmpty();
+			case WebPackage.WEB_APP__DENY_UNCOVERED_HTTP_METHODS:
+				return !getDenyUncoveredHttpMethods().isEmpty();
 			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
 				return !getAbsoluteOrdering().isEmpty();
 			case WebPackage.WEB_APP__ID:
diff --git jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
index ee9b24b..d8f414e 100644
--- jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
+++ jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
@@ -1871,6 +1871,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getWebApp_DenyUncoveredHttpMethods() {
+		return (EReference)webAppEClass.getEStructuralFeatures().get(39);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EAttribute getWebApp_ModuleName() {
 		return (EAttribute)webAppEClass.getEStructuralFeatures().get(1);
 	}
@@ -1881,7 +1890,7 @@
 	 * @generated
 	 */
 	public EReference getWebApp_AbsoluteOrdering() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(39);
+		return (EReference)webAppEClass.getEStructuralFeatures().get(40);
 	}
 
 	/**
@@ -1890,15 +1899,6 @@
 	 * @generated
 	 */
 	public EAttribute getWebApp_Id() {
-		return (EAttribute)webAppEClass.getEStructuralFeatures().get(40);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebApp_MetadataComplete() {
 		return (EAttribute)webAppEClass.getEStructuralFeatures().get(41);
 	}
 
@@ -1907,8 +1907,17 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getWebApp_Version() {
+	public EAttribute getWebApp_MetadataComplete() {
 		return (EAttribute)webAppEClass.getEStructuralFeatures().get(42);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getWebApp_Version() {
+		return (EAttribute)webAppEClass.getEStructuralFeatures().get(43);
 	}
 
 	/**
@@ -2836,6 +2845,7 @@
 		createEReference(webAppEClass, WEB_APP__ADMINISTERED_OBJECT);
 		createEReference(webAppEClass, WEB_APP__MESSAGE_DESTINATIONS);
 		createEReference(webAppEClass, WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS);
+		createEReference(webAppEClass, WEB_APP__DENY_UNCOVERED_HTTP_METHODS);
 		createEReference(webAppEClass, WEB_APP__ABSOLUTE_ORDERING);
 		createEAttribute(webAppEClass, WEB_APP__ID);
 		createEAttribute(webAppEClass, WEB_APP__METADATA_COMPLETE);
@@ -3150,6 +3160,7 @@
 		initEReference(getWebApp_AdministeredObject(), theJavaeePackage.getAdministeredObjectType(), null, "administeredObject", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEReference(getWebApp_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEReference(getWebApp_LocalEncodingMappingsLists(), this.getLocaleEncodingMappingList(), null, "localEncodingMappingsLists", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getWebApp_DenyUncoveredHttpMethods(), theJavaeePackage.getEmptyType(), null, "denyUncoveredHttpMethods", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEReference(getWebApp_AbsoluteOrdering(), this.getAbsoluteOrderingType(), null, "absoluteOrdering", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getWebApp_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getWebApp_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -4637,6 +4648,15 @@
 			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
 		   });			
 		addAnnotation
+		  (getWebApp_DenyUncoveredHttpMethods(), 
+		   source, 
+		   new String[] {
+			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "deny-uncovered-http-methods", //$NON-NLS-1$ //$NON-NLS-2$
+			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
 		  (getWebApp_AbsoluteOrdering(), 
 		   source, 
 		   new String[] {
diff --git jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java
index d0d3944..57afe76 100644
--- jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java
+++ jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java
@@ -1956,13 +1956,22 @@
 	int WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = 38;
 
 	/**
+	 * The feature id for the '<em><b>Deny Uncovered Http Methods</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WEB_APP__DENY_UNCOVERED_HTTP_METHODS = 39;
+
+	/**
 	 * The feature id for the '<em><b>Absolute Ordering</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int WEB_APP__ABSOLUTE_ORDERING = 39;
+	int WEB_APP__ABSOLUTE_ORDERING = 40;
 
 	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
@@ -1971,7 +1980,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WEB_APP__ID = 40;
+	int WEB_APP__ID = 41;
 
 	/**
 	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
@@ -1980,7 +1989,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WEB_APP__METADATA_COMPLETE = 41;
+	int WEB_APP__METADATA_COMPLETE = 42;
 
 	/**
 	 * The feature id for the '<em><b>Version</b></em>' attribute.
@@ -1989,7 +1998,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WEB_APP__VERSION = 42;
+	int WEB_APP__VERSION = 43;
 
 	/**
 	 * The number of structural features of the '<em>App</em>' class.
@@ -1998,7 +2007,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WEB_APP_FEATURE_COUNT = 43;
+	int WEB_APP_FEATURE_COUNT = 44;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl <em>App Deployment Descriptor</em>}' class.
@@ -4430,6 +4439,17 @@
 	EReference getWebApp_LocalEncodingMappingsLists();
 
 	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDenyUncoveredHttpMethods <em>Deny Uncovered Http Methods</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Deny Uncovered Http Methods</em>'.
+	 * @see org.eclipse.jst.javaee.web.WebApp#getDenyUncoveredHttpMethods()
+	 * @see #getWebApp()
+	 * @generated
+	 */
+	EReference getWebApp_DenyUncoveredHttpMethods();
+
+	/**
 	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebApp#getModuleName <em>Module Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -6628,6 +6648,14 @@
 		EReference WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = eINSTANCE.getWebApp_LocalEncodingMappingsLists();
 
 		/**
+		 * The meta object literal for the '<em><b>Deny Uncovered Http Methods</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference WEB_APP__DENY_UNCOVERED_HTTP_METHODS = eINSTANCE.getWebApp_DenyUncoveredHttpMethods();
+
+		/**
 		 * The meta object literal for the '<em><b>Module Name</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->