Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityOrderComparator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityOrderComparator.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityOrderComparator.java	17 Feb 2005 02:53:36 -0000	1.1
@@ -0,0 +1,26 @@
+/*
+ * Created on 16/02/2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.learningdesign;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+/**
+ * @author dgarth
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class ActivityOrderComparator implements Comparator, Serializable {
+
+    public int compare(Object o1, Object o2) {
+        Activity activity1 = (Activity)o1;
+        Activity activity2 = (Activity)o2;
+        return activity1.getActivityId().compareTo(activity2.getActivityId());
+    }
+    
+}
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/LessonCompleteActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/LessonCompleteActivity.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/LessonCompleteActivity.java	17 Feb 2005 02:57:31 -0000	1.1
@@ -0,0 +1,17 @@
+/*
+ * Created on 16/02/2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.lesson;
+
+/**
+ * @author dgarth
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class LessonCompleteActivity extends NullActivity {
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/NullActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/Attic/NullActivity.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/NullActivity.java	17 Feb 2005 02:57:31 -0000	1.1
@@ -0,0 +1,19 @@
+/*
+ * Created on 16/02/2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.lesson;
+
+import org.lamsfoundation.lams.learningdesign.Activity;
+
+/**
+ * @author dgarth
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class NullActivity extends Activity {
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java	17 Feb 2005 02:57:31 -0000	1.1
@@ -0,0 +1,17 @@
+/*
+ * Created on 16/02/2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.lesson;
+
+/**
+ * @author dgarth
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class ParallelWaitActivity extends NullActivity {
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/web/action/DispatchAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/action/Attic/DispatchAction.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/web/action/DispatchAction.java	17 Feb 2005 02:58:27 -0000	1.1
@@ -0,0 +1,53 @@
+/*
+ * Created on 7/02/2005
+ *
+ */
+package org.lamsfoundation.lams.web.action;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.web.util.TokenProcessor;
+
+/**
+ * @author daveg
+ *
+ */
+public abstract class DispatchAction extends org.apache.struts.actions.DispatchAction {
+    
+    protected static String className = "Action";
+	
+    private static TokenProcessor token = TokenProcessor.getInstance();
+    
+    private static String LOG_NAME = "lams.web.action.Logger";
+    /**
+     * Logger used for action classes.
+     * TODO: revisit logging.
+     */
+    protected static Logger log = Logger.getLogger(LOG_NAME);
+
+	protected void saveToken(javax.servlet.http.HttpServletRequest request) {
+        token.saveToken(request);
+	}
+	
+	protected boolean isTokenValid(javax.servlet.http.HttpServletRequest request) {
+        return token.isTokenValid(request, false);
+	}
+    
+	protected boolean isTokenValid(javax.servlet.http.HttpServletRequest request, boolean reset) {
+        return token.isTokenValid(request, reset);
+	}
+	
+    protected void resetToken(HttpServletRequest request) {
+        token.resetToken(request);
+    }
+    
+    /*protected void saveForward(javax.servlet.http.HttpServletRequest request, ActionForward forward) {
+    	token.saveForward(request, forward);
+    }
+    
+    protected ActionForward getForward(javax.servlet.http.HttpServletRequest request) {
+    	return token.getForward(request, true);
+    }*/
+    
+}