Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -rafbd2486f479295afe9a177d7bd3f9dcb71927a8 -r7cb804782140d348edd332845c498640088603a5
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision afbd2486f479295afe9a177d7bd3f9dcb71927a8)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 7cb804782140d348edd332845c498640088603a5)
@@ -176,7 +176,10 @@
 			
 			<subclass name="org.lamsfoundation.lams.learningdesign.GateActivity">
 				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
-				
+				<set  name="waitingLearners" lazy="true" cascade="none" table="lams_activity_learners" batch-size="20">
+        			<key><column name="activity_id" /></key>
+        			<many-to-many column="user_id" class="org.lamsfoundation.lams.usermanagement.User"/>
+    			</set>
 				<property name="gateActivityLevelId" type="java.lang.Integer" column="gate_activity_level_id" length="11" />
 				<property name="gateOpen" type="java.lang.Boolean" column="gate_open_flag" length="4" />
 				
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
===================================================================
diff -u -r35d5350252748108494c7cb4bfc2e7d5f2271cba -r7cb804782140d348edd332845c498640088603a5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java	(.../GateActivity.java)	(revision 35d5350252748108494c7cb4bfc2e7d5f2271cba)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java	(.../GateActivity.java)	(revision 7cb804782140d348edd332845c498640088603a5)
@@ -1,6 +1,9 @@
 package org.lamsfoundation.lams.learningdesign;
 
 import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 
@@ -22,6 +25,8 @@
     /** persistent field */
     private Boolean gateOpen;
     
+    private Set waitingLearners;
+    
     /** full constructor */
     public GateActivity(Long activityId,
             Integer id,
@@ -42,7 +47,8 @@
             Integer activityTypeId,
             Transition transitionTo,
             Transition transitionFrom,
-            Integer gateActivityLevelId)
+            Integer gateActivityLevelId,
+            Set waitingLearners)
     {
         super(activityId,
                 id,
@@ -64,6 +70,7 @@
                 transitionTo,
 				transitionFrom);
         this.gateActivityLevelId = gateActivityLevelId;
+        this.waitingLearners = waitingLearners;
     }
     
     /** default constructor */
@@ -82,7 +89,8 @@
             Integer activityTypeId,
             Transition transitionTo,
             Transition transitionFrom,
-            Integer gateActivityLevelId)
+            Integer gateActivityLevelId,
+            Set waitingLearners)
     {
         super(activityId,
                 defineLater,
@@ -95,6 +103,7 @@
                 transitionTo,
 				transitionFrom);
         this.gateActivityLevelId = gateActivityLevelId;
+        this.waitingLearners = waitingLearners;
     }
     
     /**
@@ -112,6 +121,23 @@
         this.gateActivityLevelId = gateActivityLevelId;
     }
     
+    /**
+     * @return Returns the waitingLearners.
+     */
+    public Set getWaitingLearners()
+    {
+        if(this.waitingLearners == null)
+            this.setWaitingLearners(new HashSet());
+        return waitingLearners;
+    }
+    /**
+     * @param waitingLearners The waitingLearners to set.
+     */
+    public void setWaitingLearners(Set waitingLearners)
+    {
+        this.waitingLearners = waitingLearners;
+    }
+    
     public String toString()
     {
         return new ToStringBuilder(this)
@@ -133,4 +159,5 @@
 	{
 	    return false;
 	}
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
===================================================================
diff -u -rff0c59d252d1cef65a10cad77374dfe72697ba58 -r7cb804782140d348edd332845c498640088603a5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java	(.../PermissionGateActivity.java)	(revision ff0c59d252d1cef65a10cad77374dfe72697ba58)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java	(.../PermissionGateActivity.java)	(revision 7cb804782140d348edd332845c498640088603a5)
@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Set;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.lamsfoundation.lams.learningdesign.strategy.PermissionGateActivityStrategy;
@@ -33,7 +34,8 @@
             Integer activityTypeId,
             Transition transitionTo,
             Transition transitionFrom,
-            Integer gateActivityLevelId)
+            Integer gateActivityLevelId,
+            Set waitingLearners)
     {
         super(activityId,
                 id,
@@ -54,7 +56,8 @@
                 activityTypeId,
                 transitionTo,
 				transitionFrom,
-                gateActivityLevelId);
+                gateActivityLevelId,
+                waitingLearners);
         super.simpleActivityStrategy = new PermissionGateActivityStrategy();
     }
     
@@ -75,7 +78,8 @@
             Integer activityTypeId,
             Transition transitionTo,
             Transition transitionFrom,
-            Integer gateActivityLevelId)
+            Integer gateActivityLevelId,
+            Set waitingLearners)
     {
         super(activityId,
                 defineLater,
@@ -87,7 +91,8 @@
                 activityTypeId,
                 transitionTo,
 				transitionFrom,
-                gateActivityLevelId);
+                gateActivityLevelId,
+                waitingLearners);
         super.simpleActivityStrategy = new PermissionGateActivityStrategy();
     }
     /**
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
===================================================================
diff -u -r35d5350252748108494c7cb4bfc2e7d5f2271cba -r7cb804782140d348edd332845c498640088603a5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java	(.../ScheduleGateActivity.java)	(revision 35d5350252748108494c7cb4bfc2e7d5f2271cba)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java	(.../ScheduleGateActivity.java)	(revision 7cb804782140d348edd332845c498640088603a5)
@@ -2,6 +2,8 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Set;
+
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 
@@ -83,7 +85,8 @@
             Transition transitionFrom,
             Integer gateActivityLevelId,
             Long gateStartTimeOffset, 
-            Long gateEndTimeOffset) {
+            Long gateEndTimeOffset,
+            Set waitingLearners) {
         super(activityId, 
                 id,
                 description,
@@ -103,7 +106,8 @@
                 activityTypeId,
                 transitionTo,
 				transitionFrom,
-                gateActivityLevelId);
+                gateActivityLevelId,
+                waitingLearners);
         this.gateStartTimeOffset = gateStartTimeOffset;
         this.gateEndTimeOffset = gateEndTimeOffset;
     }
@@ -125,7 +129,8 @@
             Transition transitionFrom,
             Integer gateActivityLevelId,
             Long gateStartTimeOffset, 
-            Long gateEndTimeOffset) {
+            Long gateEndTimeOffset,
+            Set waitingLearners) {
       super(activityId,
                 defineLater,
                 createDateTime,
@@ -136,7 +141,8 @@
                 activityTypeId,
                 transitionTo,
 				transitionFrom,
-                gateActivityLevelId);
+                gateActivityLevelId,
+                waitingLearners);
       this.gateStartTimeOffset = gateStartTimeOffset;
       this.gateEndTimeOffset = gateEndTimeOffset;
     }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java
===================================================================
diff -u -rff0c59d252d1cef65a10cad77374dfe72697ba58 -r7cb804782140d348edd332845c498640088603a5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java	(.../SynchGateActivity.java)	(revision ff0c59d252d1cef65a10cad77374dfe72697ba58)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java	(.../SynchGateActivity.java)	(revision 7cb804782140d348edd332845c498640088603a5)
@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Set;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 
@@ -31,7 +32,8 @@
             Integer activityTypeId, 
             Transition transitionTo,
             Transition transitionFrom,
-            Integer gateActivityLevelId) {
+            Integer gateActivityLevelId,
+            Set waitingLearners) {
         super(activityId, 
                 id, 
                 description, 
@@ -51,7 +53,8 @@
                 activityTypeId,  
                 transitionTo,
 				transitionFrom,
-                gateActivityLevelId);
+                gateActivityLevelId,
+                waitingLearners);
     }
 
     /** default constructor */
@@ -69,7 +72,9 @@
             Integer activityTypeId, 
             Transition transitionTo,
             Transition transitionFrom,
-            Integer gateActivityLevelId) {
+            Integer gateActivityLevelId,
+            Set waitingLearners) 
+    {
       super(activityId, 
               defineLater, 
               createDateTime, 
@@ -80,7 +85,8 @@
               activityTypeId,  
               transitionTo,
 			  transitionFrom,
-              gateActivityLevelId);
+              gateActivityLevelId,
+              waitingLearners);
     }
     
     /**