Improve setup related models

14 files changed, 1117 insertions, 72 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/ExclusionPredicate.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/ExclusionPredicate.java
new file mode 100644
index 0000000000..af31a2154c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/ExclusionPredicate.java
@@ -0,0 +1,42 @@
+/**
+ */
+package org.eclipse.emf.cdo.releng.workingsets;
+
+import org.eclipse.emf.cdo.releng.predicates.Predicate;
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Exclusion Predicate</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.ExclusionPredicate#getExcludedWorkingSets <em>Excluded Working Sets</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage#getExclusionPredicate()
+ * @model
+ * @generated
+ */
+public interface ExclusionPredicate extends Predicate
+{
+  /**
+   * Returns the value of the '<em><b>Excluded Working Sets</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Excluded Working Sets</em>' reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Excluded Working Sets</em>' reference list.
+   * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage#getExclusionPredicate_ExcludedWorkingSets()
+   * @model
+   * @generated
+   */
+  EList<WorkingSet> getExcludedWorkingSets();
+
+} // ExclusionPredicate
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/InclusionPredicate.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/InclusionPredicate.java
new file mode 100644
index 0000000000..f6adae833a
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/InclusionPredicate.java
@@ -0,0 +1,42 @@
+/**
+ */
+package org.eclipse.emf.cdo.releng.workingsets;
+
+import org.eclipse.emf.cdo.releng.predicates.Predicate;
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Inclusion Predicate</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.InclusionPredicate#getIncludedWorkingSets <em>Included Working Sets</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage#getInclusionPredicate()
+ * @model
+ * @generated
+ */
+public interface InclusionPredicate extends Predicate
+{
+  /**
+   * Returns the value of the '<em><b>Included Working Sets</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Included Working Sets</em>' reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Included Working Sets</em>' reference list.
+   * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage#getInclusionPredicate_IncludedWorkingSets()
+   * @model
+   * @generated
+   */
+  EList<WorkingSet> getIncludedWorkingSets();
+
+} // InclusionPredicate
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java
index 9e2f16a94f..c9cfe9c508 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.emf.cdo.releng.workingsets;
 
+import org.eclipse.core.resources.IProject;
 import org.eclipse.emf.cdo.releng.predicates.Predicate;
 
 import org.eclipse.emf.common.util.EList;
@@ -68,29 +69,37 @@ public interface WorkingSet extends EObject
   String getId();
 
   /**
-  	 * Sets the value of the '{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getId <em>Id</em>}' attribute.
-  	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getId <em>Id</em>}' attribute.
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @param value the new value of the '<em>Id</em>' attribute.
-  	 * @see #getId()
-  	 * @generated
-  	 */
+   * @param value the new value of the '<em>Id</em>' attribute.
+   * @see #getId()
+   * @generated
+   */
   void setId(String value);
 
   /**
-  	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-  	 * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Name</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-  	 * @return the value of the '<em>Name</em>' attribute.
-  	 * @see #setName(String)
-  	 * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage#getWorkingSet_Name()
-  	 * @model required="true"
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @model projectDataType="org.eclipse.emf.cdo.releng.workingsets.Project"
+   * @generated
+   */
+  boolean matches(IProject project);
+
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+       * <p>
+       * If the meaning of the '<em>Name</em>' attribute isn't clear,
+       * there really should be more of a description here...
+       * </p>
+       * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage#getWorkingSet_Name()
+   * @model required="true"
+   * @generated
+   */
   String getName();
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetGroup.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetGroup.java
index 715f2ce9ec..4dcecc57ae 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetGroup.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetGroup.java
@@ -47,4 +47,12 @@ public interface WorkingSetGroup extends EObject
    */
   EList<WorkingSet> getWorkingSets();
 
+  /**
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @model
+   * @generated
+   */
+  WorkingSet getWorkingSet(String name);
+
 } // WorkingSetGroup
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsFactory.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsFactory.java
index 7956d18d5f..8b09c661c5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsFactory.java
@@ -49,9 +49,27 @@ public interface WorkingSetsFactory extends EFactory
   WorkingSetGroup createWorkingSetGroup();
 
   /**
-   * Returns the package supported by this factory.
+   * Returns a new object of class '<em>Exclusion Predicate</em>'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @return a new object of class '<em>Exclusion Predicate</em>'.
+   * @generated
+   */
+  ExclusionPredicate createExclusionPredicate();
+
+  /**
+   * Returns a new object of class '<em>Inclusion Predicate</em>'.
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @return a new object of class '<em>Inclusion Predicate</em>'.
+   * @generated
+   */
+  InclusionPredicate createInclusionPredicate();
+
+  /**
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsPackage.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsPackage.java
index 59d098ee3a..872f685821 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsPackage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsPackage.java
@@ -10,9 +10,11 @@
  */
 package org.eclipse.emf.cdo.releng.workingsets;
 
+import org.eclipse.emf.cdo.releng.predicates.PredicatesPackage;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
@@ -104,22 +106,31 @@ public interface WorkingSetsPackage extends EPackage
   int WORKING_SET__ID = 2;
 
   /**
-  	 * The number of structural features of the '<em>Working Set</em>' class.
-  	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Working Set</em>' class.
+   * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * @generated
+   * @ordered
+   */
   int WORKING_SET_FEATURE_COUNT = 3;
 
   /**
-   * The number of operations of the '<em>Working Set</em>' class.
+   * The operation id for the '<em>Matches</em>' operation.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int WORKING_SET_OPERATION_COUNT = 0;
+  int WORKING_SET___MATCHES__IPROJECT = 0;
+
+  /**
+   * The number of operations of the '<em>Working Set</em>' class.
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int WORKING_SET_OPERATION_COUNT = 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetGroupImpl <em>Working Set Group</em>}' class.
@@ -150,23 +161,124 @@ public interface WorkingSetsPackage extends EPackage
   int WORKING_SET_GROUP_FEATURE_COUNT = 1;
 
   /**
+   * The operation id for the '<em>Get Working Set</em>' operation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int WORKING_SET_GROUP___GET_WORKING_SET__STRING = 0;
+
+  /**
    * The number of operations of the '<em>Working Set Group</em>' class.
    * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int WORKING_SET_GROUP_OPERATION_COUNT = 1;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.releng.workingsets.impl.ExclusionPredicateImpl <em>Exclusion Predicate</em>}' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.releng.workingsets.impl.ExclusionPredicateImpl
+   * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getExclusionPredicate()
+   * @generated
+   */
+  int EXCLUSION_PREDICATE = 2;
+
+  /**
+   * The feature id for the '<em><b>Excluded Working Sets</b></em>' reference list.
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int WORKING_SET_GROUP_OPERATION_COUNT = 0;
+  int EXCLUSION_PREDICATE__EXCLUDED_WORKING_SETS = PredicatesPackage.PREDICATE_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '<em>Project</em>' data type.
+   * The number of structural features of the '<em>Exclusion Predicate</em>' class.
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int EXCLUSION_PREDICATE_FEATURE_COUNT = PredicatesPackage.PREDICATE_FEATURE_COUNT + 1;
+
+  /**
+   * The operation id for the '<em>Matches</em>' operation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int EXCLUSION_PREDICATE___MATCHES__IPROJECT = PredicatesPackage.PREDICATE___MATCHES__IPROJECT;
+
+  /**
+   * The number of operations of the '<em>Exclusion Predicate</em>' class.
+   * <!-- begin-user-doc -->
+    	 * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int EXCLUSION_PREDICATE_OPERATION_COUNT = PredicatesPackage.PREDICATE_OPERATION_COUNT + 0;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.releng.workingsets.impl.InclusionPredicateImpl <em>Inclusion Predicate</em>}' class.
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.releng.workingsets.impl.InclusionPredicateImpl
+   * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getInclusionPredicate()
+   * @generated
+   */
+  int INCLUSION_PREDICATE = 3;
+
+  /**
+   * The feature id for the '<em><b>Included Working Sets</b></em>' reference list.
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INCLUSION_PREDICATE__INCLUDED_WORKING_SETS = PredicatesPackage.PREDICATE_FEATURE_COUNT + 0;
+
+  /**
+   * The number of structural features of the '<em>Inclusion Predicate</em>' class.
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INCLUSION_PREDICATE_FEATURE_COUNT = PredicatesPackage.PREDICATE_FEATURE_COUNT + 1;
+
+  /**
+   * The operation id for the '<em>Matches</em>' operation.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INCLUSION_PREDICATE___MATCHES__IPROJECT = PredicatesPackage.PREDICATE___MATCHES__IPROJECT;
+
+  /**
+   * The number of operations of the '<em>Inclusion Predicate</em>' class.
+   * <!-- begin-user-doc -->
+    	 * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INCLUSION_PREDICATE_OPERATION_COUNT = PredicatesPackage.PREDICATE_OPERATION_COUNT + 0;
+
+  /**
+   * The meta object id for the '<em>Project</em>' data type.
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
    * @see org.eclipse.core.resources.IProject
    * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getProject()
    * @generated
    */
-  int PROJECT = 2;
+  int PROJECT = 4;
 
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet <em>Working Set</em>}'.
@@ -201,14 +313,24 @@ public interface WorkingSetsPackage extends EPackage
   EAttribute getWorkingSet_Id();
 
   /**
-  	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getName <em>Name</em>}'.
-  	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-  	 * @return the meta object for the attribute '<em>Name</em>'.
-  	 * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getName()
-  	 * @see #getWorkingSet()
-  	 * @generated
-  	 */
+   * Returns the meta object for the '{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#matches(org.eclipse.core.resources.IProject) <em>Matches</em>}' operation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the '<em>Matches</em>' operation.
+   * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSet#matches(org.eclipse.core.resources.IProject)
+   * @generated
+   */
+  EOperation getWorkingSet__Matches__IProject();
+
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getName <em>Name</em>}'.
+   * <!-- begin-user-doc -->
+       * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getName()
+   * @see #getWorkingSet()
+   * @generated
+   */
   EAttribute getWorkingSet_Name();
 
   /**
@@ -233,9 +355,61 @@ public interface WorkingSetsPackage extends EPackage
   EReference getWorkingSetGroup_WorkingSets();
 
   /**
-   * Returns the meta object for data type '{@link org.eclipse.core.resources.IProject <em>Project</em>}'.
+   * Returns the meta object for the '{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup#getWorkingSet(java.lang.String) <em>Get Working Set</em>}' operation.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @return the meta object for the '<em>Get Working Set</em>' operation.
+   * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup#getWorkingSet(java.lang.String)
+   * @generated
+   */
+  EOperation getWorkingSetGroup__GetWorkingSet__String();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.workingsets.ExclusionPredicate <em>Exclusion Predicate</em>}'.
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Exclusion Predicate</em>'.
+   * @see org.eclipse.emf.cdo.releng.workingsets.ExclusionPredicate
+   * @generated
+   */
+  EClass getExclusionPredicate();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.releng.workingsets.ExclusionPredicate#getExcludedWorkingSets <em>Excluded Working Sets</em>}'.
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>Excluded Working Sets</em>'.
+   * @see org.eclipse.emf.cdo.releng.workingsets.ExclusionPredicate#getExcludedWorkingSets()
+   * @see #getExclusionPredicate()
+   * @generated
+   */
+  EReference getExclusionPredicate_ExcludedWorkingSets();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.workingsets.InclusionPredicate <em>Inclusion Predicate</em>}'.
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Inclusion Predicate</em>'.
+   * @see org.eclipse.emf.cdo.releng.workingsets.InclusionPredicate
+   * @generated
+   */
+  EClass getInclusionPredicate();
+
+  /**
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.releng.workingsets.InclusionPredicate#getIncludedWorkingSets <em>Included Working Sets</em>}'.
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>Included Working Sets</em>'.
+   * @see org.eclipse.emf.cdo.releng.workingsets.InclusionPredicate#getIncludedWorkingSets()
+   * @see #getInclusionPredicate()
+   * @generated
+   */
+  EReference getInclusionPredicate_IncludedWorkingSets();
+
+  /**
+   * Returns the meta object for data type '{@link org.eclipse.core.resources.IProject <em>Project</em>}'.
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
    * @return the meta object for data type '<em>Project</em>'.
    * @see org.eclipse.core.resources.IProject
    * @model instanceClass="org.eclipse.core.resources.IProject" serializeable="false"
@@ -294,11 +468,19 @@ public interface WorkingSetsPackage extends EPackage
     EAttribute WORKING_SET__ID = eINSTANCE.getWorkingSet_Id();
 
     /**
-    	 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-    	 * <!-- begin-user-doc -->
-       * <!-- end-user-doc -->
-    	 * @generated
-    	 */
+     * The meta object literal for the '<em><b>Matches</b></em>' operation.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EOperation WORKING_SET___MATCHES__IPROJECT = eINSTANCE.getWorkingSet__Matches__IProject();
+
+    /**
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+     * @generated
+     */
     EAttribute WORKING_SET__NAME = eINSTANCE.getWorkingSet_Name();
 
     /**
@@ -320,9 +502,53 @@ public interface WorkingSetsPackage extends EPackage
     EReference WORKING_SET_GROUP__WORKING_SETS = eINSTANCE.getWorkingSetGroup_WorkingSets();
 
     /**
-     * The meta object literal for the '<em>Project</em>' data type.
+     * The meta object literal for the '<em><b>Get Working Set</b></em>' operation.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @generated
+     */
+    EOperation WORKING_SET_GROUP___GET_WORKING_SET__STRING = eINSTANCE.getWorkingSetGroup__GetWorkingSet__String();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.workingsets.impl.ExclusionPredicateImpl <em>Exclusion Predicate</em>}' class.
+     * <!-- begin-user-doc -->
+       * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.releng.workingsets.impl.ExclusionPredicateImpl
+     * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getExclusionPredicate()
+     * @generated
+     */
+    EClass EXCLUSION_PREDICATE = eINSTANCE.getExclusionPredicate();
+
+    /**
+     * The meta object literal for the '<em><b>Excluded Working Sets</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
+    	 * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference EXCLUSION_PREDICATE__EXCLUDED_WORKING_SETS = eINSTANCE.getExclusionPredicate_ExcludedWorkingSets();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.workingsets.impl.InclusionPredicateImpl <em>Inclusion Predicate</em>}' class.
+     * <!-- begin-user-doc -->
+    	 * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.releng.workingsets.impl.InclusionPredicateImpl
+     * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getInclusionPredicate()
+     * @generated
+     */
+    EClass INCLUSION_PREDICATE = eINSTANCE.getInclusionPredicate();
+
+    /**
+     * The meta object literal for the '<em><b>Included Working Sets</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
+    	 * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference INCLUSION_PREDICATE__INCLUDED_WORKING_SETS = eINSTANCE.getInclusionPredicate_IncludedWorkingSets();
+
+    /**
+     * The meta object literal for the '<em>Project</em>' data type.
+     * <!-- begin-user-doc -->
+       * <!-- end-user-doc -->
      * @see org.eclipse.core.resources.IProject
      * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getProject()
      * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/ExclusionPredicateImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/ExclusionPredicateImpl.java
new file mode 100644
index 0000000000..908d4716f2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/ExclusionPredicateImpl.java
@@ -0,0 +1,181 @@
+/**
+ */
+package org.eclipse.emf.cdo.releng.workingsets.impl;
+
+import org.eclipse.emf.cdo.releng.workingsets.ExclusionPredicate;
+import org.eclipse.emf.cdo.releng.workingsets.WorkingSet;
+import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
+import org.eclipse.core.resources.IProject;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Exclusion Predicate</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.impl.ExclusionPredicateImpl#getExcludedWorkingSets <em>Excluded Working Sets</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ExclusionPredicateImpl extends MinimalEObjectImpl.Container implements ExclusionPredicate
+{
+  /**
+   * The cached value of the '{@link #getExcludedWorkingSets() <em>Excluded Working Sets</em>}' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getExcludedWorkingSets()
+   * @generated
+   * @ordered
+   */
+  protected EList<WorkingSet> excludedWorkingSets;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ExclusionPredicateImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return WorkingSetsPackage.Literals.EXCLUSION_PREDICATE;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EList<WorkingSet> getExcludedWorkingSets()
+  {
+    if (excludedWorkingSets == null)
+    {
+      excludedWorkingSets = new EObjectResolvingEList<WorkingSet>(WorkingSet.class, this,
+          WorkingSetsPackage.EXCLUSION_PREDICATE__EXCLUDED_WORKING_SETS);
+    }
+    return excludedWorkingSets;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated NOT
+   */
+  public boolean matches(IProject project)
+  {
+    for (WorkingSet workingSet : getExcludedWorkingSets())
+    {
+      if (workingSet.matches(project))
+      {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case WorkingSetsPackage.EXCLUSION_PREDICATE__EXCLUDED_WORKING_SETS:
+      return getExcludedWorkingSets();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case WorkingSetsPackage.EXCLUSION_PREDICATE__EXCLUDED_WORKING_SETS:
+      getExcludedWorkingSets().clear();
+      getExcludedWorkingSets().addAll((Collection<? extends WorkingSet>)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case WorkingSetsPackage.EXCLUSION_PREDICATE__EXCLUDED_WORKING_SETS:
+      getExcludedWorkingSets().clear();
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case WorkingSetsPackage.EXCLUSION_PREDICATE__EXCLUDED_WORKING_SETS:
+      return excludedWorkingSets != null && !excludedWorkingSets.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException
+  {
+    switch (operationID)
+    {
+    case WorkingSetsPackage.EXCLUSION_PREDICATE___MATCHES__IPROJECT:
+      return matches((IProject)arguments.get(0));
+    }
+    return super.eInvoke(operationID, arguments);
+  }
+
+} // ExclusionPredicateImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/InclusionPredicateImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/InclusionPredicateImpl.java
new file mode 100644
index 0000000000..fddddc13fd
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/InclusionPredicateImpl.java
@@ -0,0 +1,181 @@
+/**
+ */
+package org.eclipse.emf.cdo.releng.workingsets.impl;
+
+import org.eclipse.emf.cdo.releng.workingsets.InclusionPredicate;
+import org.eclipse.emf.cdo.releng.workingsets.WorkingSet;
+import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
+import org.eclipse.core.resources.IProject;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Inclusion Predicate</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.impl.InclusionPredicateImpl#getIncludedWorkingSets <em>Included Working Sets</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class InclusionPredicateImpl extends MinimalEObjectImpl.Container implements InclusionPredicate
+{
+  /**
+   * The cached value of the '{@link #getIncludedWorkingSets() <em>Included Working Sets</em>}' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getIncludedWorkingSets()
+   * @generated
+   * @ordered
+   */
+  protected EList<WorkingSet> includedWorkingSets;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected InclusionPredicateImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return WorkingSetsPackage.Literals.INCLUSION_PREDICATE;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EList<WorkingSet> getIncludedWorkingSets()
+  {
+    if (includedWorkingSets == null)
+    {
+      includedWorkingSets = new EObjectResolvingEList<WorkingSet>(WorkingSet.class, this,
+          WorkingSetsPackage.INCLUSION_PREDICATE__INCLUDED_WORKING_SETS);
+    }
+    return includedWorkingSets;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated NOT
+   */
+  public boolean matches(IProject project)
+  {
+    for (WorkingSet workingSet : getIncludedWorkingSets())
+    {
+      if (workingSet.matches(project))
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case WorkingSetsPackage.INCLUSION_PREDICATE__INCLUDED_WORKING_SETS:
+      return getIncludedWorkingSets();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case WorkingSetsPackage.INCLUSION_PREDICATE__INCLUDED_WORKING_SETS:
+      getIncludedWorkingSets().clear();
+      getIncludedWorkingSets().addAll((Collection<? extends WorkingSet>)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case WorkingSetsPackage.INCLUSION_PREDICATE__INCLUDED_WORKING_SETS:
+      getIncludedWorkingSets().clear();
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case WorkingSetsPackage.INCLUSION_PREDICATE__INCLUDED_WORKING_SETS:
+      return includedWorkingSets != null && !includedWorkingSets.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException
+  {
+    switch (operationID)
+    {
+    case WorkingSetsPackage.INCLUSION_PREDICATE___MATCHES__IPROJECT:
+      return matches((IProject)arguments.get(0));
+    }
+    return super.eInvoke(operationID, arguments);
+  }
+
+} // InclusionPredicateImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetGroupImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetGroupImpl.java
index 2558a5ffa6..c600d7a058 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetGroupImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetGroupImpl.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 
 /**
@@ -88,6 +89,24 @@ public class WorkingSetGroupImpl extends MinimalEObjectImpl.Container implements
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @generated NOT
+   */
+  public WorkingSet getWorkingSet(String name)
+  {
+    for (WorkingSet workingSet : getWorkingSets())
+    {
+      if (name.equals(workingSet.getName()))
+      {
+        return workingSet;
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -169,4 +188,20 @@ public class WorkingSetGroupImpl extends MinimalEObjectImpl.Container implements
     return super.eIsSet(featureID);
   }
 
+  /**
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException
+  {
+    switch (operationID)
+    {
+    case WorkingSetsPackage.WORKING_SET_GROUP___GET_WORKING_SET__STRING:
+      return getWorkingSet((String)arguments.get(0));
+    }
+    return super.eInvoke(operationID, arguments);
+  }
+
 } // WorkingSetGroupImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java
index d53c96b12c..50746875ae 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java
@@ -24,6 +24,9 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
+import org.eclipse.core.resources.IProject;
+
+import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 
 /**
@@ -84,20 +87,20 @@ public class WorkingSetImpl extends MinimalEObjectImpl.Container implements Work
   protected static final String ID_EDEFAULT = null;
 
   /**
-  	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-  	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @see #getId()
-  	 * @generated
-  	 * @ordered
-  	 */
+   * @see #getId()
+   * @generated
+   * @ordered
+   */
   protected String id = ID_EDEFAULT;
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   protected WorkingSetImpl()
   {
     super();
@@ -140,10 +143,10 @@ public class WorkingSetImpl extends MinimalEObjectImpl.Container implements Work
   }
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   public void setId(String newId)
   {
     String oldId = id;
@@ -153,10 +156,28 @@ public class WorkingSetImpl extends MinimalEObjectImpl.Container implements Work
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated NOT
+   */
+  public boolean matches(IProject project)
+  {
+    for (Predicate predicate : getPredicates())
+    {
+      if (predicate.matches(project))
+      {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+       * <!-- end-user-doc -->
+   * @generated
+   */
   public String getName()
   {
     return name;
@@ -285,6 +306,22 @@ public class WorkingSetImpl extends MinimalEObjectImpl.Container implements Work
    * @generated
    */
   @Override
+  public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException
+  {
+    switch (operationID)
+    {
+    case WorkingSetsPackage.WORKING_SET___MATCHES__IPROJECT:
+      return matches((IProject)arguments.get(0));
+    }
+    return super.eInvoke(operationID, arguments);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
   public String toString()
   {
     if (eIsProxy())
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java
index 6411e08e84..fe07cc3b8f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java
@@ -10,11 +10,11 @@
  */
 package org.eclipse.emf.cdo.releng.workingsets.impl;
 
+import org.eclipse.emf.cdo.releng.workingsets.*;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSet;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsFactory;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
@@ -79,6 +79,10 @@ public class WorkingSetsFactoryImpl extends EFactoryImpl implements WorkingSetsF
       return createWorkingSet();
     case WorkingSetsPackage.WORKING_SET_GROUP:
       return createWorkingSetGroup();
+    case WorkingSetsPackage.EXCLUSION_PREDICATE:
+      return createExclusionPredicate();
+    case WorkingSetsPackage.INCLUSION_PREDICATE:
+      return createInclusionPredicate();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -141,6 +145,28 @@ public class WorkingSetsFactoryImpl extends EFactoryImpl implements WorkingSetsF
    * <!-- end-user-doc -->
    * @generated
    */
+  public ExclusionPredicate createExclusionPredicate()
+  {
+    ExclusionPredicateImpl exclusionPredicate = new ExclusionPredicateImpl();
+    return exclusionPredicate;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @generated
+   */
+  public InclusionPredicate createInclusionPredicate()
+  {
+    InclusionPredicateImpl inclusionPredicate = new InclusionPredicateImpl();
+    return inclusionPredicate;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+   * @generated
+   */
   public WorkingSetsPackage getWorkingSetsPackage()
   {
     return (WorkingSetsPackage)getEPackage();
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java
index 9edf3793cf..0e02caf4a5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java
@@ -11,6 +11,8 @@
 package org.eclipse.emf.cdo.releng.workingsets.impl;
 
 import org.eclipse.emf.cdo.releng.predicates.PredicatesPackage;
+import org.eclipse.emf.cdo.releng.workingsets.ExclusionPredicate;
+import org.eclipse.emf.cdo.releng.workingsets.InclusionPredicate;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSet;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsFactory;
@@ -19,6 +21,7 @@ import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
@@ -52,6 +55,20 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
    * <!-- end-user-doc -->
    * @generated
    */
+  private EClass exclusionPredicateEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass inclusionPredicateEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+   * @generated
+   */
   private EDataType projectEDataType = null;
 
   /**
@@ -152,10 +169,20 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EOperation getWorkingSet__Matches__IProject()
+  {
+    return workingSetEClass.getEOperations().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+       * <!-- end-user-doc -->
+   * @generated
+   */
   public EAttribute getWorkingSet_Name()
   {
     return (EAttribute)workingSetEClass.getEStructuralFeatures().get(0);
@@ -186,6 +213,56 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
    * <!-- end-user-doc -->
    * @generated
    */
+  public EOperation getWorkingSetGroup__GetWorkingSet__String()
+  {
+    return workingSetGroupEClass.getEOperations().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getExclusionPredicate()
+  {
+    return exclusionPredicateEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getExclusionPredicate_ExcludedWorkingSets()
+  {
+    return (EReference)exclusionPredicateEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @generated
+   */
+  public EClass getInclusionPredicate()
+  {
+    return inclusionPredicateEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+   * @generated
+   */
+  public EReference getInclusionPredicate_IncludedWorkingSets()
+  {
+    return (EReference)inclusionPredicateEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+   * @generated
+   */
   public EDataType getProject()
   {
     return projectEDataType;
@@ -226,9 +303,17 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
     createEAttribute(workingSetEClass, WORKING_SET__NAME);
     createEReference(workingSetEClass, WORKING_SET__PREDICATES);
     createEAttribute(workingSetEClass, WORKING_SET__ID);
+    createEOperation(workingSetEClass, WORKING_SET___MATCHES__IPROJECT);
 
     workingSetGroupEClass = createEClass(WORKING_SET_GROUP);
     createEReference(workingSetGroupEClass, WORKING_SET_GROUP__WORKING_SETS);
+    createEOperation(workingSetGroupEClass, WORKING_SET_GROUP___GET_WORKING_SET__STRING);
+
+    exclusionPredicateEClass = createEClass(EXCLUSION_PREDICATE);
+    createEReference(exclusionPredicateEClass, EXCLUSION_PREDICATE__EXCLUDED_WORKING_SETS);
+
+    inclusionPredicateEClass = createEClass(INCLUSION_PREDICATE);
+    createEReference(inclusionPredicateEClass, INCLUSION_PREDICATE__INCLUDED_WORKING_SETS);
 
     // Create data types
     projectEDataType = createEDataType(PROJECT);
@@ -268,6 +353,8 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
     // Set bounds for type parameters
 
     // Add supertypes to classes
+    exclusionPredicateEClass.getESuperTypes().add(thePredicatesPackage.getPredicate());
+    inclusionPredicateEClass.getESuperTypes().add(thePredicatesPackage.getPredicate());
 
     // Initialize classes, features, and operations; add parameters
     initEClass(workingSetEClass, WorkingSet.class, "WorkingSet", !IS_ABSTRACT, !IS_INTERFACE,
@@ -280,6 +367,10 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
     initEAttribute(getWorkingSet_Id(), ecorePackage.getEString(), "id", null, 0, 1, WorkingSet.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+    EOperation op = initEOperation(getWorkingSet__Matches__IProject(), ecorePackage.getEBoolean(), "matches", 0, 1,
+        IS_UNIQUE, IS_ORDERED);
+    addEParameter(op, this.getProject(), "project", 0, 1, IS_UNIQUE, IS_ORDERED);
+
     initEClass(workingSetGroupEClass, WorkingSetGroup.class, "WorkingSetGroup", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getWorkingSetGroup_WorkingSets(), this.getWorkingSet(), null, "workingSets", null, 0, -1,
@@ -287,6 +378,22 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     getWorkingSetGroup_WorkingSets().getEKeys().add(this.getWorkingSet_Name());
 
+    op = initEOperation(getWorkingSetGroup__GetWorkingSet__String(), this.getWorkingSet(), "getWorkingSet", 0, 1,
+        IS_UNIQUE, IS_ORDERED);
+    addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+    initEClass(exclusionPredicateEClass, ExclusionPredicate.class, "ExclusionPredicate", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getExclusionPredicate_ExcludedWorkingSets(), this.getWorkingSet(), null, "excludedWorkingSets",
+        null, 0, -1, ExclusionPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(inclusionPredicateEClass, InclusionPredicate.class, "InclusionPredicate", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getInclusionPredicate_IncludedWorkingSets(), this.getWorkingSet(), null, "includedWorkingSets",
+        null, 0, -1, InclusionPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
     // Initialize data types
     initEDataType(projectEDataType, IProject.class, "Project", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java
index f891c379a3..9032c76bc1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java
@@ -10,10 +10,11 @@
  */
 package org.eclipse.emf.cdo.releng.workingsets.util;
 
+import org.eclipse.emf.cdo.releng.predicates.Predicate;
+import org.eclipse.emf.cdo.releng.workingsets.*;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSet;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage;
-
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
@@ -94,6 +95,24 @@ public class WorkingSetsAdapterFactory extends AdapterFactoryImpl
     }
 
     @Override
+    public Adapter caseExclusionPredicate(ExclusionPredicate object)
+    {
+      return createExclusionPredicateAdapter();
+    }
+
+    @Override
+    public Adapter caseInclusionPredicate(InclusionPredicate object)
+    {
+      return createInclusionPredicateAdapter();
+    }
+
+    @Override
+    public Adapter casePredicate(Predicate object)
+    {
+      return createPredicateAdapter();
+    }
+
+    @Override
     public Adapter defaultCase(EObject object)
     {
       return createEObjectAdapter();
@@ -145,11 +164,56 @@ public class WorkingSetsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for the default case.
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.workingsets.ExclusionPredicate <em>Exclusion Predicate</em>}'.
    * <!-- begin-user-doc -->
-   * This default implementation returns null.
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
    * @return the new adapter.
+   * @see org.eclipse.emf.cdo.releng.workingsets.ExclusionPredicate
+   * @generated
+   */
+  public Adapter createExclusionPredicateAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.workingsets.InclusionPredicate <em>Inclusion Predicate</em>}'.
+   * <!-- begin-user-doc -->
+  	 * This default implementation returns null so that we can easily ignore cases;
+  	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+  	 * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.releng.workingsets.InclusionPredicate
+   * @generated
+   */
+  public Adapter createInclusionPredicateAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.predicates.Predicate <em>Predicate</em>}'.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @see org.eclipse.emf.cdo.releng.predicates.Predicate
+   * @generated
+   */
+  public Adapter createPredicateAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc -->
+       * This default implementation returns null.
+       * <!-- end-user-doc -->
+   * @return the new adapter.
    * @generated
    */
   public Adapter createEObjectAdapter()
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java
index c0ace2837f..01f8f7c270 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java
@@ -10,10 +10,11 @@
  */
 package org.eclipse.emf.cdo.releng.workingsets.util;
 
+import org.eclipse.emf.cdo.releng.predicates.Predicate;
+import org.eclipse.emf.cdo.releng.workingsets.*;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSet;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
@@ -97,6 +98,26 @@ public class WorkingSetsSwitch<T> extends Switch<T>
         result = defaultCase(theEObject);
       return result;
     }
+    case WorkingSetsPackage.EXCLUSION_PREDICATE:
+    {
+      ExclusionPredicate exclusionPredicate = (ExclusionPredicate)theEObject;
+      T result = caseExclusionPredicate(exclusionPredicate);
+      if (result == null)
+        result = casePredicate(exclusionPredicate);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case WorkingSetsPackage.INCLUSION_PREDICATE:
+    {
+      InclusionPredicate inclusionPredicate = (InclusionPredicate)theEObject;
+      T result = caseInclusionPredicate(inclusionPredicate);
+      if (result == null)
+        result = casePredicate(inclusionPredicate);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
     default:
       return defaultCase(theEObject);
     }
@@ -135,12 +156,60 @@ public class WorkingSetsSwitch<T> extends Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Exclusion Predicate</em>'.
    * <!-- begin-user-doc -->
    * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
+   * returning a non-null result will terminate the switch.
    * <!-- end-user-doc -->
    * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Exclusion Predicate</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseExclusionPredicate(ExclusionPredicate object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Inclusion Predicate</em>'.
+   * <!-- begin-user-doc -->
+  	 * This implementation returns null;
+  	 * returning a non-null result will terminate the switch.
+  	 * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Inclusion Predicate</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseInclusionPredicate(InclusionPredicate object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Predicate</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Predicate</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T casePredicate(Predicate object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * <!-- begin-user-doc -->
+       * This implementation returns null;
+       * returning a non-null result will terminate the switch, but this is the last case anyway.
+       * <!-- end-user-doc -->
+   * @param object the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject)
    * @generated