Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java =================================================================== diff -u -r6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e --- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (.../ProgressEngine.java) (revision 6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (.../ProgressEngine.java) (revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e) @@ -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 =================================================================== diff -u -r6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java (.../ILearnerService.java) (revision 6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java (.../ILearnerService.java) (revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e) @@ -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 =================================================================== diff -u -r6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java (.../TestLearnerService.java) (revision 6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java (.../TestLearnerService.java) (revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e) @@ -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 =================================================================== diff -u -r6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java (.../ActivityAction.java) (revision 6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java (.../ActivityAction.java) (revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e) @@ -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 =================================================================== diff -u -r6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivity.java (.../DisplayActivity.java) (revision 6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivity.java (.../DisplayActivity.java) (revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e) @@ -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 =================================================================== diff -u -r6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java (.../DisplayOptionsActivity.java) (revision 6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java (.../DisplayOptionsActivity.java) (revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e) @@ -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 =================================================================== diff -u -r6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java (.../DisplayParallelActivity.java) (revision 6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java (.../DisplayParallelActivity.java) (revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e) @@ -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 =================================================================== diff -u -r6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java (.../DisplayToolActivity.java) (revision 6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java (.../DisplayToolActivity.java) (revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e) @@ -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 =================================================================== diff -u -r6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/SessionBean.java (.../SessionBean.java) (revision 6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/SessionBean.java (.../SessionBean.java) (revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e) @@ -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 =================================================================== diff -u -r6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/Utils.java (.../Utils.java) (revision 6ff5b64bf6f32497b6d175b81e06f42a1f0b3cbf) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/Utils.java (.../Utils.java) (revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e) @@ -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 =================================================================== diff -u -r7eaa24de10b2151186a637b21fa02e396fa09f1a -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e --- lams_learning/web/toolTest.jsp (.../toolTest.jsp) (revision 7eaa24de10b2151186a637b21fa02e396fa09f1a) +++ lams_learning/web/toolTest.jsp (.../toolTest.jsp) (revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e) @@ -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"%>