Index: lams_tool_bbb/.gitignore =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_bbb/.gitignore (.../.gitignore) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_bbb/.gitignore (.../.gitignore) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -1,3 +1,2 @@ /bin/ /build/ -/.sass-cache/ Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/.mymetadata'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/Bbb.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbConfig.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/bbb/model/BbbUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_bbb/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_bbb/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_bbb/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -1,75 +1,3 @@ appName = bbb -#language code: en -#locale code: AU - - # Exported from the LAMS Community by Ernie Ghiglione on Sun Dec 04 00:31:19 CST 2016 - -#=================== labels for Web conferencing =================# - tool.display.name =Web Conference -tool.description =The Web Conferencing tool provides document, whiteboard and desktop sharing through the browser. -activity.title =Web Conference -activity.description =Web Conference tool -activity.helptext =Web Conference -activity.welcome.message =Welcome to Web Conference -pageTitle.authoring =Web Conference Authoring -pageTitle.monitoring =Web Conference Monitoring -button.basic =Basic -button.advanced =Advanced -button.cancel =Cancel -button.save =Save -button.finish =Next Activity -button.continue =Continue -button.edit =Edit -button.try.again =Try again -button.summary =Summary -button.editActivity =Edit Activity -button.statistics =Statistics -button.close =Close -label.authoring.basic.title =Title -label.view =View -label.notAvailable =Not available -label.save =Save -label.created =Created -label.lastModified =Last modified -label.notebookEntry =Notebook entry -label.authoring.basic.instructions =Instructions -label.authoring.basic.bbbSettings =Web Conference settings -label.on =On -label.off =Off -label.monitoring.startConference =Start conference -label.learning.joinConference =Join conference -label.learning.conferenceNotAvailable =The Web Conference is not available yet as your instruction hasn't started. Please see your instructor for further details. -label.refresh =Refresh -label.cancel =Cancel -message.defineLaterSet =Please wait for the teacher to complete the contents of this activity -message.learner.blank.input =You have not written anything. Are you sure this is correct? -message.alertContentEdit =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information. -message.warnLockOnFinish =Note: After you click on "Next Activity", you won't be able to continue participating in the conference. -message.activityLocked =You won't be able to continue participating in the conference after you have completed. -message.no.reflection.available =Notebook not available -message.endMeeting =The meeting room is now closed. You can continue with your sequence. -heading.totalLearners =Number of learners -heading.totalLearnersInGroup =Total number of learners in group -heading.totalFinishedLearnersInGroup =Number of finished learners -heading.learner =Learner -heading.notebookEntry =Notebook entry -error.mandatoryField ={0} field is mandatory. -error.optionalField ={0} has been left blank. -advanced.lockOnFinished =Lock when finished -advanced.reflectOnActivity =Add a notebook at end of Web Conference with the following instructions -authoring.msg.cancel.save =Do you want to close this window without saving? -monitor.summary.th.advancedSettings =Advanced settings -monitor.summary.bbbSettings =Web Conference settings -admin.title =Web Conference Administration -config.serverURL =Big Blue Button server URL -config.securitySalt.notice =Note that "Security Salt" is required. This Security Salt is a keyword that is used to ensure that web conference rooms can only be created from this website. -config.securitySalt.notice2 =IMPORTANT: DO NOT ALLOW END USERS TO KNOW YOUR SECURITY SALT OR ELSE YOUR SECURITY WILL BE COMPROMISED. See BigBlueButton website for details -config.securitySalt =Security salt -message.unableToStartLesson =Unable to join meeting. Please see your instructor. -button.submit =Finish -message.monitoring.summary.no.session =No session available -label.activity.completion =End of activity - - -#======= End labels: Exported 64 labels for en AU ===== +activity.title =Web Conference \ No newline at end of file Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/conf/language/lams/ApplicationResources_el_GR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/conf/language/lams/ApplicationResources_en_AU.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/conf/language/lams/ApplicationResources_es_ES.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/conf/language/lams/ApplicationResources_es_MX.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/conf/language/lams/ApplicationResources_fr_FR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/conf/language/lams/ApplicationResources_mi_NZ.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/conf/language/lams/ApplicationResources_no_NO.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/conf/language/lams/ApplicationResources_pt_BR.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_bbb/db/sql/create_lams_tool_bbb.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_bbb/db/sql/create_lams_tool_bbb.sql (.../create_lams_tool_bbb.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_bbb/db/sql/create_lams_tool_bbb.sql (.../create_lams_tool_bbb.sql) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -1,82 +1,3 @@ +-- file must not be empty and it must contain update statements (not select) SET FOREIGN_KEY_CHECKS=0; - -CREATE TABLE tl_labbb10_bbb ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - create_date datetime, - update_date datetime, - create_by bigint(20), - title varchar(255), - instructions mediumtext, - lock_on_finished bit(1), - reflect_on_activity bit(1), - reflect_instructions mediumtext, - content_in_use bit(1), - define_later bit(1), - tool_content_id bigint(20), - PRIMARY KEY (uid) -); - -CREATE TABLE tl_labbb10_session ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - session_end_date datetime, - session_start_date datetime, - status int(11), - session_id bigint(20), - session_name varchar(250), - bbb_uid bigint(20), - meeting_created bit(1), - meeting_key varchar(255), - attendee_password varchar(20), - moderator_password varchar(20), - PRIMARY KEY (uid), - UNIQUE KEY session_id (session_id), - CONSTRAINT fk_labbb10_bbb_session_to_bbb FOREIGN KEY (bbb_uid) - REFERENCES tl_labbb10_bbb (uid) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE tl_labbb10_user ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - user_id bigint(20), - last_name varchar(255), - login_name varchar(255), - first_name varchar(255), - finishedActivity bit(1), - bbb_session_uid bigint(20), - notebook_entry_uid bigint(20), - PRIMARY KEY (uid), - CONSTRAINT fk_labbb10_bbb_user_to_bbb_session - FOREIGN KEY (bbb_session_uid) REFERENCES tl_labbb10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE tl_labbb10_config ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - config_key varchar(255), - config_value varchar(255), - PRIMARY KEY (uid) -); - -INSERT INTO tl_labbb10_bbb ( - title, - instructions, - tool_content_id, - lock_on_finished, - content_in_use, - define_later, - reflect_on_activity - ) -VALUES( - "Web Conference", - "Instructions", - ${default_content_id}, - 0, - 0, - 0, - 0 -); - --- default configuration values -INSERT INTO tl_labbb10_config (config_key, config_value) VALUES ("server_url", "http://172.20.100.253/"); -INSERT INTO tl_labbb10_config (config_key, config_value) VALUES ("security_salt", "12309usadoiaksdjblquge12312"); - - SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_bbb/db/sql/tool_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_bbb/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_bbb/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -36,7 +36,7 @@ 'tool/labbb10/learning.do?mode=teacher', 'tool/labbb10/authoring.do', 'tool/labbb10/monitoring.do', -'http://wiki.lamsfoundation.org/display/lamsdocs/labbb10', +NULL, 'tool/labbb10/admin/view.do', 'org.lamsfoundation.lams.tool.bbb.ApplicationResources', NOW(), Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml (.../bbbApplicationContext.xml) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml (.../bbbApplicationContext.xml) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -5,73 +5,5 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - - - - - - - - - - - - - - - - - - - - - - - - bbbworkspace - bbb - lams-ex - - + Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dao/IBbbConfigDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dao/IBbbDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dao/IBbbSessionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dao/IBbbUserDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dao/hibernate/BbbConfigDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dao/hibernate/BbbDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dao/hibernate/BbbSessionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dao/hibernate/BbbUserDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/autopatchContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dto/ConfigDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dto/ContentDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dto/NotebookEntryDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dto/SessionDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dto/UserDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/model/Bbb.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/model/BbbConfig.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/model/BbbSession.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/model/BbbUser.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbImportContentVersionFilter.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java (.../BbbService.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java (.../BbbService.java) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -21,106 +21,38 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.bbb.service; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLEncoder; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.SortedMap; -import java.util.TreeMap; -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; -import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; -import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; -import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; -import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.ToolCompletionStatus; 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; -import org.lamsfoundation.lams.tool.bbb.dao.IBbbConfigDAO; -import org.lamsfoundation.lams.tool.bbb.dao.IBbbDAO; -import org.lamsfoundation.lams.tool.bbb.dao.IBbbSessionDAO; -import org.lamsfoundation.lams.tool.bbb.dao.IBbbUserDAO; -import org.lamsfoundation.lams.tool.bbb.model.Bbb; -import org.lamsfoundation.lams.tool.bbb.model.BbbConfig; -import org.lamsfoundation.lams.tool.bbb.model.BbbSession; -import org.lamsfoundation.lams.tool.bbb.model.BbbUser; -import org.lamsfoundation.lams.tool.bbb.util.BbbException; -import org.lamsfoundation.lams.tool.bbb.util.BbbUtil; -import org.lamsfoundation.lams.tool.bbb.util.Constants; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; -import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.usermanagement.dto.UserDTO; /** * An implementation of the IBbbService interface. * * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ -public class BbbService implements ToolSessionManager, ToolContentManager, IBbbService { +public class BbbService implements ToolSessionManager, ToolContentManager { - private static final Logger logger = Logger.getLogger(BbbService.class); - - private IBbbDAO bbbDAO = null; - - private IBbbSessionDAO bbbSessionDAO = null; - - private IBbbUserDAO bbbUserDAO = null; - - private IBbbConfigDAO bbbConfigDAO = null; - - private ILamsToolService toolService; - - private IToolContentHandler bbbToolContentHandler = null; - - private IExportToolContentService exportContentService; - - private ICoreNotebookService coreNotebookService; - - public BbbService() { - super(); - // TODO Auto-generated constructor stub - } - - /* Methods from ToolSessionManager */ @Override public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { - if (BbbService.logger.isDebugEnabled()) { - BbbService.logger.debug("entering method createToolSession:" + " toolSessionId = " + toolSessionId - + " toolSessionName = " + toolSessionName + " toolContentId = " + toolContentId); - } - - BbbSession session = new BbbSession(); - session.setSessionId(toolSessionId); - session.setSessionName(toolSessionName); - // learner starts - Bbb bbb = getBbbByContentId(toolContentId); - session.setBbb(bbb); - bbbSessionDAO.insertOrUpdate(session); } @Override public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException { - return toolService.completeToolSession(toolSessionId, learnerId); + return null; } @Override @@ -130,623 +62,92 @@ } @Override - @SuppressWarnings("unchecked") public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, ToolException { return null; } @Override public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException { - bbbSessionDAO.deleteByProperty(BbbSession.class, "sessionId", toolSessionId); - // TODO check if cascade worked } @Override public SortedMap getToolOutput(List names, Long toolSessionId, Long learnerId) { - return new TreeMap(); + return null; } @Override public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } - + @Override public List getToolOutputs(String name, Long toolContentId) { return new ArrayList(); } - + @Override public List getConfidenceLevels(Long toolSessionId) { return null; } @Override public void forceCompleteUser(Long toolSessionId, User user) { - //no actions required } - /* Methods from ToolContentManager */ - @Override public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { - - if (BbbService.logger.isDebugEnabled()) { - BbbService.logger.debug("entering method copyToolContent:" + " fromContentId=" + fromContentId - + " toContentId=" + toContentId); - } - - if (toContentId == null) { - String error = "Failed to copy tool content: toContentID is null"; - throw new ToolException(error); - } - - Bbb fromContent = null; - if (fromContentId != null) { - fromContent = getBbbByContentId(fromContentId); - } - if (fromContent == null) { - // create the fromContent using the default tool content - fromContent = getDefaultContent(); - } - Bbb toContent = Bbb.newInstance(fromContent, toContentId, bbbToolContentHandler); - saveOrUpdateBbb(toContent); } @Override public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { - Bbb bbb = getBbbByContentId(toolContentId); - if (bbb == null) { - throw new ToolException("Could not find tool with toolContentID: " + toolContentId); - } - bbb.setDefineLater(false); - saveOrUpdateBbb(bbb); } @Override public void removeToolContent(Long toolContentId) throws ToolException { - Bbb bbb = getBbbByContentId(toolContentId); - if (bbb == null) { - BbbService.logger.warn("Can not remove the tool content as it does not exist, ID: " + toolContentId); - return; - } - - for (BbbSession session : bbb.getBbbSessions()) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, Constants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - - bbbDAO.delete(bbb); } @Override public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException { - if (BbbService.logger.isDebugEnabled()) { - BbbService.logger.debug("Resetting Web Conference completion flag for user ID " + userId - + " and toolContentId " + toolContentId); - } - - Bbb bbb = getBbbByContentId(toolContentId); - if (bbb == null) { - BbbService.logger - .warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content"); - return; - } - - for (BbbSession session : bbb.getBbbSessions()) { - for (BbbUser user : session.getBbbUsers()) { - if (user.getUserId().equals(userId.longValue())) { - if (user.getNotebookEntryUID() != null) { - NotebookEntry entry = coreNotebookService.getEntry(user.getNotebookEntryUID()); - bbbDAO.delete(entry); - user.setNotebookEntryUID(null); - } - user.setFinishedActivity(false); - bbbUserDAO.update(user); - } - } - } } - /** - * 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 - */ - @Override - public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { - Bbb bbb = getBbbByContentId(toolContentId); - if (bbb == null) { - bbb = getDefaultContent(); - } - if (bbb == null) { - throw new DataMissingException("Unable to find default content for the bbb tool"); - } - - // set ResourceToolContentHandler as null to avoid copy file node in - // repository again. - bbb = Bbb.newInstance(bbb, toolContentId, null); - bbb.setToolContentHandler(null); - bbb.setBbbSessions(null); - try { - exportContentService.exportToolContent(toolContentId, bbb, bbbToolContentHandler, rootPath); - } catch (ExportToolContentException e) { - throw new ToolException(e); - } + public void exportToolContent(Long toolContentId, String toPath) throws DataMissingException, ToolException { } - /** - * Import the XML fragment for the tool's content, along with any files needed for the content. - * - * @throws ToolException - * if any other error occurs - */ @Override public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion, String toVersion) throws ToolException { - try { - // register version filter class - exportContentService.registerImportVersionFilterClass(BbbImportContentVersionFilter.class); - - Object toolPOJO = exportContentService.importToolContent(toolContentPath, bbbToolContentHandler, - fromVersion, toVersion); - if (!(toolPOJO instanceof Bbb)) { - throw new ImportToolContentException( - "Import Bbb tool content failed. Deserialized object is " + toolPOJO); - } - Bbb bbb = (Bbb) toolPOJO; - - // reset it to new toolContentId - bbb.setToolContentId(toolContentId); - bbb.setCreateBy(new Long(newUserUid.longValue())); - - saveOrUpdateBbb(bbb); - } catch (ImportToolContentException e) { - throw new ToolException(e); - } } @Override - public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { + public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType) + throws ToolException { return null; } - /** - * 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 - */ @Override - public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType) - throws ToolException { - return new TreeMap(); + public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { + return null; } @Override public String getToolContentTitle(Long toolContentId) { - return getBbbByContentId(toolContentId).getTitle(); + return null; } @Override public boolean isContentEdited(Long toolContentId) { - return getBbbByContentId(toolContentId).isDefineLater(); + return false; } @Override public boolean isReadOnly(Long toolContentId) { - Bbb content = getBbbByContentId(toolContentId); - for (BbbSession session : content.getBbbSessions()) { - for (BbbUser user : session.getBbbUsers()) { - if (user.getNotebookEntryUID() != null) { - // we don't remove users in removeLearnerContent() - // we just set their notebook entry to NULL - return true; - } - } - } - return false; } - /* IBbbService Methods */ - @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - public NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID) { - - List list = coreNotebookService.getEntry(id, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public NotebookEntry getNotebookEntry(Long uid) { - return coreNotebookService.getEntry(uid); - } - - @Override - public void updateNotebookEntry(Long uid, String entry) { - coreNotebookService.updateEntry(uid, "", entry); - } - - @Override - public void updateNotebookEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override - public Long getDefaultContentIdBySignature(String toolSignature) { - Long toolContentId = null; - toolContentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); - if (toolContentId == null) { - String error = "Could not retrieve default content id for this tool"; - BbbService.logger.error(error); - throw new BbbException(error); - } - return toolContentId; - } - - @Override - public Bbb getDefaultContent() { - Long defaultContentID = getDefaultContentIdBySignature(Constants.TOOL_SIGNATURE); - Bbb defaultContent = getBbbByContentId(defaultContentID); - if (defaultContent == null) { - String error = "Could not retrieve default content record for this tool"; - BbbService.logger.error(error); - throw new BbbException(error); - } - return defaultContent; - } - - @Override - public Bbb copyDefaultContent(Long newContentID) { - - if (newContentID == null) { - String error = "Cannot copy the Bbb tools default content: + " + "newContentID is null"; - BbbService.logger.error(error); - throw new BbbException(error); - } - - Bbb defaultContent = getDefaultContent(); - // create new bbb using the newContentID - Bbb newContent = new Bbb(); - newContent = Bbb.newInstance(defaultContent, newContentID, bbbToolContentHandler); - saveOrUpdateBbb(newContent); - return newContent; - } - - @Override - @SuppressWarnings("unchecked") - public Bbb getBbbByContentId(Long toolContentID) { - List list = bbbDAO.findByProperty(Bbb.class, "toolContentId", toolContentID); - if (list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public boolean isGroupedActivity(long toolContentID) { - return toolService.isGroupedActivity(toolContentID); - } - - @Override - public void auditLogStartEditingActivityInMonitor(long toolContentID) { - toolService.auditLogStartEditingActivityInMonitor(toolContentID); - } - - @Override - @SuppressWarnings("unchecked") - public BbbSession getSessionBySessionId(Long toolSessionId) { - List list = bbbSessionDAO.findByProperty(BbbSession.class, "sessionId", toolSessionId); - if (list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - @SuppressWarnings("unchecked") - public BbbUser getUserByUserIdAndSessionId(Long userId, Long toolSessionId) { - Map map = new HashMap(); - map.put("userId", userId); - map.put("bbbSession.sessionId", toolSessionId); - List list = bbbUserDAO.findByProperties(BbbUser.class, map); - if (list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - @SuppressWarnings("unchecked") - public BbbUser getUserByUID(Long uid) { - List list = bbbUserDAO.findByProperty(BbbUser.class, "uid", uid); - if (list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public String getJoinMeetingURL(UserDTO userDTO, String meetingKey, String password) throws Exception { - - // Get Bbb details - String serverURL = getConfigValue(Constants.CFG_SERVER_URL); - String securitySalt = getConfigValue(Constants.CFG_SECURITYSALT); - // Get Join parameter - String joinParam = Constants.BBB_JOIN_PARAM; - - if (serverURL == null) { - BbbService.logger.error("Config item : '" + Constants.CFG_SERVER_URL + "' not defined"); - throw new BbbException("Server url not defined"); - } - - String queryString = "fullName=" - + URLEncoder.encode(userDTO.getFirstName() + " " + userDTO.getLastName(), "UTF8") + "&meetingID=" - + URLEncoder.encode(meetingKey, "UTF8") + "&password=" + URLEncoder.encode(password, "UTF8"); - - String checkSum = DigestUtils.shaHex("join" + queryString + securitySalt); - - String url = serverURL + joinParam + queryString + "&checksum=" + checkSum; - - return url; - } - - @Override - public Boolean isMeetingRunning(String meetingKey) throws Exception { - String serverURL = getConfigValue(Constants.CFG_SERVER_URL); - String securitySalt = getConfigValue(Constants.CFG_SECURITYSALT); - String meetingRunning = Constants.BBB_MEETING_RUNNING_PARAM; - - String queryString = "meetingID=" + URLEncoder.encode(meetingKey, "UTF8"); - - String checkSum = DigestUtils.shaHex("isMeetingRunning" + queryString + securitySalt); - - URL url; - url = new URL(serverURL + meetingRunning + queryString + "&checksum=" + URLEncoder.encode(checkSum, "UTF8")); - - BbbService.logger.debug("isMeetingRunningURL=" + url); - - String response; - response = sendRequest(url); - - if (response.contains("true")) { - return true; - } else { - return false; - } - - } - - @Override - public String startConference(String meetingKey, String atendeePassword, String moderatorPassword, String returnURL, - String welcomeMessage) throws Exception { - - String serverURL = getConfigValue(Constants.CFG_SERVER_URL); - String securitySalt = getConfigValue(Constants.CFG_SECURITYSALT); - String createParam = Constants.BBB_CREATE_PARAM; - - if (serverURL == null) { - BbbService.logger.error("Config item : '" + Constants.CFG_SERVER_URL + "' not defined"); - throw new BbbException("Standard server url not defined"); - } - - String queryString = "name=" + URLEncoder.encode(meetingKey, "UTF8") + "&meetingID=" - + URLEncoder.encode(meetingKey, "UTF8") + "&attendeePW=" + URLEncoder.encode(atendeePassword, "UTF8") - + "&moderatorPW=" + URLEncoder.encode(moderatorPassword, "UTF8") + "&logoutURL=" - + URLEncoder.encode(returnURL, "UTF8") + "&welcome=" + URLEncoder.encode(welcomeMessage, "UTF8"); - - BbbService.logger.debug("queryString = " + queryString); - - String checkSum = DigestUtils.shaHex("create" + queryString + securitySalt); - - BbbService.logger.debug("checksum = " + checkSum); - - URL url; - url = new URL(serverURL + createParam + queryString + "&checksum=" + URLEncoder.encode(checkSum, "UTF8")); - - BbbService.logger.info("url = " + url); - - String response; - response = sendRequest(url); - - if (BbbUtil.getResponse(response) == Constants.RESPONSE_SUCCESS) { - return Constants.RESPONSE_SUCCESS; - } else { - BbbService.logger.error("BBB returns fail when creating a meeting room"); - throw new BbbException("Standard server url not defined"); - - } - } - - @Override - public void saveOrUpdateBbb(Bbb bbb) { - bbbDAO.insertOrUpdate(bbb); - } - - @Override - public void saveOrUpdateBbbSession(BbbSession bbbSession) { - bbbSessionDAO.insertOrUpdate(bbbSession); - } - - @Override - public void saveOrUpdateBbbUser(BbbUser bbbUser) { - bbbUserDAO.insertOrUpdate(bbbUser); - } - - @Override - public BbbUser createBbbUser(UserDTO user, BbbSession bbbSession) { - BbbUser bbbUser = new BbbUser(user, bbbSession); - saveOrUpdateBbbUser(bbbUser); - return bbbUser; - } - - @Override - @SuppressWarnings("unchecked") - public BbbConfig getConfig(String key) { - List list = bbbConfigDAO.findByProperty(BbbConfig.class, "key", key); - if (list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - @SuppressWarnings("unchecked") - public String getConfigValue(String key) { - List list = bbbConfigDAO.findByProperty(BbbConfig.class, "key", key); - if (list.isEmpty()) { - return null; - } else { - return list.get(0).getValue(); - } - } - - @Override - public void saveOrUpdateConfigEntry(BbbConfig bbbConfig) { - bbbConfigDAO.insertOrUpdate(bbbConfig); - } - - private String sendRequest(URL url) throws IOException { - - if (BbbService.logger.isDebugEnabled()) { - BbbService.logger.debug("request = " + url); - } - - URLConnection connection = url.openConnection(); - - BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); - String response = ""; - String line = ""; - - while ((line = in.readLine()) != null) { - response += line; - } - in.close(); - - if (BbbService.logger.isDebugEnabled()) { - BbbService.logger.debug("response = " + response); - } - - return response; - } - - /** - * Set the description, throws away the title value as this is not supported in 2.0 - */ - public void setReflectiveData(Long toolContentId, String title, String description) - throws ToolException, DataMissingException { - - BbbService.logger.warn( - "Setting the reflective field on a bbb. This doesn't make sense as the bbb is for reflection and we don't reflect on reflection!"); - Bbb bbb = getBbbByContentId(toolContentId); - if (bbb == null) { - throw new DataMissingException("Unable to set reflective data titled " + title - + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); - } - - bbb.setReflectOnActivity(Boolean.TRUE); - bbb.setReflectInstructions(description); - } - - // ========================================================================================= - /* Used by Spring to "inject" the linked objects */ - - public IBbbDAO getBbbDAO() { - return bbbDAO; - } - - public void setBbbDAO(IBbbDAO bbbDAO) { - this.bbbDAO = bbbDAO; - } - - public IToolContentHandler getBbbToolContentHandler() { - return bbbToolContentHandler; - } - - public void setBbbToolContentHandler(IToolContentHandler bbbToolContentHandler) { - this.bbbToolContentHandler = bbbToolContentHandler; - } - - public IBbbSessionDAO getBbbSessionDAO() { - return bbbSessionDAO; - } - - public void setBbbSessionDAO(IBbbSessionDAO sessionDAO) { - this.bbbSessionDAO = sessionDAO; - } - - public IBbbConfigDAO getBbbConfigDAO() { - return bbbConfigDAO; - } - - public void setBbbConfigDAO(IBbbConfigDAO bbbConfigDAO) { - this.bbbConfigDAO = bbbConfigDAO; - } - - public ILamsToolService getToolService() { - return toolService; - } - - public void setToolService(ILamsToolService toolService) { - this.toolService = toolService; - } - - public IBbbUserDAO getBbbUserDAO() { - return bbbUserDAO; - } - - public void setBbbUserDAO(IBbbUserDAO userDAO) { - this.bbbUserDAO = userDAO; - } - - public IExportToolContentService getExportContentService() { - return exportContentService; - } - - public void setExportContentService(IExportToolContentService exportContentService) { - this.exportContentService = exportContentService; - } - - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - - @Override public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) { - BbbUser learner = getUserByUserIdAndSessionId(learnerId, toolSessionId); - if (learner == null) { - return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_NOT_ATTEMPTED, null, null); - } - - return new ToolCompletionStatus(learner.isFinishedActivity() ? ToolCompletionStatus.ACTIVITY_COMPLETED - : ToolCompletionStatus.ACTIVITY_ATTEMPTED, null, null); - } + return null; + } } Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbServiceProxy.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/util/BbbException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/util/BbbUtil.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/util/Constants.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AdminAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/LearningAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/MonitoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/controller/AuthoringController.java =================================================================== diff -u --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/controller/AuthoringController.java (revision 0) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/controller/AuthoringController.java (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -0,0 +1,37 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * 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. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.tool.bbb.web.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/authoring") +public class AuthoringController { + @RequestMapping("") + public String execute() throws Exception { + return "index"; + } +} \ No newline at end of file Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/controller/LearningController.java =================================================================== diff -u --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/controller/LearningController.java (revision 0) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/controller/LearningController.java (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -0,0 +1,57 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * 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. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.tool.bbb.web.controller; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.lamsfoundation.lams.tool.service.ILamsToolService; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/learning") +public class LearningController { + + @Autowired + @Qualifier("lamsToolService") + private ILamsToolService toolService; + + @RequestMapping("") + public String execute(HttpServletRequest request) { + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); + + String finishURL = toolService.completeToolSession(toolSessionId, user.getUserID().longValue()); + return "redirect:" + finishURL; + } +} \ No newline at end of file Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/controller/MonitoringController.java =================================================================== diff -u --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/controller/MonitoringController.java (revision 0) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/controller/MonitoringController.java (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -0,0 +1,41 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * 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. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.tool.bbb.web.controller; + +import java.io.IOException; + +import javax.servlet.ServletException; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/monitoring") +public class MonitoringController { + @RequestMapping("") + public String execute() throws IOException, ServletException { + return "index"; + } +} \ No newline at end of file Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/forms/AdminForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/forms/AuthoringForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/forms/LearningForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/forms/MonitoringForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/403.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/404.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_bbb/web/WEB-INF/applicationContext.xml =================================================================== diff -u --- lams_tool_bbb/web/WEB-INF/applicationContext.xml (revision 0) +++ lams_tool_bbb/web/WEB-INF/applicationContext.xml (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -0,0 +1,7 @@ + + + + \ No newline at end of file Index: lams_tool_bbb/web/WEB-INF/spring-servlet.xml =================================================================== diff -u --- lams_tool_bbb/web/WEB-INF/spring-servlet.xml (revision 0) +++ lams_tool_bbb/web/WEB-INF/spring-servlet.xml (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -0,0 +1,17 @@ + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/struts-config.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/AdvancedAccordian.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Alert.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Arrow.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/AuthoringRatingCriteria.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Comments.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/CommentsAuthor.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Date.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/DefineLater.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/FileUpload.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Head.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/ImgButtonWrapper.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/LeaderDisplay.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Page.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Rating.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/RestrictedUsageAccordian.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/SimplePanel.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/TSTable.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Tab.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/TabBody.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/TabBodyArea.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/TabBodys.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Tabs.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/TextSearch.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/WaitingSpinner.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/headItems.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tiles-defs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/jstl/c.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/jstl/fmt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/jstl/fn.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/jstl/permittedTaglibs.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/jstl/scriptfree.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/jstl/x.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/struts/struts-bean-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/struts/struts-bean.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/struts/struts-html-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/struts/struts-html.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/struts/struts-logic-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/struts/struts-logic.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/struts/struts-nested.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/struts/struts-tiles-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tlds/struts/struts-tiles.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/validation.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/validator-rules.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_bbb/web/WEB-INF/web.xml =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_bbb/web/WEB-INF/web.xml (.../web.xml) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_bbb/web/WEB-INF/web.xml (.../web.xml) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -3,16 +3,12 @@ - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.bbb.ApplicationResources - + BBB + + Web Conference + - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/bbb/dbupdates/autopatchContext.xml - - locatorFactorySelector classpath:/org/lamsfoundation/lams/beanRefContext.xml @@ -21,286 +17,45 @@ context.central + + + org.springframework.web.context.ContextLoaderListener + + + SystemSessionFilter org.lamsfoundation.lams.web.session.SystemSessionFilter - - hibernateFilter - - org.springframework.orm.hibernate5.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - SystemSessionFilter /* - - hibernateFilter - /* - - - LocaleFilter - /* - - - - org.springframework.web.context.ContextLoaderListener - - - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 2 - - - validate - true - - 1 + spring + + org.springframework.web.servlet.DispatcherServlet + + 1 - - - - Connector - net.fckeditor.connector.ConnectorServlet - - baseDir - /UserFiles/ - - - debug - false - - 1 - - - - - Attachment Download - Attachment Download - download - org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - bbbToolContentHandler - - 3 - - - - action + spring *.do - - - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector - - - - download - /download/* - - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - - - - - - - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld - - - tags-html - /WEB-INF/tlds/struts/struts-html.tld - - - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld - - - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld - - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - - - tags-permittedTaglibs - /WEB-INF/tlds/jstl/permittedTaglibs.tld - - - tags-scriptfree - /WEB-INF/tlds/jstl/scriptfree.tld - - - - - - tags-lams - /WEB-INF/tlds/lams/lams.tld - - - - - - Secure Content + Public content /* GET POST - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - - - - Authoring content - /authoring/* - /pages/authoring/* - /authoring.do - GET - POST - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /pages/monitoring/* - /monitoring.do - GET - POST - - - MONITOR - SYSADMIN - - - - - - Admin content - /admin/* - /pages/admin/* - GET - POST - - - SYSADMIN - - - - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - - - Student - LEARNER - - - - Authors Learning Designs - AUTHOR - - - - Member of Staff - MONITOR - - - - Group Manager - GROUP MANAGER - - - Group Administrator - GROUP ADMIN - - - LAMS System Adminstrator - SYSADMIN - \ No newline at end of file Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/common/empty.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/common/footer.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/common/message.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/common/simpleHeader.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/common/tabbedHeader.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/common/taglibs.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/error.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/images/icon_bbb.ai'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/images/icon_bbb_16.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/includes/javascript/authoring.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/includes/javascript/monitoring.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_bbb/web/index.jsp =================================================================== diff -u --- lams_tool_bbb/web/index.jsp (revision 0) +++ lams_tool_bbb/web/index.jsp (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -0,0 +1,5 @@ + + + This tool is not supported anymore. + + \ No newline at end of file Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/layouts/simpleLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/layouts/tabbedLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/admin/edit.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/admin/view.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/authoring/advanced.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/authoring/authoring.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/authoring/basic.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/authoring/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/bbb/end_meeting.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/learning/defineLater.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/learning/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/learning/learning.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/learning/notebook.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/learning/parts/finishButton.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/monitoring/editActivity.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/monitoring/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/monitoring/monitoring.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/monitoring/notebook.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/monitoring/statistics.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_bbb/web/pages/monitoring/summary.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/.gitignore =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_gmap/.gitignore (.../.gitignore) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_gmap/.gitignore (.../.gitignore) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -1,3 +1,2 @@ /bin/ /build/ -/.sass-cache/ Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/.myumldata'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_gmap/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_gmap/build.properties (.../build.properties) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -3,5 +3,5 @@ signature=lagmap10 tool.version=20170101 -tool.hide=false +tool.hide=true tool.short.name=gmap \ No newline at end of file Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapConfigItem.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_gmap/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -1,116 +1,3 @@ -appName = gmap -#language code: en -#locale code: AU - - # Exported from the LAMS Community by Ernie Ghiglione on Sun Apr 01 20:55:24 CST 2018 - -#=================== labels for Google Maps =================# - +appName = gmap tool.display.name =Gmap -tool.description =Google Mapping Tool -activity.title =Gmap -activity.description =Google Mapping Tool -activity.helptext =Gmap for marking world map points -pageTitle.authoring =Gmap Authoring -button.basic =Basic -button.advanced =Advanced -label.authoring.basic.title =Title: -label.authoring.basic.content =Content: -label.authoring.basic.instructions =Instructions: -label.authoring.basic.authored =Authored -label.authoring.basic.map =Map: -label.authoring.basic.centerMap =Center map on location: -label.authoring.basic.confirmDelete =Are you sure you want to remove this marker? -error.missingMarkerTitle =Title is required for marker. -error.cantFindAddress =Unable to find location: -button.addMarker =Add marker -button.fitMarkers =Fit All Markers in Map -button.go =Go! -label.createdBy =Created by: -label.latitudeLongitude =Latitude-Longitude: -label.newInfoWindowText =Description: -button.edit =Edit -button.remove =Remove -label.learner.markerLimitReached =You have reached the marker limit, you cannot add any more. -advanced.editingOptions =Editing options -advanced.lockOnFinished =Lock when finished -advanced.allowEditMarkers =Allow learners to edit their own saved markers -advanced.allowShowAllMarkers =Allow learners to see markers from other learners -advanced.limitMarkers =Marker Limits -advanced.markerLimitsMessage =Limit the number of markers a learner can add -advanced.mapOptions =Map Options -advanced.allowZoom =Allow zoom control -advanced.allowTerrain =Allow terrain map type -advanced.allowSatellite =Allow satellite map type -advanced.allowHybrid =Allow hybrid map type -monitor.summary.title.advanced =Advanced -monitor.summary.title.map =Map -monitor.summary.th.advancedSettings =Advanced settings -label.authoring.authoredMarkers =Markers -label.legend.unsaved =Unsaved: -label.legend.saved =Saved: -label.legend.edited =Edited: -label.legend.userSelected =User selected: -link.view =View -message.defineLaterSet =Please wait for the instructor to complete the contents of this activity -pageTitle.monitoring =Gmap Monitoring -button.summary =Summary -button.editActivity =Edit activity -button.statistics =Statistics -titleHeading.summary =Summary -titleHeading.instructions =Instructions -titleHeading.statistics =Statistics -titleHeading.editActivity =Edit activity -heading.totalLearners =Number of learners -heading.table.group =Group -heading.totalLearnersInGroup =Learners in group: -heading.totalFinishedLearnersInGroup =Finished learners: -label.view =View -label.notAvailable =Not available -heading.learner =Learner -button.cancel =Cancel -button.ok =OK -button.done =Done -button.save =Save -button.next =Next -label.save =Save -label.cancel =Cancel -label.created =Created -label.lastModified =Last modified -authoring.msg.cancel.save =Do you want to close this window without saving? -button.try.again =Try again -button.finish =Next Activity -message.alertContentEdit =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information. -error.cantLoadMap =Could not load map. -error.gmapKeyMissing =LAMS does not have a Google Maps API key set up, please contact your system administrator. -label.on =On -label.off =Off -label.unsavedMarkers =You have one or more markers on the map without a title, if you continue these markers will not be saved. Do you want to continue anyway? -button.refresh =Refresh Map -button.Continue =Continue -heading.reflection =Reflection -pageTitle.monitoring.notebook =View reflection -message.no.reflection.available =No notebook available -monitor.summary.td.addNotebook =Add a notebook at end of Gmap -monitor.summary.td.notebookInstructions =Notebook instructions -pageTitle.admin =Gmap settings -admin.formError =Missing values, please make sure all required fields are entered. -admin.gmapKey =Google Maps API Key -admin.success =Configuration successfully saved. -admin.return =Return to maintain LAMS -advanced.reflectOnActivity =Add a notebook at end of Gmap with the following instructions: -button.continue =Continue -button.placeMarker =Place marker -label.nogroups =No groups found for activity. -button.submit =Finish -label.activity.completion =End of activity -label.show.on.map =Show on map -label.search =Search... -monitoring.user.fullname =Name -monitoring.user.reflection =Notebook entry -outcome.authoring.title =Learning outcomes -outcome.authoring.input =Search and select by outcome name or code -outcome.authoring.existing =Added outcomes -outcome.authoring.existing.none =none - -#======= End labels: Exported 102 labels for en AU ===== +activity.title =Gmap \ No newline at end of file Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_de_DE.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_el_GR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_es_ES.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_es_MX.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_fr_FR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_it_IT.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_ja_JP.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_ko_KR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_mi_NZ.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_no_NO.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_pt_BR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/conf/language/lams/ApplicationResources_tr_TR.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/db/sql/create_lams_tool_gmap.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_gmap/db/sql/create_lams_tool_gmap.sql (.../create_lams_tool_gmap.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_gmap/db/sql/create_lams_tool_gmap.sql (.../create_lams_tool_gmap.sql) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -1,150 +1,3 @@ +-- file must not be empty and it must contain update statements (not select) SET FOREIGN_KEY_CHECKS=0; - -CREATE TABLE tl_lagmap10_gmap ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - create_date datetime, - update_date datetime, - create_by bigint(20), - title varchar(255), - instructions mediumtext, - lock_on_finished bit(1), - content_in_use bit(1), - define_later bit(1), - tool_content_id bigint(20), - allow_edit_markers bit(1), - show_all_markers bit(1), - limit_markers bit(1), - max_markers int(11), - allow_zoom bit(1), - allow_terrain bit(1), - allow_satellite bit(1), - allow_hybrid bit(1), - map_center_latitude double, - map_center_longitude double, - map_zoom int(11), - map_type varchar(20), - reflect_on_activity bit(1), - reflect_instructions mediumtext, - default_geocoder_address varchar(255), - PRIMARY KEY (uid) -); - -CREATE TABLE tl_lagmap10_session ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - session_end_date datetime, - session_start_date datetime, - status int(11), - session_id bigint(20), - session_name varchar(250), - gmap_uid bigint(20), - PRIMARY KEY (uid), - UNIQUE KEY session_id (session_id), - CONSTRAINT FK519D516774028C80 FOREIGN KEY (gmap_uid) - REFERENCES tl_lagmap10_gmap (uid) ON DELETE CASCADE ON UPDATE CASCADE -); - - CREATE TABLE tl_lagmap10_user ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - user_id bigint(20), - last_name varchar(255), - login_name varchar(255), - first_name varchar(255), - finishedActivity bit(1), - gmap_session_uid bigint(20), - PRIMARY KEY (uid), - CONSTRAINT FK7CB3F69AC5F056D9 FOREIGN KEY (gmap_session_uid) - REFERENCES tl_lagmap10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE tl_lagmap10_marker ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - longitude double, - latitude double, - info_window_message mediumtext, - create_date datetime, - update_date datetime, - is_authored bit(1), - gmap_uid bigint(20), - title varchar(55), - created_by bigint(20), - updated_by bigint(20), - gmap_session_uid bigint(20), - PRIMARY KEY (uid), - CONSTRAINT FK10F22749529F7FD3 FOREIGN KEY (created_by) - REFERENCES tl_lagmap10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE, - CONSTRAINT FK10F2274974028C80 FOREIGN KEY (gmap_uid) - REFERENCES tl_lagmap10_gmap (uid) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT FK10F22749C5F056D9 FOREIGN KEY (gmap_session_uid) - REFERENCES tl_lagmap10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT FK10F22749EF5F6920 FOREIGN KEY (updated_by) - REFERENCES tl_lagmap10_user (uid) ON DELETE SET NULL ON UPDATE CASCADE -); - -CREATE TABLE tl_lagmap10_configuration ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - config_key varchar(30), - config_value varchar(255), - PRIMARY KEY (uid), - UNIQUE KEY config_key (config_key) -); - --- Inserting the required config item into the config table --- Gmap API key is added here for shaun so the Gmap works there automatically for each build -INSERT INTO tl_lagmap10_configuration ( - config_key, - config_value -) -VALUES( - "GmapKey", - "ABQIAAAAvPAE96y1iioFQOnrP1RCBxQ3ZLSPwrKlL-Fn7FdXNTuNedFYMRT30phEMjEwUhQPccHtJ9JNU1mknQ" -); - - -INSERT INTO tl_lagmap10_gmap ( - title, - instructions, - tool_content_id, - lock_on_finished, - content_in_use, - define_later, - allow_edit_markers, - show_all_markers, - limit_markers, - max_markers, - allow_zoom, - allow_terrain, - allow_satellite, - allow_hybrid, - map_center_latitude, - map_center_longitude, - map_zoom, - map_type, - reflect_on_activity, - reflect_instructions, - default_geocoder_address -) -VALUES( - "Gmap", - "Instructions", - ${default_content_id}, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - -33.774322, - 151.111988, - 13, - "G_NORMAL_MAP", - 0, - "", - "Macquarie University, Sydney NSW" -); - SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapConfigItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapConfigItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml (.../gmapApplicationContext.xml) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml (.../gmapApplicationContext.xml) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -5,80 +5,5 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED,-java.lang.Exception - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - - - - - - - - - - - - - - - - - - - - - - - - - - - - gmapworkspace - gmap - lams-ex - - + Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapConfigItem.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapUser.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapImportContentVersionFilter.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java (.../GmapService.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java (.../GmapService.java) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -21,32 +21,13 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.gmap.service; -import java.io.StringReader; import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; import java.util.List; -import java.util.Set; import java.util.SortedMap; -import java.util.TreeMap; -import javax.servlet.http.HttpSession; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; -import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; -import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; -import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; -import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.ToolCompletionStatus; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -55,96 +36,20 @@ import org.lamsfoundation.lams.tool.ToolSessionManager; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; -import org.lamsfoundation.lams.tool.gmap.dao.IGmapConfigItemDAO; -import org.lamsfoundation.lams.tool.gmap.dao.IGmapDAO; -import org.lamsfoundation.lams.tool.gmap.dao.IGmapMarkerDAO; -import org.lamsfoundation.lams.tool.gmap.dao.IGmapSessionDAO; -import org.lamsfoundation.lams.tool.gmap.dao.IGmapUserDAO; -import org.lamsfoundation.lams.tool.gmap.model.Gmap; -import org.lamsfoundation.lams.tool.gmap.model.GmapConfigItem; -import org.lamsfoundation.lams.tool.gmap.model.GmapMarker; -import org.lamsfoundation.lams.tool.gmap.model.GmapSession; -import org.lamsfoundation.lams.tool.gmap.model.GmapUser; -import org.lamsfoundation.lams.tool.gmap.util.GmapConstants; -import org.lamsfoundation.lams.tool.gmap.util.GmapException; -import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.web.session.SessionManager; -import org.lamsfoundation.lams.web.util.AttributeNames; -import org.w3c.dom.Document; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; /** - * An implementation of the IGmapService interface. - * * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ +public class GmapService implements ToolSessionManager, ToolContentManager { -public class GmapService implements ToolSessionManager, ToolContentManager, IGmapService { - - private static Logger logger = Logger.getLogger(GmapService.class.getName()); - - private IGmapDAO gmapDAO = null; - - private IGmapMarkerDAO gmapMarkerDAO = null; - - private IGmapSessionDAO gmapSessionDAO = null; - - private IGmapUserDAO gmapUserDAO = null; - - private ILamsToolService toolService; - - private IUserManagementService userManagementService; - - private IToolContentHandler gmapToolContentHandler = null; - - private IExportToolContentService exportContentService; - - private ICoreNotebookService coreNotebookService; - - private IGmapConfigItemDAO gmapConfigItemDAO; - - public GmapService() { - super(); - // TODO Auto-generated constructor stub - } - - /* ************ Methods from ToolSessionManager ************* */ @Override public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { - if (GmapService.logger.isDebugEnabled()) { - GmapService.logger.debug("entering method createToolSession:" + " toolSessionId = " + toolSessionId - + " toolSessionName = " + toolSessionName + " toolContentId = " + toolContentId); - } - - GmapSession session = new GmapSession(); - session.setSessionId(toolSessionId); - session.setSessionName(toolSessionName); - // learner starts - // TODO need to also set other fields. - Gmap gmap = gmapDAO.getByContentId(toolContentId); - session.setGmap(gmap); - gmapSessionDAO.saveOrUpdate(session); - - Set markers = gmap.getGmapMarkers(); - if ((markers != null) && (markers.size() > 0)) { - for (GmapMarker marker : markers) { - if (marker.isAuthored() && (marker.getGmapSession() == null)) { - GmapMarker newMarker = (GmapMarker) marker.clone(); - newMarker.setGmapSession(session); - saveOrUpdateGmapMarker(newMarker); - } - } - } } @Override public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException { - return toolService.completeToolSession(toolSessionId, learnerId); + return null; } @Override @@ -161,597 +66,85 @@ @Override public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException { - gmapSessionDAO.deleteBySessionID(toolSessionId); - // TODO check if cascade worked } @Override public SortedMap getToolOutput(List names, Long toolSessionId, Long learnerId) { - return new TreeMap(); + return null; } @Override public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; } - + @Override public List getToolOutputs(String name, Long toolContentId) { return new ArrayList(); } - + @Override public List getConfidenceLevels(Long toolSessionId) { return null; } @Override public void forceCompleteUser(Long toolSessionId, User user) { - //no actions required } - /* ************ Methods from ToolContentManager ************************* */ - @Override public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { - - if (GmapService.logger.isDebugEnabled()) { - GmapService.logger.debug("entering method copyToolContent:" + " fromContentId=" + fromContentId - + " toContentId=" + toContentId); - } - - if (toContentId == null) { - String error = "Failed to copy tool content: toContentID is null"; - throw new ToolException(error); - } - - Gmap fromContent = null; - if (fromContentId != null) { - fromContent = gmapDAO.getByContentId(fromContentId); - } - if (fromContent == null) { - // create the fromContent using the default tool content - fromContent = getDefaultContent(); - } - Gmap toContent = Gmap.newInstance(fromContent, toContentId); - gmapDAO.saveOrUpdate(toContent); } @Override public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { - Gmap gmap = gmapDAO.getByContentId(toolContentId); - if (gmap == null) { - throw new ToolException("Could not find tool with toolContentID: " + toolContentId); - } - gmap.setDefineLater(false); - gmapDAO.saveOrUpdate(gmap); } @Override public void removeToolContent(Long toolContentId) throws ToolException { - Gmap gmap = gmapDAO.getByContentId(toolContentId); - if (gmap == null) { - GmapService.logger.warn("Can not remove the tool content as it does not exist, ID: " + toolContentId); - return; - } - - for (GmapSession session : gmap.getGmapSessions()) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, GmapConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - - gmapDAO.delete(gmap); } @Override public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException { - if (GmapService.logger.isDebugEnabled()) { - GmapService.logger - .debug("Removing Gmap markers for user ID " + userId + " and toolContentId " + toolContentId); - } - Gmap gmap = gmapDAO.getByContentId(toolContentId); - if (gmap == null) { - GmapService.logger - .warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content"); - return; - } - - Iterator markerIterator = gmap.getGmapMarkers().iterator(); - while (markerIterator.hasNext()) { - GmapMarker marker = markerIterator.next(); - if (!marker.isAuthored() && marker.getCreatedBy().getUserId().equals(userId.longValue())) { - gmapMarkerDAO.delete(marker); - markerIterator.remove(); - } - } - - for (GmapSession session : gmap.getGmapSessions()) { - GmapUser user = gmapUserDAO.getByUserIdAndSessionId(userId.longValue(), session.getSessionId()); - if (user != null) { - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - GmapConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - gmapDAO.delete(entry); - } - - user.setFinishedActivity(false); - gmapUserDAO.update(user); - } - } } - /** - * 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 - */ - @Override - public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { - Gmap gmap = gmapDAO.getByContentId(toolContentId); - if (gmap == null) { - gmap = getDefaultContent(); - } - if (gmap == null) { - throw new DataMissingException("Unable to find default content for the gmap tool"); - } - - // set ResourceToolContentHandler as null to avoid copy file node in - // repository again. - gmap = Gmap.newInstance(gmap, toolContentId); - gmap.setGmapSessions(null); - gmap.setCreateBy(null); - - Set markers = gmap.getGmapMarkers(); - Set authorItems = new HashSet(); - - for (GmapMarker gmapMarker : markers) { - if (gmapMarker.isAuthored()) { - gmapMarker.setCreatedBy(null); - gmapMarker.setGmap(null); - gmapMarker.setUpdatedBy(null); - gmapMarker.setGmapSession(null); - authorItems.add(gmapMarker); - } - } - gmap.setGmapMarkers(authorItems); - - try { - exportContentService.exportToolContent(toolContentId, gmap, gmapToolContentHandler, rootPath); - } catch (ExportToolContentException e) { - throw new ToolException(e); - } + public void exportToolContent(Long toolContentId, String toPath) throws DataMissingException, ToolException { } - /** - * Import the XML fragment for the tool's content, along with any files needed for the content. - * - * @throws ToolException - * if any other error occurs - */ @Override public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion, String toVersion) throws ToolException { - try { - // register version filter class - exportContentService.registerImportVersionFilterClass(GmapImportContentVersionFilter.class); - - Object toolPOJO = exportContentService.importToolContent(toolContentPath, gmapToolContentHandler, - fromVersion, toVersion); - if (!(toolPOJO instanceof Gmap)) { - throw new ImportToolContentException( - "Import Gmap tool content failed. Deserialized object is " + toolPOJO); - } - Gmap gmap = (Gmap) toolPOJO; - - // reset it to new toolContentId - gmap.setToolContentId(toolContentId); - - // Create a user for gmap to be created by: - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - GmapUser gmapUser = new GmapUser(user, null); - gmapUserDAO.saveOrUpdate(gmapUser); - - gmap.setCreateBy(gmapUser.getUid()); - // gmap.setCreateBy(new Long(newUserUid.longValue())); - - // Fixing up any trailing spaces - if (gmap.getGmapMarkers() != null) { - for (GmapMarker marker : gmap.getGmapMarkers()) { - if (marker.getInfoWindowMessage() != null) { - marker.setInfoWindowMessage(marker.getInfoWindowMessage().trim()); - } - } - } - - gmapDAO.saveOrUpdate(gmap); - } catch (ImportToolContentException e) { - throw new ToolException(e); - } } - /** - * 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 - */ @Override public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType) throws ToolException { - return new TreeMap(); + return null; } @Override + public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { + return null; + } + + @Override public String getToolContentTitle(Long toolContentId) { - return getGmapByContentId(toolContentId).getTitle(); + return null; } @Override public boolean isContentEdited(Long toolContentId) { - return getGmapByContentId(toolContentId).isDefineLater(); + return false; } @Override public boolean isReadOnly(Long toolContentId) { - Gmap gmap = gmapDAO.getByContentId(toolContentId); - for (GmapMarker marker : gmap.getGmapMarkers()) { - if (!marker.isAuthored()) { - // in removeLearnerContent we only remove markers, not users - return true; - } - } - return false; } - /* ********** IGmapService Methods ********************************* */ - @Override - public Long getDefaultContentIdBySignature(String toolSignature) { - Long toolContentId = null; - toolContentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); - if (toolContentId == null) { - String error = "Could not retrieve default content id for this tool"; - GmapService.logger.error(error); - throw new GmapException(error); - } - return toolContentId; - } - - @Override - public Gmap getDefaultContent() { - Long defaultContentID = getDefaultContentIdBySignature(GmapConstants.TOOL_SIGNATURE); - Gmap defaultContent = getGmapByContentId(defaultContentID); - if (defaultContent == null) { - String error = "Could not retrieve default content record for this tool"; - GmapService.logger.error(error); - throw new GmapException(error); - } - return defaultContent; - } - - @Override - public Gmap copyDefaultContent(Long newContentID) { - - if (newContentID == null) { - String error = "Cannot copy the Gmap tools default content: + " + "newContentID is null"; - GmapService.logger.error(error); - throw new GmapException(error); - } - - Gmap defaultContent = getDefaultContent(); - // create new gmap using the newContentID - Gmap newContent = new Gmap(); - newContent = Gmap.newInstance(defaultContent, newContentID); - gmapDAO.saveOrUpdate(newContent); - return newContent; - } - - @Override - public Gmap getGmapByContentId(Long toolContentID) { - Gmap gmap = gmapDAO.getByContentId(toolContentID); - if (gmap == null) { - GmapService.logger.debug("Could not find the content with toolContentID:" + toolContentID); - } - return gmap; - } - - @Override - public GmapSession getSessionBySessionId(Long toolSessionId) { - GmapSession gmapSession = gmapSessionDAO.getBySessionId(toolSessionId); - if (gmapSession == null) { - GmapService.logger.debug("Could not find the gmap session with toolSessionID:" + toolSessionId); - } - return gmapSession; - } - - @Override - public GmapUser getUserByUserIdAndSessionId(Long userId, Long toolSessionId) { - return gmapUserDAO.getByUserIdAndSessionId(userId, toolSessionId); - } - - public GmapUser getUserByLoginNameAndSessionId(String loginName, Long toolSessionId) { - return gmapUserDAO.getByLoginNameAndSessionId(loginName, toolSessionId); - } - - @Override - public GmapUser getUserByUID(Long uid) { - return gmapUserDAO.getByUID(uid); - } - - @Override - public void saveOrUpdateGmap(Gmap gmap) { - gmapDAO.saveOrUpdate(gmap); - } - - @Override - public void saveOrUpdateGmapMarker(GmapMarker gmapMarker) { - gmapMarkerDAO.saveOrUpdate(gmapMarker); - } - - @Override - public List getGmapMarkersBySessionId(Long sessionId) { - return gmapMarkerDAO.getByToolSessionId(sessionId); - } - - @Override - public void saveOrUpdateGmapSession(GmapSession gmapSession) { - gmapSessionDAO.saveOrUpdate(gmapSession); - } - - @Override - public void saveOrUpdateGmapUser(GmapUser gmapUser) { - gmapUserDAO.saveOrUpdate(gmapUser); - } - - @Override - public GmapUser createGmapUser(UserDTO user, GmapSession gmapSession) { - GmapUser gmapUser = new GmapUser(user, gmapSession); - saveOrUpdateGmapUser(gmapUser); - return gmapUser; - } - - @Override - public GmapConfigItem getConfigItem(String key) { - return gmapConfigItemDAO.getConfigItemByKey(key); - } - - @Override - public void saveOrUpdateGmapConfigItem(GmapConfigItem item) { - gmapConfigItemDAO.saveOrUpdate(item); - } - - /* - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.gmap.service.IGmapService#updateMarkerListFromXML(java.lang.String, - * org.lamsfoundation.lams.tool.gmap.model.Gmap, org.lamsfoundation.lams.tool.gmap.model.GmapUser, boolean, - * org.lamsfoundation.lams.tool.gmap.model.GmapSession) - */ - @Override - public void updateMarkerListFromXML(String markerXML, Gmap gmap, GmapUser guser, boolean isAuthored, - GmapSession session) { - - if ((markerXML != null) && !markerXML.equals("")) { - try { - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - DocumentBuilder db = dbf.newDocumentBuilder(); - Document document = db.parse(new InputSource(new StringReader(markerXML))); - NodeList list = document.getElementsByTagName("marker"); - - for (int i = 0; i < list.getLength(); i++) { - NamedNodeMap markerNode = list.item(i).getAttributes(); - - Long uid = Long.parseLong(markerNode.getNamedItem("markerUID").getNodeValue()); - String markerTitle = markerNode.getNamedItem("title").getNodeValue(); - String infoMessage = markerNode.getNamedItem("infoMessage").getNodeValue(); - Double latitude = Double.parseDouble(markerNode.getNamedItem("latitude").getNodeValue()); - Double longitude = Double.parseDouble(markerNode.getNamedItem("longitude").getNodeValue()); - - String markerState = markerNode.getNamedItem("state").getNodeValue(); - - if (markerState.equals("remove")) { - gmap.removeMarker(uid); - continue; - } - - GmapMarker marker = null; - if (markerState.equals("save")) { - marker = new GmapMarker(); - marker.setCreatedBy(guser); - marker.setCreated(new Date()); - marker.setAuthored(isAuthored); - } else if (markerState.equals("update")) { - marker = gmap.getMarkerByUid(uid); - } - - marker.setGmapSession(session); - marker.setTitle(markerTitle); - marker.setInfoWindowMessage(infoMessage); - marker.setLatitude(latitude); - marker.setLongitude(longitude); - marker.setGmap(gmap); - marker.setUpdated(new Date()); - marker.setUpdatedBy(guser); - saveOrUpdateGmapMarker(marker); - } - } catch (Exception e) { - // TODO: improve error handling - GmapService.logger.error("Could not get marker xml object to update", e); - throw new GmapException("Could not get marker xml object to update", e); - } - } else { - GmapService.logger.debug("MarkerXML string was empty"); - } - } - - @Override - public boolean isGroupedActivity(long toolContentID) { - return toolService.isGroupedActivity(toolContentID); - } - - @Override - public void auditLogStartEditingActivityInMonitor(long toolContentID) { - toolService.auditLogStartEditingActivityInMonitor(toolContentID); - } - - @Override - public List getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, - String searchString, boolean getNotebookEntries) { - return gmapUserDAO.getUsersForTablesorter(sessionId, page, size, sorting, searchString, getNotebookEntries, - coreNotebookService, userManagementService); - } - - - @Override - public int getCountUsersBySession(Long sessionId, String searchString) { - return gmapUserDAO.getCountUsersBySession(sessionId, searchString); - } - - // ========================================================================================= - /* ********** Used by Spring to "inject" the linked objects ************* */ - - public IGmapDAO getGmapDAO() { - return gmapDAO; - } - - public void setGmapDAO(IGmapDAO gmapDAO) { - this.gmapDAO = gmapDAO; - } - - public IToolContentHandler getGmapToolContentHandler() { - return gmapToolContentHandler; - } - - public void setGmapToolContentHandler(IToolContentHandler gmapToolContentHandler) { - this.gmapToolContentHandler = gmapToolContentHandler; - } - - public IGmapSessionDAO getGmapSessionDAO() { - return gmapSessionDAO; - } - - public void setGmapSessionDAO(IGmapSessionDAO sessionDAO) { - gmapSessionDAO = sessionDAO; - } - - public ILamsToolService getToolService() { - return toolService; - } - - public void setToolService(ILamsToolService toolService) { - this.toolService = toolService; - } - - public IGmapUserDAO getGmapUserDAO() { - return gmapUserDAO; - } - - public void setGmapUserDAO(IGmapUserDAO userDAO) { - gmapUserDAO = userDAO; - } - - public IExportToolContentService getExportContentService() { - return exportContentService; - } - - public void setExportContentService(IExportToolContentService exportContentService) { - this.exportContentService = exportContentService; - } - - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - - public IUserManagementService getUserManagementService() { - return userManagementService; - } - - public void setUserManagementService(IUserManagementService userManagementService) { - this.userManagementService = userManagementService; - } - - public IGmapMarkerDAO getGmapMarkerDAO() { - return gmapMarkerDAO; - } - - public void setGmapMarkerDAO(IGmapMarkerDAO gmapMarkerDAO) { - this.gmapMarkerDAO = gmapMarkerDAO; - } - - public IGmapConfigItemDAO getGmapConfigItemDAO() { - return gmapConfigItemDAO; - } - - public void setGmapConfigItemDAO(IGmapConfigItemDAO gmapConfigItemDAO) { - this.gmapConfigItemDAO = gmapConfigItemDAO; - } - - @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - /** - * @param notebookEntry - */ - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override - public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { + public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) { return null; } - - @Override - public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) { - GmapUser learner = getUserByUserIdAndSessionId(learnerId, toolSessionId); - if (learner == null) { - return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_NOT_ATTEMPTED, null, null); - } - - Date startDate = null; - Date endDate = null; - List markers = getGmapMarkersBySessionId(toolSessionId); - for ( GmapMarker marker : markers ) { - Date createdDate = marker.getCreated(); - if ( marker.getCreatedBy().getUserId() == learnerId && createdDate != null ) { - if ( startDate == null || createdDate.before(startDate) ) - startDate = createdDate; - if ( endDate == null || createdDate.after(endDate) ) - endDate = createdDate; - } - } - - if (learner.isFinishedActivity()) - return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, startDate, endDate); - else - return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, startDate, null); - } } Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapServiceProxy.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AdminAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/controller/AuthoringController.java =================================================================== diff -u --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/controller/AuthoringController.java (revision 0) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/controller/AuthoringController.java (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -0,0 +1,37 @@ +/**************************************************************** + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * 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. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.tool.gmap.web.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/authoring") +public class AuthoringController { + @RequestMapping("") + public String execute() { + return "index"; + } +} \ No newline at end of file Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/controller/LearningController.java =================================================================== diff -u --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/controller/LearningController.java (revision 0) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/controller/LearningController.java (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -0,0 +1,57 @@ +/**************************************************************** + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * 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. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.tool.gmap.web.controller; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.lamsfoundation.lams.tool.service.ILamsToolService; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/learning") +public class LearningController { + + @Autowired + @Qualifier("lamsToolService") + private ILamsToolService toolService; + + @RequestMapping("") + public String execute(HttpServletRequest request) { + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); + + String finishURL = toolService.completeToolSession(toolSessionId, user.getUserID().longValue()); + return "redirect:" + finishURL; + } +} \ No newline at end of file Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/controller/MonitoringController.java =================================================================== diff -u --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/controller/MonitoringController.java (revision 0) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/controller/MonitoringController.java (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -0,0 +1,40 @@ +/**************************************************************** + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * 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. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +package org.lamsfoundation.lams.tool.gmap.web.controller; + +import java.io.IOException; + +import javax.servlet.ServletException; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/monitoring") +public class MonitoringController { + @RequestMapping("") + public String execute() throws IOException, ServletException { + return "index"; + } +} \ No newline at end of file Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AdminForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/MonitoringForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/403.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/404.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/web/WEB-INF/applicationContext.xml =================================================================== diff -u --- lams_tool_gmap/web/WEB-INF/applicationContext.xml (revision 0) +++ lams_tool_gmap/web/WEB-INF/applicationContext.xml (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -0,0 +1,7 @@ + + + + \ No newline at end of file Index: lams_tool_gmap/web/WEB-INF/spring-servlet.xml =================================================================== diff -u --- lams_tool_gmap/web/WEB-INF/spring-servlet.xml (revision 0) +++ lams_tool_gmap/web/WEB-INF/spring-servlet.xml (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -0,0 +1,17 @@ + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/struts-config.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/AdvancedAccordian.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/Alert.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/Arrow.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/Comments.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/CommentsAuthor.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/Date.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/FileUpload.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/Head.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/ImgButtonWrapper.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/LeaderDisplay.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/Page.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/Rating.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/SimplePanel.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/TSTable.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/Tab.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/TabBody.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/TabBodyArea.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/TabBodys.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/Tabs.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/TextSearch.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/WaitingSpinner.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/headItems.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tiles-defs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/jstl/c.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/jstl/fmt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/jstl/fn.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/jstl/permittedTaglibs.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/jstl/scriptfree.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/jstl/x.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/struts/struts-bean-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/struts/struts-bean.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/struts/struts-html-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/struts/struts-html.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/struts/struts-logic-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/struts/struts-logic.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/struts/struts-nested.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/struts/struts-tiles-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tlds/struts/struts-tiles.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/validation.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/validator-rules.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/web/WEB-INF/web.xml =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 --- lams_tool_gmap/web/WEB-INF/web.xml (.../web.xml) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_gmap/web/WEB-INF/web.xml (.../web.xml) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -3,16 +3,12 @@ - - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.gmap.ApplicationResources - + Gmap + + Gmap tool + - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml - - locatorFactorySelector classpath:/org/lamsfoundation/lams/beanRefContext.xml @@ -21,300 +17,45 @@ context.central + + + org.springframework.web.context.ContextLoaderListener + + + SystemSessionFilter org.lamsfoundation.lams.web.session.SystemSessionFilter - - hibernateFilter - - org.springframework.orm.hibernate5.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - SystemSessionFilter /* - - hibernateFilter - /* - - - LocaleFilter - /* - - - - org.springframework.web.context.ContextLoaderListener - - - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 2 - - - validate - true - - 1 + spring + + org.springframework.web.servlet.DispatcherServlet + + 1 - - - - Connector - net.fckeditor.connector.ConnectorServlet - - baseDir - /UserFiles/ - - - debug - false - - 1 - - - - - Attachment Download - Attachment Download - download - org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - gmapToolContentHandler - - 3 - - - action + spring *.do - - - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector - - - - download - /download/* - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - - - - - - - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld - - - tags-html - /WEB-INF/tlds/struts/struts-html.tld - - - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld - - - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld - - - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld - - - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld - - - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld - - - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - - - tags-permittedTaglibs - /WEB-INF/tlds/jstl/permittedTaglibs.tld - - - tags-scriptfree - /WEB-INF/tlds/jstl/scriptfree.tld - - - - - - tags-lams - /WEB-INF/tlds/lams/lams.tld - - - - - - Secure Content + Public content /* GET POST - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - - - - Authoring content - /pages/authoring/* - /authoring.do - GET - POST - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /pages/monitoring/* - /monitoring.do - GET - POST - - - MONITOR - SYSADMIN - - - - - - Admin content - /pages/admin/* - /lagmap10admin.do - GET - POST - - - SYSADMIN - - - - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - - - - - Student - LEARNER - - - - Authors Learning Designs - AUTHOR - - - - Member of Staff - MONITOR - - - - Group Manager - GROUP MANAGER - - - Group Administrator - GROUP ADMIN - - - LAMS System Adminstrator - SYSADMIN - \ No newline at end of file Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/common/definelaterheader.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/common/empty.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/common/footer.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/common/header.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/common/learnerheader.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/common/mapLegend.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/common/message.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/common/taglibs.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/error.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/web/images/blue_Marker.png =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 Binary files differ Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/images/icon_gmap.ai'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/images/icon_gmap_16.svg'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/web/images/paleblue_Marker.png =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 Binary files differ Index: lams_tool_gmap/web/images/red_Marker.png =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 Binary files differ Index: lams_tool_gmap/web/images/tree_closed.gif =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 Binary files differ Index: lams_tool_gmap/web/images/tree_open.gif =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 Binary files differ Index: lams_tool_gmap/web/images/yellow_Marker.png =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 Binary files differ Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/includes/javascript/authoring.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/includes/javascript/monitoring.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/includes/jsp/mapFunctions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/web/index.jsp =================================================================== diff -u --- lams_tool_gmap/web/index.jsp (revision 0) +++ lams_tool_gmap/web/index.jsp (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) @@ -0,0 +1,5 @@ + + + This tool is not supported anymore. + + \ No newline at end of file Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/layouts/defaultLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/layouts/learningLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/layouts/tabLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/admin/config.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/authoring/advanced.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/authoring/authoring.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/authoring/basic.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/authoring/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/learning/defineLater.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/learning/gmap.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/learning/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/learning/notebook.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/learning/parts/finishButton.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/monitoring/advancedOptions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/monitoring/editActivity.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/monitoring/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/monitoring/monitoring.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/monitoring/statistics.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 910f7a30fc4dc1b47e8b3e2df5927c64df977a45 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/monitoring/summary.jsp'. Fisheye: No comparison available. Pass `N' to diff?