#177 Enhanecs Case Study quality

* Completes the attributes for beans
* speeds up the case study by making getSelectedModules return a static list instead of retreiving it from the tgg file
* IDRegistry does not throw IllegalArgumentExceptions for expected error any more
* minor refactorings

Core/core/src/main/java/org/codeling/lang/base/amt/henshintgg/HenshinTGGTransformation.java

@@ -100,9 +100,11 @@ public class HenshinTGGTransformation extends ModelTransformation {
 
 			try {
 				String id = idRegistry.getIDFromIntermediateLanguageElement(initialObject);
+				if (id == null)
+					continue; // This was a new element in the ADL. Therefore we did not find any id. Ignore
 				idRegistry.updateComponentModelElement(id, targetObject);
-			} catch (IllegalArgumentException e) {
-				// This was a new element in the ADL. Therefore we did not find any id. Ignore
+			} catch (final Throwable t) {
+				log.warning(String.format("Could not update component model element '%s'", initialObject.toString()), t);
 			}
 		}
 	}

Core/core/src/main/java/org/codeling/lang/base/amt/henshintgg/RecoverPriorModelElements.java

@@ -82,26 +82,22 @@ class PriorIlToNewIlCopier extends Copier {
 			// The reference might be not set.
 			return;
 
-		try {
-			if (ref.isMany()) {
-				@SuppressWarnings("unchecked")
-				final
-				Collection<EObject> originalTargetList = (Collection<EObject>) originalTarget;
-				final Collection<EObject> cloneTargetList = new LinkedList<EObject>();
-				for (final EObject originalTargetElement : originalTargetList) {
-					final String targetId = priorIdRegistry.getIDFromIntermediateLanguageElement(originalTargetElement);
-					final EObject cloneTarget = idRegistry.getIntermediateLanguageModelElement(targetId, ilModelRoots);
-					cloneTargetList.add(cloneTarget);
-				}
-				clone.eSet(ref, cloneTargetList);
-			} else {
-				final String targetId = priorIdRegistry.getIDFromIntermediateLanguageElement((EObject) originalTarget);
+		if (ref.isMany()) {
+			@SuppressWarnings("unchecked")
+			final Collection<EObject> originalTargetList = (Collection<EObject>) originalTarget;
+			final Collection<EObject> cloneTargetList = new LinkedList<EObject>();
+			for (final EObject originalTargetElement : originalTargetList) {
+				final String targetId = priorIdRegistry.getIDFromIntermediateLanguageElement(originalTargetElement);
+				if (targetId == null)
+					continue; // this happens, when a prior il object has been deleted. Ignore.
 				final EObject cloneTarget = idRegistry.getIntermediateLanguageModelElement(targetId, ilModelRoots);
-				clone.eSet(ref, cloneTarget);
+				cloneTargetList.add(cloneTarget);
 			}
-		} catch (final IllegalArgumentException e) {
-			// this happens, when a prior il object has been deleted. Ignore.
-			e.printStackTrace();
+			clone.eSet(ref, cloneTargetList);
+		} else {
+			final String targetId = priorIdRegistry.getIDFromIntermediateLanguageElement((EObject) originalTarget);
+			final EObject cloneTarget = idRegistry.getIntermediateLanguageModelElement(targetId, ilModelRoots);
+			clone.eSet(ref, cloneTarget);
 		}
 	}
 }
\ No newline at end of file

Language Integration/JEE/org.codeling.lang.jee.metamodel/META-INF/MANIFEST.MF

@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.codeling.lang.jee.metamodel;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
+Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.core,
  org.eclipse.core.commands,
@@ -36,6 +37,18 @@ Require-Bundle: org.eclipse.jdt.core,
  mechanisms;bundle-version="1.0.0",
  org.eclipse.uml2.uml;bundle-version="5.3.0"
 Bundle-ActivationPolicy: lazy
-Export-Package: org.codeling.lang.jee7.mm.JEE7,
- org.codeling.lang.jee7.mm.JEE7.impl,
- org.codeling.lang.jee7.mm.JEE7.util
+Export-Package: org.codeling.lang.jee7.mm.JEE7;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util",
+ org.codeling.lang.jee7.mm.JEE7.impl;
+  uses:="org.eclipse.emf.ecore,
+   org.codeling.lang.jee7.mm.JEE7,
+   org.eclipse.emf.ecore.impl,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.common.notify",
+ org.codeling.lang.jee7.mm.JEE7.util;
+  uses:="org.eclipse.emf.ecore,
+   org.codeling.lang.jee7.mm.JEE7,
+   org.eclipse.emf.common.notify,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.ecore.util"

Language Integration/JEE/org.codeling.lang.jee.metamodel/metamodel/jee7.ecore

@@ -10,17 +10,30 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SessionBean" eSuperTypes="#//Bean">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isStateless" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
+        defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isStateful" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSingleton" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CDIBean" eSuperTypes="#//Bean">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isRequestScoped" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isTransactionScoped" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSessionScoped" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isApplicationScoped" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isConversationScoped" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FacesBean" eSuperTypes="#//Bean">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isRequestScoped" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSessionScoped" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isApplicationScoped" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isViewScoped" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FacesBean" eSuperTypes="#//Bean"/>
   <eClassifiers xsi:type="ecore:EClass" name="Architecture">
     <eStructuralFeatures xsi:type="ecore:EReference" name="beans" upperBound="-1"
         eType="#//Bean" containment="true"/>

Language Integration/JEE/org.codeling.lang.jee.metamodel/pom.xml

 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.codeling.lang.jee</artifactId>
+	<artifactId>org.codeling.lang.jee.metamodel</artifactId>
 	<name>Codeling JEE Transformations</name>
 	<parent>
 		<groupId>org.codeling</groupId>

Language Integration/JEE/org.codeling.lang.jee.metamodel/src/main/java/org/codeling/lang/jee7/mm/JEE7/CDIBean.java

@@ -13,7 +13,9 @@ package org.codeling.lang.jee7.mm.JEE7;
  * </p>
  * <ul>
  *   <li>{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsRequestScoped <em>Is Request Scoped</em>}</li>
- *   <li>{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsTransactionScoped <em>Is Transaction Scoped</em>}</li>
+ *   <li>{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsSessionScoped <em>Is Session Scoped</em>}</li>
+ *   <li>{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsApplicationScoped <em>Is Application Scoped</em>}</li>
+ *   <li>{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsConversationScoped <em>Is Conversation Scoped</em>}</li>
  * </ul>
  *
  * @see org.codeling.lang.jee7.mm.JEE7.JEE7Package#getCDIBean()
@@ -23,7 +25,7 @@ package org.codeling.lang.jee7.mm.JEE7;
 public interface CDIBean extends Bean {
 	/**
 	 * Returns the value of the '<em><b>Is Request Scoped</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
+	 * The default value is <code>"false"</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Is Request Scoped</em>' attribute isn't clear,
@@ -33,7 +35,7 @@ public interface CDIBean extends Bean {
 	 * @return the value of the '<em>Is Request Scoped</em>' attribute.
 	 * @see #setIsRequestScoped(boolean)
 	 * @see org.codeling.lang.jee7.mm.JEE7.JEE7Package#getCDIBean_IsRequestScoped()
-	 * @model default="true"
+	 * @model default="false"
 	 * @generated
 	 */
 	boolean isIsRequestScoped();
@@ -49,30 +51,84 @@ public interface CDIBean extends Bean {
 	void setIsRequestScoped(boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Is Transaction Scoped</b></em>' attribute.
+	 * Returns the value of the '<em><b>Is Session Scoped</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Is Session Scoped</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is Session Scoped</em>' attribute.
+	 * @see #setIsSessionScoped(boolean)
+	 * @see org.codeling.lang.jee7.mm.JEE7.JEE7Package#getCDIBean_IsSessionScoped()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isIsSessionScoped();
+
+	/**
+	 * Sets the value of the '{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsSessionScoped <em>Is Session Scoped</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is Session Scoped</em>' attribute.
+	 * @see #isIsSessionScoped()
+	 * @generated
+	 */
+	void setIsSessionScoped(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Is Application Scoped</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Is Application Scoped</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is Application Scoped</em>' attribute.
+	 * @see #setIsApplicationScoped(boolean)
+	 * @see org.codeling.lang.jee7.mm.JEE7.JEE7Package#getCDIBean_IsApplicationScoped()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isIsApplicationScoped();
+
+	/**
+	 * Sets the value of the '{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsApplicationScoped <em>Is Application Scoped</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is Application Scoped</em>' attribute.
+	 * @see #isIsApplicationScoped()
+	 * @generated
+	 */
+	void setIsApplicationScoped(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Is Conversation Scoped</b></em>' attribute.
 	 * The default value is <code>"false"</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Is Transaction Scoped</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Is Conversation Scoped</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Is Transaction Scoped</em>' attribute.
-	 * @see #setIsTransactionScoped(boolean)
-	 * @see org.codeling.lang.jee7.mm.JEE7.JEE7Package#getCDIBean_IsTransactionScoped()
+	 * @return the value of the '<em>Is Conversation Scoped</em>' attribute.
+	 * @see #setIsConversationScoped(boolean)
+	 * @see org.codeling.lang.jee7.mm.JEE7.JEE7Package#getCDIBean_IsConversationScoped()
 	 * @model default="false"
 	 * @generated
 	 */
-	boolean isIsTransactionScoped();
+	boolean isIsConversationScoped();
 
 	/**
-	 * Sets the value of the '{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsTransactionScoped <em>Is Transaction Scoped</em>}' attribute.
+	 * Sets the value of the '{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsConversationScoped <em>Is Conversation Scoped</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Transaction Scoped</em>' attribute.
-	 * @see #isIsTransactionScoped()
+	 * @param value the new value of the '<em>Is Conversation Scoped</em>' attribute.
+	 * @see #isIsConversationScoped()
 	 * @generated
 	 */
-	void setIsTransactionScoped(boolean value);
+	void setIsConversationScoped(boolean value);
 
 } // CDIBean

Language Integration/JEE/org.codeling.lang.jee.metamodel/src/main/java/org/codeling/lang/jee7/mm/JEE7/FacesBean.java

@@ -8,10 +8,127 @@ package org.codeling.lang.jee7.mm.JEE7;
  * A representation of the model object '<em><b>Faces Bean</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsRequestScoped <em>Is Request Scoped</em>}</li>
+ *   <li>{@link org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsSessionScoped <em>Is Session Scoped</em>}</li>
+ *   <li>{@link org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsApplicationScoped <em>Is Application Scoped</em>}</li>
+ *   <li>{@link org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsViewScoped <em>Is View Scoped</em>}</li>
+ * </ul>
  *
  * @see org.codeling.lang.jee7.mm.JEE7.JEE7Package#getFacesBean()
  * @model
  * @generated
  */
 public interface FacesBean extends Bean {
+
+	/**
+	 * Returns the value of the '<em><b>Is Request Scoped</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Is Request Scoped</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is Request Scoped</em>' attribute.
+	 * @see #setIsRequestScoped(boolean)
+	 * @see org.codeling.lang.jee7.mm.JEE7.JEE7Package#getFacesBean_IsRequestScoped()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isIsRequestScoped();
+
+	/**
+	 * Sets the value of the '{@link org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsRequestScoped <em>Is Request Scoped</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is Request Scoped</em>' attribute.
+	 * @see #isIsRequestScoped()
+	 * @generated
+	 */
+	void setIsRequestScoped(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Is Session Scoped</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Is Session Scoped</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is Session Scoped</em>' attribute.
+	 * @see #setIsSessionScoped(boolean)
+	 * @see org.codeling.lang.jee7.mm.JEE7.JEE7Package#getFacesBean_IsSessionScoped()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isIsSessionScoped();
+
+	/**
+	 * Sets the value of the '{@link org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsSessionScoped <em>Is Session Scoped</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is Session Scoped</em>' attribute.
+	 * @see #isIsSessionScoped()
+	 * @generated
+	 */
+	void setIsSessionScoped(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Is Application Scoped</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Is Application Scoped</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is Application Scoped</em>' attribute.
+	 * @see #setIsApplicationScoped(boolean)
+	 * @see org.codeling.lang.jee7.mm.JEE7.JEE7Package#getFacesBean_IsApplicationScoped()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isIsApplicationScoped();
+
+	/**
+	 * Sets the value of the '{@link org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsApplicationScoped <em>Is Application Scoped</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is Application Scoped</em>' attribute.
+	 * @see #isIsApplicationScoped()
+	 * @generated
+	 */
+	void setIsApplicationScoped(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Is View Scoped</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Is View Scoped</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is View Scoped</em>' attribute.
+	 * @see #setIsViewScoped(boolean)
+	 * @see org.codeling.lang.jee7.mm.JEE7.JEE7Package#getFacesBean_IsViewScoped()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isIsViewScoped();
+
+	/**
+	 * Sets the value of the '{@link org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsViewScoped <em>Is View Scoped</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is View Scoped</em>' attribute.
+	 * @see #isIsViewScoped()
+	 * @generated
+	 */
+	void setIsViewScoped(boolean value);
 } // FacesBean

Language Integration/JEE/org.codeling.lang.jee.metamodel/src/main/java/org/codeling/lang/jee7/mm/JEE7/JEE7Package.java

@@ -240,13 +240,31 @@ public interface JEE7Package extends EPackage {
 	int CDI_BEAN__IS_REQUEST_SCOPED = BEAN_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Is Transaction Scoped</b></em>' attribute.
+	 * The feature id for the '<em><b>Is Session Scoped</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CDI_BEAN__IS_TRANSACTION_SCOPED = BEAN_FEATURE_COUNT + 1;
+	int CDI_BEAN__IS_SESSION_SCOPED = BEAN_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Is Application Scoped</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDI_BEAN__IS_APPLICATION_SCOPED = BEAN_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Is Conversation Scoped</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDI_BEAN__IS_CONVERSATION_SCOPED = BEAN_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of structural features of the '<em>CDI Bean</em>' class.
@@ -255,7 +273,7 @@ public interface JEE7Package extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDI_BEAN_FEATURE_COUNT = BEAN_FEATURE_COUNT + 2;
+	int CDI_BEAN_FEATURE_COUNT = BEAN_FEATURE_COUNT + 4;
 
 	/**
 	 * The number of operations of the '<em>CDI Bean</em>' class.
@@ -303,6 +321,42 @@ public interface JEE7Package extends EPackage {
 	 */
 	int FACES_BEAN__REFERENCED = BEAN__REFERENCED;
 
+	/**
+	 * The feature id for the '<em><b>Is Request Scoped</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FACES_BEAN__IS_REQUEST_SCOPED = BEAN_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Is Session Scoped</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FACES_BEAN__IS_SESSION_SCOPED = BEAN_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Is Application Scoped</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FACES_BEAN__IS_APPLICATION_SCOPED = BEAN_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Is View Scoped</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FACES_BEAN__IS_VIEW_SCOPED = BEAN_FEATURE_COUNT + 3;
+
 	/**
 	 * The number of structural features of the '<em>Faces Bean</em>' class.
 	 * <!-- begin-user-doc -->
@@ -310,7 +364,7 @@ public interface JEE7Package extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FACES_BEAN_FEATURE_COUNT = BEAN_FEATURE_COUNT + 0;
+	int FACES_BEAN_FEATURE_COUNT = BEAN_FEATURE_COUNT + 4;
 
 	/**
 	 * The number of operations of the '<em>Faces Bean</em>' class.
@@ -851,15 +905,37 @@ public interface JEE7Package extends EPackage {
 	EAttribute getCDIBean_IsRequestScoped();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsTransactionScoped <em>Is Transaction Scoped</em>}'.
+	 * Returns the meta object for the attribute '{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsSessionScoped <em>Is Session Scoped</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is Session Scoped</em>'.
+	 * @see org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsSessionScoped()
+	 * @see #getCDIBean()
+	 * @generated
+	 */
+	EAttribute getCDIBean_IsSessionScoped();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsApplicationScoped <em>Is Application Scoped</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Transaction Scoped</em>'.
-	 * @see org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsTransactionScoped()
+	 * @return the meta object for the attribute '<em>Is Application Scoped</em>'.
+	 * @see org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsApplicationScoped()
 	 * @see #getCDIBean()
 	 * @generated
 	 */
-	EAttribute getCDIBean_IsTransactionScoped();
+	EAttribute getCDIBean_IsApplicationScoped();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsConversationScoped <em>Is Conversation Scoped</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is Conversation Scoped</em>'.
+	 * @see org.codeling.lang.jee7.mm.JEE7.CDIBean#isIsConversationScoped()
+	 * @see #getCDIBean()
+	 * @generated
+	 */
+	EAttribute getCDIBean_IsConversationScoped();
 
 	/**
 	 * Returns the meta object for class '{@link org.codeling.lang.jee7.mm.JEE7.FacesBean <em>Faces Bean</em>}'.
@@ -871,6 +947,50 @@ public interface JEE7Package extends EPackage {
 	 */
 	EClass getFacesBean();
 
+	/**
+	 * Returns the meta object for the attribute '{@link org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsRequestScoped <em>Is Request Scoped</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is Request Scoped</em>'.
+	 * @see org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsRequestScoped()
+	 * @see #getFacesBean()
+	 * @generated
+	 */
+	EAttribute getFacesBean_IsRequestScoped();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsSessionScoped <em>Is Session Scoped</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is Session Scoped</em>'.
+	 * @see org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsSessionScoped()
+	 * @see #getFacesBean()
+	 * @generated
+	 */
+	EAttribute getFacesBean_IsSessionScoped();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsApplicationScoped <em>Is Application Scoped</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is Application Scoped</em>'.
+	 * @see org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsApplicationScoped()
+	 * @see #getFacesBean()
+	 * @generated
+	 */
+	EAttribute getFacesBean_IsApplicationScoped();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsViewScoped <em>Is View Scoped</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is View Scoped</em>'.
+	 * @see org.codeling.lang.jee7.mm.JEE7.FacesBean#isIsViewScoped()
+	 * @see #getFacesBean()
+	 * @generated
+	 */
+	EAttribute getFacesBean_IsViewScoped();
+
 	/**
 	 * Returns the meta object for class '{@link org.codeling.lang.jee7.mm.JEE7.Architecture <em>Architecture</em>}'.
 	 * <!-- begin-user-doc -->
@@ -1326,12 +1446,28 @@ public interface JEE7Package extends EPackage {
 		EAttribute CDI_BEAN__IS_REQUEST_SCOPED = eINSTANCE.getCDIBean_IsRequestScoped();
 
 		/**
-		 * The meta object literal for the '<em><b>Is Transaction Scoped</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Is Session Scoped</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute CDI_BEAN__IS_TRANSACTION_SCOPED = eINSTANCE.getCDIBean_IsTransactionScoped();
+		EAttribute CDI_BEAN__IS_SESSION_SCOPED = eINSTANCE.getCDIBean_IsSessionScoped();
+
+		/**
+		 * The meta object literal for the '<em><b>Is Application Scoped</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDI_BEAN__IS_APPLICATION_SCOPED = eINSTANCE.getCDIBean_IsApplicationScoped();
+
+		/**
+		 * The meta object literal for the '<em><b>Is Conversation Scoped</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDI_BEAN__IS_CONVERSATION_SCOPED = eINSTANCE.getCDIBean_IsConversationScoped();
 
 		/**
 		 * The meta object literal for the '{@link org.codeling.lang.jee7.mm.JEE7.impl.FacesBeanImpl <em>Faces Bean</em>}' class.
@@ -1343,6 +1479,38 @@ public interface JEE7Package extends EPackage {
 		 */
 		EClass FACES_BEAN = eINSTANCE.getFacesBean();
 
+		/**
+		 * The meta object literal for the '<em><b>Is Request Scoped</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FACES_BEAN__IS_REQUEST_SCOPED = eINSTANCE.getFacesBean_IsRequestScoped();
+
+		/**
+		 * The meta object literal for the '<em><b>Is Session Scoped</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FACES_BEAN__IS_SESSION_SCOPED = eINSTANCE.getFacesBean_IsSessionScoped();
+
+		/**
+		 * The meta object literal for the '<em><b>Is Application Scoped</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FACES_BEAN__IS_APPLICATION_SCOPED = eINSTANCE.getFacesBean_IsApplicationScoped();
+
+		/**
+		 * The meta object literal for the '<em><b>Is View Scoped</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FACES_BEAN__IS_VIEW_SCOPED = eINSTANCE.getFacesBean_IsViewScoped();
+
 		/**
 		 * The meta object literal for the '{@link org.codeling.lang.jee7.mm.JEE7.impl.ArchitectureImpl <em>Architecture</em>}' class.
 		 * <!-- begin-user-doc -->

Language Integration/JEE/org.codeling.lang.jee.metamodel/src/main/java/org/codeling/lang/jee7/mm/JEE7/SessionBean.java

@@ -24,7 +24,7 @@ package org.codeling.lang.jee7.mm.JEE7;
 public interface SessionBean extends Bean {