Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r5a52a4c104c66462546e17c4d04424b4222d6304 -r0df1c403ef3f6ce1360f852afd55ae847409f65a Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -0,0 +1,58 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ +package org.lamsfoundation.lams.dao; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Manpreet Minhas + */ +public interface IBaseDAO { + + /** + * @param object The object to be inserted + */ + public void insert(Object object); + /** + * @param object The object to be updated + */ + public void update(Object object); + /** + * @param object The object to be deleted + */ + public void delete(Object object); + + /** + * Find an object. If the object is not found + * then it will return null + * @param objClass + * @param id + */ + public Object find(Class objClass, Serializable id); + + /** + * @param objClass + */ + public List findAll(Class objClass); +} Index: lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -0,0 +1,80 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ +package org.lamsfoundation.lams.dao.hibernate; + +import java.io.Serializable; +import java.util.List; + +import org.springframework.orm.hibernate3.support.HibernateDaoSupport; + +import org.lamsfoundation.lams.dao.IBaseDAO; + +/** + * @author Manpreet Minhas + */ +public class BaseDAO extends HibernateDaoSupport implements IBaseDAO { + + /** + * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IBaseDAO#insert(java.lang.Object) + */ + public void insert(Object object) { + this.getHibernateTemplate().save(object); + this.getHibernateTemplate().flush(); + } + + /** + * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IBaseDAO#update(java.lang.Object) + */ + public void update(Object object) { + this.getHibernateTemplate().update(object); + this.getHibernateTemplate().flush(); + } + + /** + * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IBaseDAO#delete(java.lang.Object) + */ + public void delete(Object object) { + this.getHibernateTemplate().delete(object); + this.getHibernateTemplate().flush(); + } + + /** + * Find an object. If the object is not found, + * then it will return null + * @param objClass + * @param id + */ + public Object find(Class objClass, Serializable id) { + return this.getHibernateTemplate().get(objClass,id); + + } + + /** + * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IBaseDAO#findAll(java.lang.Class) + */ + public List findAll(Class objClass) { + String query="from obj in class " + objClass.getName(); + return this.getHibernateTemplate().find(query); + } + +} Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java =================================================================== diff -u -ra444a5eb183dee320427e5c1796ebfc40e53e79e -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java (.../IActivityDAO.java) (revision a444a5eb183dee320427e5c1796ebfc40e53e79e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java (.../IActivityDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -24,6 +24,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.LearningDesign; Fisheye: Tag 0df1c403ef3f6ce1360f852afd55ae847409f65a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IBaseDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupDAO.java =================================================================== diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupDAO.java (.../IGroupDAO.java) (revision 55901923afea1cbd769d8daa05051aa050bb99b6) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupDAO.java (.../IGroupDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -22,6 +22,7 @@ */ package org.lamsfoundation.lams.learningdesign.dao; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.Group; /** Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupingDAO.java =================================================================== diff -u -r911e203f0e0a2756ad172bbe1c0baf5b1e3c7089 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupingDAO.java (.../IGroupingDAO.java) (revision 911e203f0e0a2756ad172bbe1c0baf5b1e3c7089) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupingDAO.java (.../IGroupingDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -22,6 +22,7 @@ */ package org.lamsfoundation.lams.learningdesign.dao; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.Grouping; /** Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java =================================================================== diff -u -r661b2423ae0cf4ff292bb6052434e14174858383 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java (.../ILearningDesignDAO.java) (revision 661b2423ae0cf4ff292bb6052434e14174858383) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java (.../ILearningDesignDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -24,6 +24,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.LearningDesign; ; /** Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java =================================================================== diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java (.../ILearningLibraryDAO.java) (revision 55901923afea1cbd769d8daa05051aa050bb99b6) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java (.../ILearningLibraryDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -24,6 +24,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.LearningLibrary; /** Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILicenseDAO.java =================================================================== diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILicenseDAO.java (.../ILicenseDAO.java) (revision 55901923afea1cbd769d8daa05051aa050bb99b6) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILicenseDAO.java (.../ILicenseDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -22,8 +22,8 @@ */ package org.lamsfoundation.lams.learningdesign.dao; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.License; -import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO; /** * @author Manpreet Minhas Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ITransitionDAO.java =================================================================== diff -u -r7ed711f3efeff84c4a5621e8b9b9618ddc5c0663 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ITransitionDAO.java (.../ITransitionDAO.java) (revision 7ed711f3efeff84c4a5621e8b9b9618ddc5c0663) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ITransitionDAO.java (.../ITransitionDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -26,6 +26,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.Transition; import org.lamsfoundation.lams.learningdesign.LearningDesign; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java =================================================================== diff -u -ra444a5eb183dee320427e5c1796ebfc40e53e79e -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (.../ActivityDAO.java) (revision a444a5eb183dee320427e5c1796ebfc40e53e79e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (.../ActivityDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -25,6 +25,7 @@ import java.util.List; import org.hibernate.Query; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.GroupingActivity; import org.lamsfoundation.lams.learningdesign.LearningDesign; Fisheye: Tag 0df1c403ef3f6ce1360f852afd55ae847409f65a refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/BaseDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java =================================================================== diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java (.../GroupDAO.java) (revision 55901923afea1cbd769d8daa05051aa050bb99b6) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java (.../GroupDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -22,6 +22,7 @@ */ package org.lamsfoundation.lams.learningdesign.dao.hibernate; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.learningdesign.Group; import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java =================================================================== diff -u -r911e203f0e0a2756ad172bbe1c0baf5b1e3c7089 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java (.../GroupingDAO.java) (revision 911e203f0e0a2756ad172bbe1c0baf5b1e3c7089) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java (.../GroupingDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -22,6 +22,7 @@ */ package org.lamsfoundation.lams.learningdesign.dao.hibernate; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.learningdesign.ChosenGrouping; import org.lamsfoundation.lams.learningdesign.Grouping; import org.lamsfoundation.lams.learningdesign.RandomGrouping; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java =================================================================== diff -u -r661b2423ae0cf4ff292bb6052434e14174858383 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (.../LearningDesignDAO.java) (revision 661b2423ae0cf4ff292bb6052434e14174858383) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (.../LearningDesignDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -26,6 +26,7 @@ import org.hibernate.HibernateException; import org.hibernate.Query; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java =================================================================== diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java (.../LearningLibraryDAO.java) (revision 55901923afea1cbd769d8daa05051aa050bb99b6) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java (.../LearningLibraryDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -24,6 +24,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.learningdesign.LearningLibrary; import org.lamsfoundation.lams.learningdesign.dao.ILearningLibraryDAO; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java =================================================================== diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java (.../LicenseDAO.java) (revision 55901923afea1cbd769d8daa05051aa050bb99b6) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java (.../LicenseDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -22,6 +22,7 @@ */ package org.lamsfoundation.lams.learningdesign.dao.hibernate; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.learningdesign.License; import org.lamsfoundation.lams.learningdesign.dao.ILicenseDAO; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java =================================================================== diff -u -r73c4ac2cb0c21f04b43e86c7e4fe9711ace42de0 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java (.../TransitionDAO.java) (revision 73c4ac2cb0c21f04b43e86c7e4fe9711ace42de0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java (.../TransitionDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -25,6 +25,7 @@ import java.util.List; import org.hibernate.Query; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.Transition; import org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IWorkspaceDAO.java =================================================================== diff -u -re584edf69cf772af93c4bc9444088abecb6f5520 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IWorkspaceDAO.java (.../IWorkspaceDAO.java) (revision e584edf69cf772af93c4bc9444088abecb6f5520) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IWorkspaceDAO.java (.../IWorkspaceDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -22,7 +22,7 @@ */ package org.lamsfoundation.lams.usermanagement.dao; -import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.usermanagement.Workspace; /** Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IWorkspaceFolderDAO.java =================================================================== diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IWorkspaceFolderDAO.java (.../IWorkspaceFolderDAO.java) (revision 55901923afea1cbd769d8daa05051aa050bb99b6) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IWorkspaceFolderDAO.java (.../IWorkspaceFolderDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -24,7 +24,7 @@ import java.util.List; -import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; /** Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/WorkspaceDAO.java =================================================================== diff -u -ra2b21903bd43b5a604e3ca7edef11dde1351018c -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/WorkspaceDAO.java (.../WorkspaceDAO.java) (revision a2b21903bd43b5a604e3ca7edef11dde1351018c) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/WorkspaceDAO.java (.../WorkspaceDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -24,7 +24,7 @@ import java.util.List; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.usermanagement.Workspace; import org.lamsfoundation.lams.usermanagement.dao.IWorkspaceDAO; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/WorkspaceFolderDAO.java =================================================================== diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/WorkspaceFolderDAO.java (.../WorkspaceFolderDAO.java) (revision 55901923afea1cbd769d8daa05051aa050bb99b6) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/WorkspaceFolderDAO.java (.../WorkspaceFolderDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -24,7 +24,7 @@ import java.util.List; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; import org.lamsfoundation.lams.usermanagement.dao.IWorkspaceFolderDAO; Index: lams_common/src/java/org/lamsfoundation/lams/workspace/dao/IWorkspaceFolderContentDAO.java =================================================================== diff -u -r0b2737221177ec6fb88f447aa647f9413f4373f8 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/workspace/dao/IWorkspaceFolderContentDAO.java (.../IWorkspaceFolderContentDAO.java) (revision 0b2737221177ec6fb88f447aa647f9413f4373f8) +++ lams_common/src/java/org/lamsfoundation/lams/workspace/dao/IWorkspaceFolderContentDAO.java (.../IWorkspaceFolderContentDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -24,7 +24,7 @@ import java.util.List; -import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.workspace.WorkspaceFolderContent; /** Index: lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java =================================================================== diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r0df1c403ef3f6ce1360f852afd55ae847409f65a --- lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java (.../WorkspaceFolderContentDAO.java) (revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796) +++ lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java (.../WorkspaceFolderContentDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.workspace.WorkspaceFolderContent; import org.lamsfoundation.lams.workspace.dao.IWorkspaceFolderContentDAO;