Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java,v diff -u -r1.1 -r1.2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java 28 Jan 2005 02:17:16 -0000 1.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java 30 Jan 2005 22:54:13 -0000 1.2 @@ -7,9 +7,9 @@ package org.lamsfoundation.lams.learning.progress; -import com.lamsinternational.lams.learningdesign.*; -import com.lamsinternational.lams.lesson.*; -import com.lamsinternational.lams.usermanagement.User; +import org.lamsfoundation.lams.learningdesign.*; +import org.lamsfoundation.lams.lesson.*; +import org.lamsfoundation.lams.usermanagement.User; /** * The Progress Engine controls how a learner progresses Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java,v diff -u -r1.1 -r1.2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java 28 Jan 2005 02:17:16 -0000 1.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java 30 Jan 2005 22:54:13 -0000 1.2 @@ -8,9 +8,9 @@ import java.util.List; -import com.lamsinternational.lams.lesson.Lesson; -import com.lamsinternational.lams.lesson.LearnerProgress; -import com.lamsinternational.lams.usermanagement.User; +import org.lamsfoundation.lams.lesson.Lesson; +import org.lamsfoundation.lams.lesson.LearnerProgress; +import org.lamsfoundation.lams.usermanagement.User; /** * * @author chris Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/Attic/TestLearnerService.java,v diff -u -r1.1 -r1.2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java 28 Jan 2005 02:17:16 -0000 1.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java 30 Jan 2005 22:54:13 -0000 1.2 @@ -14,16 +14,16 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import com.lamsinternational.lams.learningdesign.Activity; -import com.lamsinternational.lams.learningdesign.ComplexActivity; -import com.lamsinternational.lams.learningdesign.LearningDesign; -import com.lamsinternational.lams.learningdesign.OptionsActivity; -import com.lamsinternational.lams.learningdesign.ParallelActivity; -import com.lamsinternational.lams.learningdesign.ToolActivity; -import com.lamsinternational.lams.lesson.LearnerProgress; -import com.lamsinternational.lams.lesson.Lesson; -import com.lamsinternational.lams.lesson.dao.ILessonDAO; -import com.lamsinternational.lams.usermanagement.User; +import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.ComplexActivity; +import org.lamsfoundation.lams.learningdesign.LearningDesign; +import org.lamsfoundation.lams.learningdesign.OptionsActivity; +import org.lamsfoundation.lams.learningdesign.ParallelActivity; +import org.lamsfoundation.lams.learningdesign.ToolActivity; +import org.lamsfoundation.lams.lesson.LearnerProgress; +import org.lamsfoundation.lams.lesson.Lesson; +import org.lamsfoundation.lams.lesson.dao.ILessonDAO; +import org.lamsfoundation.lams.usermanagement.User; /** * @author kevin Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java,v diff -u -r1.1 -r1.2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java 28 Jan 2005 02:17:15 -0000 1.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java 30 Jan 2005 22:53:49 -0000 1.2 @@ -17,9 +17,9 @@ import org.lamsfoundation.lams.learning.web.bean.SessionBean; import org.lamsfoundation.lams.learning.web.form.ActivityForm; -import com.lamsinternational.lams.usermanagement.*; -import com.lamsinternational.lams.lesson.*; -import com.lamsinternational.lams.learningdesign.*; +import org.lamsfoundation.lams.usermanagement.*; +import org.lamsfoundation.lams.lesson.*; +import org.lamsfoundation.lams.learningdesign.*; /** * MyEclipse Struts Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/DisplayActivity.java,v diff -u -r1.1 -r1.2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivity.java 28 Jan 2005 02:17:15 -0000 1.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivity.java 30 Jan 2005 22:53:49 -0000 1.2 @@ -13,9 +13,9 @@ import org.lamsfoundation.lams.learning.web.bean.SessionBean; import org.lamsfoundation.lams.learning.web.form.ActivityForm; -import com.lamsinternational.lams.usermanagement.*; -import com.lamsinternational.lams.learningdesign.*; -import com.lamsinternational.lams.lesson.*; +import org.lamsfoundation.lams.usermanagement.*; +import org.lamsfoundation.lams.learningdesign.*; +import org.lamsfoundation.lams.lesson.*; /** * MyEclipse Struts Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/DisplayOptionsActivity.java,v diff -u -r1.1 -r1.2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java 28 Jan 2005 02:17:15 -0000 1.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java 30 Jan 2005 22:53:49 -0000 1.2 @@ -21,9 +21,9 @@ import org.lamsfoundation.lams.learning.web.form.OptionsActivityForm; import org.lamsfoundation.lams.learning.web.util.Utils; -import com.lamsinternational.lams.learningdesign.Activity; -import com.lamsinternational.lams.learningdesign.OptionsActivity; -import com.lamsinternational.lams.lesson.LearnerProgress; +import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.OptionsActivity; +import org.lamsfoundation.lams.lesson.LearnerProgress; /** * @author daveg Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/DisplayParallelActivity.java,v diff -u -r1.1 -r1.2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java 28 Jan 2005 02:17:15 -0000 1.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java 30 Jan 2005 22:53:49 -0000 1.2 @@ -12,8 +12,8 @@ import org.lamsfoundation.lams.learning.web.form.ActivityForm; import org.lamsfoundation.lams.learning.web.util.Utils; -import com.lamsinternational.lams.learningdesign.*; -import com.lamsinternational.lams.lesson.*; +import org.lamsfoundation.lams.learningdesign.*; +import org.lamsfoundation.lams.lesson.*; /** * MyEclipse Struts Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/Attic/DisplayToolActivity.java,v diff -u -r1.1 -r1.2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java 28 Jan 2005 02:17:15 -0000 1.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java 30 Jan 2005 22:53:49 -0000 1.2 @@ -12,8 +12,8 @@ import org.lamsfoundation.lams.learning.web.form.ActivityForm; import org.lamsfoundation.lams.learning.web.util.Utils; -import com.lamsinternational.lams.learningdesign.*; -import com.lamsinternational.lams.lesson.*; +import org.lamsfoundation.lams.learningdesign.*; +import org.lamsfoundation.lams.lesson.*; /** * MyEclipse Struts Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/SessionBean.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/Attic/SessionBean.java,v diff -u -r1.1 -r1.2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/SessionBean.java 28 Jan 2005 02:17:16 -0000 1.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/SessionBean.java 30 Jan 2005 22:53:59 -0000 1.2 @@ -6,8 +6,8 @@ */ package org.lamsfoundation.lams.learning.web.bean; -import com.lamsinternational.lams.usermanagement.*; -import com.lamsinternational.lams.lesson.*; +import org.lamsfoundation.lams.usermanagement.*; +import org.lamsfoundation.lams.lesson.*; /** * @author kevin Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/Utils.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/Attic/Utils.java,v diff -u -r1.1 -r1.2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/Utils.java 28 Jan 2005 02:17:16 -0000 1.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/Utils.java 30 Jan 2005 22:53:59 -0000 1.2 @@ -8,13 +8,13 @@ import org.lamsfoundation.lams.learning.web.bean.ActivityURL; -import com.lamsinternational.lams.lesson.*; -import com.lamsinternational.lams.learningdesign.Activity; -import com.lamsinternational.lams.learningdesign.ComplexActivity; -import com.lamsinternational.lams.learningdesign.GateActivity; -import com.lamsinternational.lams.learningdesign.GroupingActivity; -import com.lamsinternational.lams.learningdesign.SimpleActivity; -import com.lamsinternational.lams.learningdesign.ToolActivity; +import org.lamsfoundation.lams.lesson.*; +import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.ComplexActivity; +import org.lamsfoundation.lams.learningdesign.GateActivity; +import org.lamsfoundation.lams.learningdesign.GroupingActivity; +import org.lamsfoundation.lams.learningdesign.SimpleActivity; +import org.lamsfoundation.lams.learningdesign.ToolActivity; /** * @author kevin Index: lams_learning/web/toolTest.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/toolTest.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/toolTest.jsp 21 Jan 2005 04:28:51 -0000 1.1 +++ lams_learning/web/toolTest.jsp 30 Jan 2005 22:54:44 -0000 1.2 @@ -4,7 +4,7 @@ <%@ taglib uri="http://jakarta.apache.org/struts/struts-bean-el" prefix="bean-el"%> <%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ page import="com.lamsinternational.lams.lesson.LearnerProgress"%> +<%@ page import="org.lamsfoundation.lams.lesson.LearnerProgress"%>