Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/ICredentialDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/ICredentialDAO.java,v diff -u -r1.3 -r1.4 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/ICredentialDAO.java 6 Oct 2005 06:38:03 -0000 1.3 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/ICredentialDAO.java 22 Mar 2006 02:07:00 -0000 1.4 @@ -25,7 +25,7 @@ import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.IWorkspace; import org.lamsfoundation.lams.contentrepository.RepositoryRuntimeException; -import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO; +import org.lamsfoundation.lams.dao.IBaseDAO; public interface ICredentialDAO extends IBaseDAO { Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java,v diff -u -r1.6 -r1.7 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java 6 Oct 2005 06:38:03 -0000 1.6 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java 22 Mar 2006 02:07:00 -0000 1.7 @@ -24,7 +24,7 @@ import org.lamsfoundation.lams.contentrepository.CrNode; import org.lamsfoundation.lams.contentrepository.CrNodeVersion; -import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO; +import org.lamsfoundation.lams.dao.IBaseDAO; /** * Data access routines for Nodes, versions and properties Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IWorkspaceDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IWorkspaceDAO.java,v diff -u -r1.4 -r1.5 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IWorkspaceDAO.java 30 Nov 2005 02:34:30 -0000 1.4 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IWorkspaceDAO.java 22 Mar 2006 02:07:00 -0000 1.5 @@ -25,7 +25,7 @@ import java.util.List; import org.lamsfoundation.lams.contentrepository.CrWorkspace; -import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO; +import org.lamsfoundation.lams.dao.IBaseDAO; /** Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java,v diff -u -r1.3 -r1.4 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java 6 Oct 2005 06:38:03 -0000 1.3 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java 22 Mar 2006 02:07:00 -0000 1.4 @@ -35,7 +35,7 @@ import org.lamsfoundation.lams.contentrepository.IWorkspace; import org.lamsfoundation.lams.contentrepository.RepositoryRuntimeException; import org.lamsfoundation.lams.contentrepository.dao.ICredentialDAO; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; /** Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java,v diff -u -r1.7 -r1.8 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java 6 Oct 2005 06:38:03 -0000 1.7 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java 22 Mar 2006 02:07:00 -0000 1.8 @@ -27,7 +27,7 @@ import org.lamsfoundation.lams.contentrepository.CrNode; import org.lamsfoundation.lams.contentrepository.CrNodeVersion; import org.lamsfoundation.lams.contentrepository.dao.INodeDAO; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java,v diff -u -r1.4 -r1.5 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java 6 Oct 2005 06:38:03 -0000 1.4 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java 22 Mar 2006 02:07:00 -0000 1.5 @@ -30,7 +30,7 @@ import org.lamsfoundation.lams.contentrepository.CrWorkspace; import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.dao.IWorkspaceDAO; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.springframework.orm.hibernate3.HibernateObjectRetrievalFailureException; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ILearnerDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/Attic/ILearnerDAO.java,v diff -u -r1.1 -r1.2 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ILearnerDAO.java 3 Aug 2005 06:19:03 -0000 1.1 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ILearnerDAO.java 22 Mar 2006 02:13:34 -0000 1.2 @@ -22,7 +22,7 @@ import java.util.List; -import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.tool.sbmt.Learner; public interface ILearnerDAO extends IBaseDAO { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java,v diff -u -r1.6 -r1.7 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java 1 Mar 2006 04:38:29 -0000 1.6 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmissionDetailsDAO.java 22 Mar 2006 02:13:34 -0000 1.7 @@ -8,7 +8,7 @@ import java.util.List; -import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails; import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesContentDAO.java,v diff -u -r1.4 -r1.5 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesContentDAO.java 2 Dec 2005 00:48:54 -0000 1.4 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesContentDAO.java 22 Mar 2006 02:13:34 -0000 1.5 @@ -6,7 +6,7 @@ */ package org.lamsfoundation.lams.tool.sbmt.dao; -import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; /** Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesReportDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesReportDAO.java,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesReportDAO.java 21 Jul 2005 07:31:47 -0000 1.2 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesReportDAO.java 22 Mar 2006 02:13:34 -0000 1.3 @@ -7,7 +7,7 @@ package org.lamsfoundation.lams.tool.sbmt.dao; -import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport; /** Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java,v diff -u -r1.3 -r1.4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java 17 Nov 2005 06:32:20 -0000 1.3 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitFilesSessionDAO.java 22 Mar 2006 02:13:34 -0000 1.4 @@ -8,7 +8,7 @@ import java.util.List; -import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; /** Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/LearnerDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/Attic/LearnerDAO.java,v diff -u -r1.3 -r1.4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/LearnerDAO.java 6 Oct 2005 06:47:52 -0000 1.3 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/LearnerDAO.java 22 Mar 2006 02:13:34 -0000 1.4 @@ -24,10 +24,8 @@ import java.util.List; import org.hibernate.FlushMode; -import org.hibernate.Hibernate; -import org.hibernate.type.Type; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.sbmt.Learner; import org.lamsfoundation.lams.tool.sbmt.dao.ILearnerDAO; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java,v diff -u -r1.10 -r1.11 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java 1 Mar 2006 04:38:29 -0000 1.10 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java 22 Mar 2006 02:13:34 -0000 1.11 @@ -9,7 +9,7 @@ import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.Session; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails; import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; import org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java,v diff -u -r1.8 -r1.9 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java 2 Dec 2005 00:48:54 -0000 1.8 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java 22 Mar 2006 02:13:34 -0000 1.9 @@ -25,7 +25,7 @@ import java.util.List; import org.hibernate.FlushMode; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.sbmt.InstructionFiles; import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java,v diff -u -r1.3 -r1.4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java 6 Oct 2005 06:47:52 -0000 1.3 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java 22 Mar 2006 02:13:34 -0000 1.4 @@ -9,7 +9,7 @@ import java.util.List; import org.hibernate.FlushMode; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport; import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesReportDAO; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java,v diff -u -r1.4 -r1.5 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java 28 Nov 2005 22:51:32 -0000 1.4 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java 22 Mar 2006 02:13:34 -0000 1.5 @@ -8,7 +8,7 @@ import java.util.List; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesSessionDAO;