Index: lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml,v
diff -u -r1.13.6.4 -r1.13.6.5
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	19 Mar 2007 06:12:01 -0000	1.13.6.4
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	20 Mar 2007 10:33:37 -0000	1.13.6.5
@@ -50,6 +50,7 @@
 		<property name="contentIDGenerator"><ref bean="toolContentIDGenerator"/></property>
 		<property name="messageService"><ref bean="authoringMessageService"/></property>
 		<property name="learningDesignService"><ref bean="learningDesignService"/></property>
+		<property name="lessonService"><ref bean="lessonService"/></property>
 	</bean>
 	
 	<bean id="authoringService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java,v
diff -u -r1.41.2.8 -r1.41.2.9
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	19 Mar 2007 06:11:59 -0000	1.41.2.8
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	20 Mar 2007 10:33:36 -0000	1.41.2.9
@@ -67,6 +67,7 @@
 import org.lamsfoundation.lams.learningdesign.exception.LearningDesignException;
 import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService;
 import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.tool.SystemTool;
 import org.lamsfoundation.lams.tool.Tool;
 import org.lamsfoundation.lams.tool.ToolContentIDGenerator;
@@ -109,6 +110,7 @@
 	protected ILamsCoreToolService lamsCoreToolService;
 	protected ILearningDesignService learningDesignService;
 	protected MessageService messageService;
+	protected ILessonService lessonService;
 	
 	protected ToolContentIDGenerator contentIDGenerator;
 	
@@ -207,6 +209,19 @@
 		this.learningDesignService = learningDesignService;
 	}	
 
+	public MessageService getMessageService() {
+		return messageService;
+	}
+
+	public ILessonService getLessonService() {
+		return lessonService;
+	}
+
+	public void setLessonService(ILessonService lessonService) {
+		this.lessonService = lessonService;
+	}
+
+
     /**
      * @param contentIDGenerator The contentIDGenerator to set.
      */
@@ -400,6 +415,12 @@
 		
 	}
 	
+	/** 
+	 * Remove a temporary system gate. Requires removing the gate from any learner progress entries  - should only
+	 * be a current activity but remove it from previous and next, just in case.
+	 * 
+	 * This will leave a "hole" in the learner progress, but the progress engine can take care of that.
+	 */
 	public LearningDesign removeTempSystemGate(GateActivity gate, LearningDesign design) {
 		// get transitions
 		Transition toTransition = gate.getTransitionTo();
@@ -423,6 +444,9 @@
 		// remove temp system gate
 		design.getActivities().remove(gate);
 		
+		// need to remove it from any learner progress entries
+		lessonService.removeProgressReferencesToActivity(gate);
+
 		return design;
 	}
 	
@@ -1009,9 +1033,5 @@
 	}
 	
 
-	public MessageService getMessageService() {
-		return messageService;
-	}
 
-
 }
\ No newline at end of file