Index: lams_tool_example/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/.classpath,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_example/.classpath 22 Mar 2006 02:12:43 -0000 1.2 +++ lams_tool_example/.classpath 18 Mar 2009 07:57:14 -0000 1.2.2.1 @@ -2,13 +2,11 @@ - - - - - - + + + + Index: lams_tool_example/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/conf/xdoclet/web-settings.xml,v diff -u -r1.6 -r1.6.2.1 --- lams_tool_example/conf/xdoclet/web-settings.xml 14 Apr 2006 06:36:01 -0000 1.6 +++ lams_tool_example/conf/xdoclet/web-settings.xml 18 Mar 2009 07:57:14 -0000 1.6.2.1 @@ -7,12 +7,13 @@ contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/tool/example/applicationContext.xml - + + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + Index: lams_tool_example/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/db/sql/tool_insert.sql,v diff -u -r1.7 -r1.7.2.1 --- lams_tool_example/db/sql/tool_insert.sql 27 Feb 2007 02:02:07 -0000 1.7 +++ lams_tool_example/db/sql/tool_insert.sql 18 Mar 2009 07:57:14 -0000 1.7.2.1 @@ -25,8 +25,6 @@ moderation_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time ) @@ -55,8 +53,6 @@ 'tool/laex11/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/laex11', 'org.lamsfoundation.lams.tool.example.ApplicationResources', -'./lams-tool-laex11.jar', -'/org/lamsfoundation/lams/tool/example/applicationContext.xml' NOW(), NOW() ) Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_example/src/java/org/lamsfoundation/lams/tool/example/applicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_example/src/java/org/lamsfoundation/lams/tool/example/exampleApplicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_example/src/java/org/lamsfoundation/lams/tool/example/service/ExampleService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/src/java/org/lamsfoundation/lams/tool/example/service/ExampleService.java,v diff -u -r1.11 -r1.11.2.1 --- lams_tool_example/src/java/org/lamsfoundation/lams/tool/example/service/ExampleService.java 22 Aug 2007 07:06:45 -0000 1.11 +++ lams_tool_example/src/java/org/lamsfoundation/lams/tool/example/service/ExampleService.java 18 Mar 2009 07:57:14 -0000 1.11.2.1 @@ -21,7 +21,7 @@ * **************************************************************** */ -/* $Id$ */ +/* $Id$ */ package org.lamsfoundation.lams.tool.example.service; import java.util.List; @@ -31,6 +31,7 @@ import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.tool.ToolContentManager; +import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; import org.lamsfoundation.lams.tool.ToolSessionManager; @@ -45,178 +46,200 @@ import org.lamsfoundation.lams.util.audit.IAuditService; /** -* An implementation of the NoticeboardService interface. -* -* As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. -*/ + * An implementation of the NoticeboardService interface. + * + * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. + */ -public class ExampleService implements ToolSessionManager, ToolContentManager, - IExampleService { +public class ExampleService implements ToolSessionManager, ToolContentManager, IExampleService { - private IExampleDAO exampleDAO=null; - private IExampleSessionDAO exampleSessionDAO = null; - private IExampleUserDAO exampleUserDAO=null; - private IExampleAttachmentDAO exampleAttachmentDAO = null; - - private ILearnerService learnerService; - private IAuditService auditService; - private ILamsToolService toolService; - private IToolContentHandler exampleToolContentHandler = null; + private IExampleDAO exampleDAO = null; + private IExampleSessionDAO exampleSessionDAO = null; + private IExampleUserDAO exampleUserDAO = null; + private IExampleAttachmentDAO exampleAttachmentDAO = null; - public ExampleService() { - super(); - // TODO Auto-generated constructor stub - } + private ILearnerService learnerService; + private IAuditService auditService; + private ILamsToolService toolService; + private IToolContentHandler exampleToolContentHandler = null; - /* ************ Methods from ToolSessionManager, ToolContentManager ***********************/ - public void createToolSession(Long toolSessionId, String toolSessionName, - Long toolContentId) throws ToolException { - // TODO Auto-generated method stub + public ExampleService() { + super(); + // TODO Auto-generated constructor stub + } - } + /* ************ Methods from ToolSessionManager, ToolContentManager ********************** */ + public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { + // TODO Auto-generated method stub - public String leaveToolSession(Long toolSessionId, Long learnerId) - throws DataMissingException, ToolException { - // TODO Auto-generated method stub - // Do tool status stuff first e.g. set learner to complete within the tool - return learnerService.completeToolSession(toolSessionId, learnerId); - } + } - public ToolSessionExportOutputData exportToolSession(Long toolSessionId) - throws DataMissingException, ToolException { - // TODO Auto-generated method stub - return null; - } + public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException { + // TODO Auto-generated method stub + // Do tool status stuff first e.g. set learner to complete within the tool + return learnerService.completeToolSession(toolSessionId, learnerId); + } - public ToolSessionExportOutputData exportToolSession(List toolSessionIds) - throws DataMissingException, ToolException { - // TODO Auto-generated method stub - return null; - } + public ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException { + // TODO Auto-generated method stub + return null; + } - public void removeToolSession(Long toolSessionId) - throws DataMissingException, ToolException { - // TODO Auto-generated method stub + public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, + ToolException { + // TODO Auto-generated method stub + return null; + } - } + public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException { + // TODO Auto-generated method stub - public void copyToolContent(Long fromContentId, Long toContentId) - throws ToolException { - // TODO Auto-generated method stub + } - } + public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { + // TODO Auto-generated method stub - public void setAsDefineLater(Long toolContentId) - throws DataMissingException, ToolException { - // TODO Auto-generated method stub + } - } + public void setAsDefineLater(Long toolContentId) throws DataMissingException, ToolException { + // TODO Auto-generated method stub - public void setAsRunOffline(Long toolContentId) - throws DataMissingException, ToolException { - // TODO Auto-generated method stub + } - } + public void setAsRunOffline(Long toolContentId) throws DataMissingException, ToolException { + // TODO Auto-generated method stub - public void removeToolContent(Long toolContentId, boolean removeSessionData) - throws SessionDataExistsException, ToolException { - // TODO Auto-generated method stub + } - } - - /** - * Export the XML fragment for the tool's content, along with any files needed - * for the content. - * @throws DataMissingException if no tool content matches the toolSessionId - * @throws ToolException if any other error occurs + public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, + ToolException { + // TODO Auto-generated method stub + + } + + /** + * Export the XML fragment for the tool's content, along with any files needed for the content. + * + * @throws DataMissingException + * if no tool content matches the toolSessionId + * @throws ToolException + * if any other error occurs */ - public void exportToolContent(Long toolContentId, String toPath) throws DataMissingException, ToolException { - // TODO Auto-generated method stub - } + public void exportToolContent(Long toolContentId, String toPath) throws DataMissingException, ToolException { + // TODO Auto-generated method stub + } /** - * Import the XML fragment for the tool's content, along with any files needed - * for the content. - * @throws ToolException if any other error occurs + * Import the XML fragment for the tool's content, along with any files needed for the content. + * + * @throws ToolException + * if any other error occurs */ - public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { - // TODO Auto-generated method stub - } - - /** Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions that are always - * available for the tool (e.g. number of marks for Multiple Choice) or a custom definition created for a particular activity - * such as the answer to the third question contains the word Koala and hence the need for the toolContentId + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { + // TODO Auto-generated method stub + } + + /** + * Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions + * that are always available for the tool (e.g. number of marks for Multiple Choice) or a custom definition created + * for a particular activity such as the answer to the third question contains the word Koala and hence the need for + * the toolContentId + * * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition */ - public SortedMap getToolOutputDefinitions(Long toolContentId) throws ToolException { - return new TreeMap(); - } - - + public SortedMap getToolOutputDefinitions(Long toolContentId) throws ToolException { + return new TreeMap(); + } - /* ******************* Used by Spring to "inject" the linked objects **************************/ - public IExampleAttachmentDAO getExampleAttachmentDAO() { - return exampleAttachmentDAO; - } + /* ******************* Used by Spring to "inject" the linked objects ************************* */ + public IExampleAttachmentDAO getExampleAttachmentDAO() { + return exampleAttachmentDAO; + } - public void setExampleAttachmentDAO(IExampleAttachmentDAO attachmentDAO) { - this.exampleAttachmentDAO = attachmentDAO; - } + public void setExampleAttachmentDAO(IExampleAttachmentDAO attachmentDAO) { + exampleAttachmentDAO = attachmentDAO; + } - public IExampleDAO getExampleDAO() { - return exampleDAO; - } + public IExampleDAO getExampleDAO() { + return exampleDAO; + } - public void setExampleDAO(IExampleDAO exampleDAO) { - this.exampleDAO = exampleDAO; - } + public void setExampleDAO(IExampleDAO exampleDAO) { + this.exampleDAO = exampleDAO; + } - public IToolContentHandler getExampleToolContentHandler() { - return exampleToolContentHandler; - } + public IToolContentHandler getExampleToolContentHandler() { + return exampleToolContentHandler; + } - public void setExampleToolContentHandler(IToolContentHandler exampleToolContentHandler) { - this.exampleToolContentHandler = exampleToolContentHandler; - } + public void setExampleToolContentHandler(IToolContentHandler exampleToolContentHandler) { + this.exampleToolContentHandler = exampleToolContentHandler; + } - public IExampleSessionDAO getExampleSessionDAO() { - return exampleSessionDAO; - } + public IExampleSessionDAO getExampleSessionDAO() { + return exampleSessionDAO; + } - public void setExampleSessionDAO(IExampleSessionDAO sessionDAO) { - this.exampleSessionDAO = sessionDAO; - } + public void setExampleSessionDAO(IExampleSessionDAO sessionDAO) { + exampleSessionDAO = sessionDAO; + } - public ILamsToolService getToolService() { - return toolService; - } + public ILamsToolService getToolService() { + return toolService; + } - public void setToolService(ILamsToolService toolService) { - this.toolService = toolService; - } + public void setToolService(ILamsToolService toolService) { + this.toolService = toolService; + } - public IExampleUserDAO getExampleUserDAO() { - return exampleUserDAO; - } + public IExampleUserDAO getExampleUserDAO() { + return exampleUserDAO; + } - public void setExampleUserDAO(IExampleUserDAO userDAO) { - this.exampleUserDAO = userDAO; - } + public void setExampleUserDAO(IExampleUserDAO userDAO) { + exampleUserDAO = userDAO; + } - public ILearnerService getLearnerService() { - return learnerService; - } + public ILearnerService getLearnerService() { + return learnerService; + } - public void setLearnerService(ILearnerService learnerService) { - this.learnerService = learnerService; - } + public void setLearnerService(ILearnerService learnerService) { + this.learnerService = learnerService; + } - public IAuditService getAuditService() { - return auditService; - } + public IAuditService getAuditService() { + return auditService; + } - public void setAuditService(IAuditService auditService) { - this.auditService = auditService; - } + public void setAuditService(IAuditService auditService) { + this.auditService = auditService; + } + public SortedMap getToolOutput(List names, Long toolSessionId, Long learnerId) { + // TODO Auto-generated method stub + return null; + } + + public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { + // TODO Auto-generated method stub + return null; + } + + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion, + String toVersion) throws ToolException { + // TODO Auto-generated method stub + + } + + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { + // TODO Auto-generated method stub + + } + + public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException { + // TODO Auto-generated method stub + + } + } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_example/web/WEB-INF/applicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff?