Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/IChatUserDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/IChatUserDAO.java,v diff -u -r1.9 -r1.10 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/IChatUserDAO.java 17 Sep 2006 06:20:53 -0000 1.9 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/IChatUserDAO.java 1 Nov 2006 02:53:01 -0000 1.10 @@ -24,10 +24,7 @@ package org.lamsfoundation.lams.tool.chat.dao; -import java.util.List; - import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.tool.chat.model.ChatSession; import org.lamsfoundation.lams.tool.chat.model.ChatUser; /** Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatUserDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatUserDAO.java,v diff -u -r1.10 -r1.11 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatUserDAO.java 17 Sep 2006 06:20:53 -0000 1.10 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatUserDAO.java 1 Nov 2006 02:53:01 -0000 1.11 @@ -28,7 +28,6 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.chat.dao.IChatUserDAO; -import org.lamsfoundation.lams.tool.chat.model.ChatSession; import org.lamsfoundation.lams.tool.chat.model.ChatUser; /** Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatSessionDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatSessionDTO.java,v diff -u -r1.6 -r1.7 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatSessionDTO.java 17 Sep 2006 06:20:53 -0000 1.6 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatSessionDTO.java 1 Nov 2006 02:53:01 -0000 1.7 @@ -32,7 +32,6 @@ import org.lamsfoundation.lams.tool.chat.model.ChatMessage; import org.lamsfoundation.lams.tool.chat.model.ChatSession; -import org.lamsfoundation.lams.tool.chat.model.ChatUser; public class ChatSessionDTO implements Comparable { Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java,v diff -u -r1.9 -r1.10 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java 10 Oct 2006 07:28:20 -0000 1.9 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java 1 Nov 2006 02:53:01 -0000 1.10 @@ -29,12 +29,7 @@ import java.util.Iterator; import java.util.Set; -import middlegen.Column; - import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.tool.chat.service.ChatService; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java,v diff -u -r1.11 -r1.12 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java 17 Sep 2006 06:20:54 -0000 1.11 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java 1 Nov 2006 02:53:01 -0000 1.12 @@ -24,10 +24,7 @@ package org.lamsfoundation.lams.tool.chat.util; -import java.util.LinkedList; -import org.lamsfoundation.lams.tool.chat.model.ChatAttachment; - public interface ChatConstants { public static final String TOOL_SIGNATURE = "lachat11"; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java,v diff -u -r1.17 -r1.18 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java 5 Oct 2006 05:03:08 -0000 1.17 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java 1 Nov 2006 02:53:01 -0000 1.18 @@ -47,11 +47,8 @@ import org.lamsfoundation.lams.tool.chat.service.ChatServiceProxy; import org.lamsfoundation.lams.tool.chat.service.IChatService; import org.lamsfoundation.lams.tool.chat.util.ChatConstants; -import org.lamsfoundation.lams.tool.chat.util.ChatException; import org.lamsfoundation.lams.tool.chat.web.forms.MonitoringForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.session.SessionManager; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/servlets/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/servlets/ExportServlet.java,v diff -u -r1.4 -r1.5 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/servlets/ExportServlet.java 17 Sep 2006 06:20:53 -0000 1.4 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/servlets/ExportServlet.java 1 Nov 2006 02:53:01 -0000 1.5 @@ -25,7 +25,6 @@ package org.lamsfoundation.lams.tool.chat.web.servlets; -import java.util.ArrayList; import java.util.Iterator; import java.util.List; Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookUserDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookUserDAO.java,v diff -u -r1.2 -r1.3 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookUserDAO.java 17 Sep 2006 06:27:20 -0000 1.2 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookUserDAO.java 1 Nov 2006 02:49:57 -0000 1.3 @@ -24,10 +24,7 @@ package org.lamsfoundation.lams.tool.notebook.dao; -import java.util.List; - import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.tool.notebook.model.NotebookSession; import org.lamsfoundation.lams.tool.notebook.model.NotebookUser; /** Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java,v diff -u -r1.2 -r1.3 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java 17 Sep 2006 06:27:20 -0000 1.2 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java 1 Nov 2006 02:49:59 -0000 1.3 @@ -28,7 +28,6 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.notebook.dao.INotebookUserDAO; -import org.lamsfoundation.lams.tool.notebook.model.NotebookSession; import org.lamsfoundation.lams.tool.notebook.model.NotebookUser; /** Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookSessionDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookSessionDTO.java,v diff -u -r1.4 -r1.5 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookSessionDTO.java 17 Sep 2006 06:27:20 -0000 1.4 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookSessionDTO.java 1 Nov 2006 02:49:59 -0000 1.5 @@ -26,7 +26,6 @@ package org.lamsfoundation.lams.tool.notebook.dto; import java.util.Iterator; -import java.util.List; import java.util.Set; import java.util.TreeSet; Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java,v diff -u -r1.3 -r1.4 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java 17 Sep 2006 06:27:20 -0000 1.3 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java 1 Nov 2006 02:49:59 -0000 1.4 @@ -27,8 +27,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.notebook.model.NotebookUser; -import org.lamsfoundation.lams.tool.notebook.service.INotebookService; -import org.lamsfoundation.lams.tool.notebook.service.NotebookServiceProxy; public class NotebookUserDTO implements Comparable{ Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java,v diff -u -r1.6 -r1.7 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java 11 Oct 2006 07:19:29 -0000 1.6 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java 1 Nov 2006 02:49:59 -0000 1.7 @@ -30,9 +30,6 @@ import java.util.Set; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.tool.notebook.service.NotebookService; Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java,v diff -u -r1.3 -r1.4 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java 17 Sep 2006 06:27:20 -0000 1.3 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java 1 Nov 2006 02:49:59 -0000 1.4 @@ -24,8 +24,6 @@ package org.lamsfoundation.lams.tool.notebook.service; -import java.util.List; - import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.notebook.model.Notebook; Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java,v diff -u -r1.6 -r1.7 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java 5 Oct 2006 05:04:07 -0000 1.6 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java 1 Nov 2006 02:49:59 -0000 1.7 @@ -38,7 +38,6 @@ import org.lamsfoundation.lams.tool.notebook.model.NotebookUser; import org.lamsfoundation.lams.tool.notebook.service.INotebookService; import org.lamsfoundation.lams.tool.notebook.service.NotebookServiceProxy; -import org.lamsfoundation.lams.tool.notebook.web.forms.MonitoringForm; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.util.AttributeNames; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeHeadingDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeHeadingDAO.java,v diff -u -r1.4 -r1.5 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeHeadingDAO.java 31 Oct 2006 23:17:29 -0000 1.4 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeHeadingDAO.java 1 Nov 2006 02:51:02 -0000 1.5 @@ -25,7 +25,6 @@ package org.lamsfoundation.lams.tool.scribe.dao; import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.tool.scribe.model.ScribeHeading; /** * DAO for accessing the ScribeHeading objects - interface defining Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeUserDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeUserDAO.java,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeUserDAO.java 17 Sep 2006 06:28:16 -0000 1.2 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeUserDAO.java 1 Nov 2006 02:51:02 -0000 1.3 @@ -24,10 +24,7 @@ package org.lamsfoundation.lams.tool.scribe.dao; -import java.util.List; - import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.tool.scribe.model.ScribeSession; import org.lamsfoundation.lams.tool.scribe.model.ScribeUser; /** Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeUserDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeUserDAO.java,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeUserDAO.java 17 Sep 2006 06:28:15 -0000 1.2 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeUserDAO.java 1 Nov 2006 02:51:02 -0000 1.3 @@ -28,7 +28,6 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.scribe.dao.IScribeUserDAO; -import org.lamsfoundation.lams.tool.scribe.model.ScribeSession; import org.lamsfoundation.lams.tool.scribe.model.ScribeUser; /** Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java,v diff -u -r1.5 -r1.6 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java 31 Oct 2006 23:17:28 -0000 1.5 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java 1 Nov 2006 02:51:02 -0000 1.6 @@ -28,7 +28,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.scribe.model.Scribe; import org.lamsfoundation.lams.tool.scribe.model.ScribeAttachment; -import org.lamsfoundation.lams.tool.scribe.model.ScribeHeading; import org.lamsfoundation.lams.tool.scribe.model.ScribeSession; import org.lamsfoundation.lams.tool.scribe.model.ScribeUser; import org.lamsfoundation.lams.tool.scribe.util.ScribeException; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java,v diff -u -r1.13 -r1.14 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java 31 Oct 2006 23:17:29 -0000 1.13 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java 1 Nov 2006 02:51:02 -0000 1.14 @@ -81,7 +81,6 @@ import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.util.wddx.WDDXProcessor; import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; -import org.springframework.orm.ObjectOptimisticLockingFailureException; /** * An implementation of the IScribeService interface. Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java,v diff -u -r1.11 -r1.12 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java 31 Oct 2006 23:17:29 -0000 1.11 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java 1 Nov 2006 02:51:02 -0000 1.12 @@ -25,9 +25,7 @@ package org.lamsfoundation.lams.tool.scribe.web.actions; import java.io.IOException; -import java.util.HashMap; import java.util.Iterator; -import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java,v diff -u -r1.8 -r1.9 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java 26 Oct 2006 03:46:08 -0000 1.8 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java 1 Nov 2006 02:51:02 -0000 1.9 @@ -45,7 +45,6 @@ import org.lamsfoundation.lams.tool.scribe.service.ScribeServiceProxy; import org.lamsfoundation.lams.tool.scribe.util.ScribeConstants; import org.lamsfoundation.lams.tool.scribe.util.ScribeUtils; -import org.lamsfoundation.lams.tool.scribe.web.forms.LearningForm; import org.lamsfoundation.lams.tool.scribe.web.forms.MonitoringForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java,v diff -u -r1.7 -r1.8 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java 4 Oct 2006 06:36:14 -0000 1.7 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java 1 Nov 2006 02:51:02 -0000 1.8 @@ -52,8 +52,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; -import com.sun.java_cup.internal.internal_error; - public class ExportServlet extends AbstractExportPortfolioServlet { private static final long serialVersionUID = -2829707715037631881L;