Index: tool_adapters/moodle/lams_tool_mdlforum/.classpath =================================================================== diff -u -r53be6dd4f6e5b13e1b41cbc22f3648640a91f4f4 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/.classpath (.../.classpath) (revision 53be6dd4f6e5b13e1b41cbc22f3648640a91f4f4) +++ tool_adapters/moodle/lams_tool_mdlforum/.classpath (.../.classpath) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -4,12 +4,12 @@ - - - - - - + + + + + + Index: tool_adapters/moodle/lams_tool_mdlforum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdfrum/model/MdlForum.hbm.xml =================================================================== diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdfrum/model/MdlForum.hbm.xml (.../MdlForum.hbm.xml) (revision 368d06879c2737658c7d8e7a45d1476a0742d366) +++ tool_adapters/moodle/lams_tool_mdlforum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdfrum/model/MdlForum.hbm.xml (.../MdlForum.hbm.xml) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -113,6 +113,15 @@ length="255" /> + + @@ -99,7 +99,7 @@ > Index: tool_adapters/moodle/lams_tool_mdlforum/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rbc07f151775831ad6733c4a15a589ecaaa677357 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision bc07f151775831ad6733c4a15a589ecaaa677357) +++ tool_adapters/moodle/lams_tool_mdlforum/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -16,6 +16,7 @@ admin.extServerUrl =External server url admin.formError =There was an error processing the form, please ensure both fields are filled and click save again. admin.return =Return to maintain LAMS +admin.enableForIntegratedServers =Enable/disable servers for this Tool Adapter monitor.sessions =Sessions button.save =Save pageTitle.learning =Online Moodle Forum Index: tool_adapters/moodle/lams_tool_mdlforum/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rbc07f151775831ad6733c4a15a589ecaaa677357 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision bc07f151775831ad6733c4a15a589ecaaa677357) +++ tool_adapters/moodle/lams_tool_mdlforum/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -11,11 +11,9 @@ activity.description =Moodle Forum Tool pageTitle.authoring =Moodle Forum Authoring pageTitle.admin =Moodle Forum Configuration -admin.extToolAdapterServletUrl =External tool adapter servlet URL -admin.extServerId =External server id mapping -admin.extServerUrl =External server url admin.formError =There was an error processing the form, please ensure both fields are filled and click save again. admin.return =Return to maintain LAMS +admin.enableForIntegratedServers =Enable/disable servers for this Tool Adapter monitor.sessions =Sessions button.save =Save pageTitle.learning =Online Moodle Forum Index: tool_adapters/moodle/lams_tool_mdlforum/db/sql/create_lams_tool_mdlForum.sql =================================================================== diff -u -r512f291d278e5e3c124c9bcb34116562444ae171 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/db/sql/create_lams_tool_mdlForum.sql (.../create_lams_tool_mdlForum.sql) (revision 512f291d278e5e3c124c9bcb34116562444ae171) +++ tool_adapters/moodle/lams_tool_mdlforum/db/sql/create_lams_tool_mdlForum.sql (.../create_lams_tool_mdlForum.sql) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -1,35 +1,15 @@ -- CVS ID: $Id$ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_mdfrum10_configuration; drop table if exists tl_mdfrum10_mdlforum; drop table if exists tl_mdfrum10_session; drop table if exists tl_mdfrum10_user; -create table tl_mdfrum10_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))TYPE=InnoDB; -create table tl_mdfrum10_mdlforum (uid bigint not null auto_increment, create_date datetime, update_date datetime, define_later bit, content_in_use bit, run_offline bit, tool_content_id bigint, ext_tool_content_id bigint, ext_user_name varchar(255), ext_course_id varchar(255), ext_section varchar(255), primary key (uid))TYPE=InnoDB; +create table tl_mdfrum10_mdlforum (uid bigint not null auto_increment, create_date datetime, update_date datetime, define_later bit, content_in_use bit, run_offline bit, tool_content_id bigint, ext_tool_content_id bigint, ext_user_name varchar(255), ext_lms_id varchar(255), ext_course_id varchar(255), ext_section varchar(255), primary key (uid))TYPE=InnoDB; create table tl_mdfrum10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, ext_session_id bigint, session_name varchar(250), mdlforum_uid bigint, primary key (uid))TYPE=InnoDB; create table tl_mdfrum10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, mdlforum_session_uid bigint, entry_uid bigint, primary key (uid))TYPE=InnoDB; alter table tl_mdfrum10_session add index IDX_mdlforum_uid (mdlforum_uid), add constraint FK_mdlforum_uid foreign key (mdlforum_uid) references tl_mdfrum10_mdlforum (uid); alter table tl_mdfrum10_user add index IDX_mdlforum_session_uid (mdlforum_session_uid), add constraint FK_mdlforum_session_uid foreign key (mdlforum_session_uid) references tl_mdfrum10_session (uid); -INSERT INTO tl_mdfrum10_configuration ( - config_key, - config_value -) -VALUES( - "toolAdapterServlet", - "http://localhost:8000/lams2conf/tooladapter_mdfrum10" -); - -INSERT INTO tl_mdfrum10_configuration ( - config_key, - config_value -) -VALUES( - "extServerUrl", - "http://localhost/moodle19/" -); - INSERT INTO tl_mdfrum10_mdlforum ( tool_content_id, ext_tool_content_id, Fisheye: Tag 40406afc67655d56953c6cef8b9dd7ac61c3f90e refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/dao/IMdlForumConfigItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 40406afc67655d56953c6cef8b9dd7ac61c3f90e refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/dao/hibernate/MdlForumConfigItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/mdlForumApplicationContext.xml =================================================================== diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/mdlForumApplicationContext.xml (.../mdlForumApplicationContext.xml) (revision b6544cfe682554653a9590c0bf74ed52186d71ff) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/mdlForumApplicationContext.xml (.../mdlForumApplicationContext.xml) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -19,10 +19,9 @@ - - + @@ -57,10 +56,6 @@ - - - - Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/model/MdlForum.java =================================================================== diff -u -r08c312af0856bca0a580ddc8494c34bb5bbc4624 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/model/MdlForum.java (.../MdlForum.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/model/MdlForum.java (.../MdlForum.java) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -49,6 +49,7 @@ private static final String CUSTOM_CSV_MAP_PARAM_USER = "user"; private static final String CUSTOM_CSV_MAP_PARAM_COURSE = "course"; private static final String CUSTOM_CSV_MAP_PARAM_SECTION = "section"; + private static final String CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID = "extlmsid"; // Fields /** @@ -66,6 +67,7 @@ private String extUsername; private String extCourseId; private String extSection; + private String extLmsId; //*********** NON Persistent fields private IToolContentHandler toolContentHandler; @@ -227,9 +229,17 @@ public void setExtSection(String extSection) { this.extSection = extSection; } + + /** + * @hibernate.property column="ext_lms_id" length="255" + * + */ + public String getExtLmsId() { + return extLmsId; + } - public static long getSerialVersionUID() { - return serialVersionUID; + public void setExtLmsId(String extLmsId) { + this.extLmsId = extLmsId; } /** @@ -317,5 +327,6 @@ this.extUsername = params.get(CUSTOM_CSV_MAP_PARAM_USER); this.extCourseId = params.get(CUSTOM_CSV_MAP_PARAM_COURSE); this.extSection = params.get(CUSTOM_CSV_MAP_PARAM_SECTION); + this.extLmsId = params.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID); } } Fisheye: Tag 40406afc67655d56953c6cef8b9dd7ac61c3f90e refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/model/MdlForumConfigItem.java'. Fisheye: No comparison available. Pass `N' to diff? Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/service/IMdlForumService.java =================================================================== diff -u -r08c312af0856bca0a580ddc8494c34bb5bbc4624 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/service/IMdlForumService.java (.../IMdlForumService.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/service/IMdlForumService.java (.../IMdlForumService.java) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -25,10 +25,11 @@ package org.lamsfoundation.lams.tool.mdfrum.service; import java.util.HashMap; +import java.util.List; import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForum; -import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumConfigItem; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumSession; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumUser; import org.lamsfoundation.lams.tool.mdfrum.util.MdlForumException; @@ -96,22 +97,7 @@ public void saveOrUpdateMdlForumSession(MdlForumSession mdlForumSession); /** - * Get the mdlForum config item by key * - * @param key - * @return - */ - public MdlForumConfigItem getConfigItem(String key); - - /** - * Save a mdl configItem - * - * @param item - */ - public void saveOrUpdateMdlForumConfigItem(MdlForumConfigItem item); - - /** - * * @param userId * @param toolSessionId * @return @@ -125,12 +111,6 @@ */ public MdlForumUser getUserByUID(Long uid); - /** - * Gets the external organisation map for this tool adapter - * - * @return - */ - public ExtServerOrgMap getExtServerOrgMap(); /** * Creates a hash for talking to the external server @@ -205,4 +185,29 @@ * @return */ public HashMap getRequiredExtServletParams(String customCSV); + + /** + * Gets a list of all external servers + * @return + */ + public List getExtServerList(); + + /** + * Gets a list of servers mapped to this tool adapter + * @return + */ + public List getMappedServers(); + + /** + * Save all the mapped servers + * @param mappableServers + */ + public void saveServerMappings(String[] mappableServers); + + /** + * Gets an external server url given the extLmsId + * @param extLmsId + * @return + */ + public String getExtServerUrl(String extLmsId); } Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/service/MdlForumService.java =================================================================== diff -u -r08c312af0856bca0a580ddc8494c34bb5bbc4624 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/service/MdlForumService.java (.../MdlForumService.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/service/MdlForumService.java (.../MdlForumService.java) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -27,26 +27,19 @@ import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.DataInputStream; -import java.io.DataOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; import java.net.URLEncoder; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.Hashtable; import java.util.List; +import java.util.Set; import java.util.SortedMap; -import java.util.TreeMap; import org.apache.log4j.Logger; import org.lamsfoundation.lams.contentrepository.AccessDeniedException; @@ -59,42 +52,39 @@ import org.lamsfoundation.lams.contentrepository.service.RepositoryProxy; import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.integration.UserInfoFetchException; import org.lamsfoundation.lams.integration.service.IIntegrationService; import org.lamsfoundation.lams.learning.service.ILearnerService; 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.service.ICoreNotebookService; -import org.lamsfoundation.lams.tool.IToolVO; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolAdapterContentManager; import org.lamsfoundation.lams.tool.ToolContentImport102Manager; 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.mdfrum.dao.IMdlForumConfigItemDAO; +import org.lamsfoundation.lams.tool.exception.DataMissingException; +import org.lamsfoundation.lams.tool.exception.SessionDataExistsException; +import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.mdfrum.dao.IMdlForumDAO; import org.lamsfoundation.lams.tool.mdfrum.dao.IMdlForumSessionDAO; import org.lamsfoundation.lams.tool.mdfrum.dao.IMdlForumUserDAO; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForum; -import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumConfigItem; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumSession; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumUser; import org.lamsfoundation.lams.tool.mdfrum.util.MdlForumConstants; import org.lamsfoundation.lams.tool.mdfrum.util.MdlForumException; import org.lamsfoundation.lams.tool.mdfrum.util.MdlForumToolContentHandler; import org.lamsfoundation.lams.tool.mdfrum.util.WebUtility; -import org.lamsfoundation.lams.tool.exception.DataMissingException; -import org.lamsfoundation.lams.tool.exception.SessionDataExistsException; -import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.HashUtil; import org.lamsfoundation.lams.util.audit.IAuditService; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; /** * An implementation of the IMdlForumService interface. @@ -111,6 +101,7 @@ public static final String CUSTOM_CSV_MAP_PARAM_USER = "user"; public static final String CUSTOM_CSV_MAP_PARAM_COURSE = "course"; public static final String CUSTOM_CSV_MAP_PARAM_SECTION = "section"; + public static final String CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID = "extlmsid"; public static final String EXT_SERVER_PARAM_USER = "un"; public static final String EXT_SERVER_PARAM_COURSE = "cs"; @@ -122,7 +113,7 @@ public static final String EXT_SERVER_PARAM_UPLOAD_FILE = "upload_file"; public static final String EXT_SERVER_PARAM_OUTPUT_NAME = "oname"; - private static final int EXPECTED_CSV_SIZE = 3; + private static final int EXPECTED_CSV_SIZE = 4; private static final String EXPECTED_CSV_FORM = "user,course"; private IMdlForumDAO mdlForumDAO = null; @@ -131,8 +122,6 @@ private IMdlForumUserDAO mdlForumUserDAO = null; - private IMdlForumConfigItemDAO mdlForumConfigItemDAO = null; - private ILearnerService learnerService; private ILamsToolService toolService; @@ -192,8 +181,7 @@ */ public Long copyExternalToolContent(HashMap params) throws ToolException, Exception { - String cloneServletUrl = mdlForumConfigItemDAO.getConfigItemByKey(MdlForumConfigItem.KEY_EXTERNAL_TOOL_SERVLET) - .getConfigValue(); + String cloneServletUrl = getExtToolAdapterServletUrl(params.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)); // add the method to the params params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_CLONE); @@ -216,11 +204,14 @@ params.put(EXT_SERVER_PARAM_COURSE, paramsCSV.get(CUSTOM_CSV_MAP_PARAM_COURSE)); params.put(EXT_SERVER_PARAM_USER, paramsCSV.get(CUSTOM_CSV_MAP_PARAM_USER)); params.put(EXT_SERVER_PARAM_SECTION, paramsCSV.get(CUSTOM_CSV_MAP_PARAM_SECTION)); + params.put(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID, paramsCSV.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)); String timestamp = Long.toString(new Date().getTime()); params.put(EXT_SERVER_PARAM_TIMESTAMP, timestamp); - ExtServerOrgMap serverMap = this.getExtServerOrgMap(); + ExtServerOrgMap serverMap = getExtServerOrgMap(paramsCSV.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)); + + this.getExtServerOrgMap(paramsCSV.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)); String hash = hash(serverMap, paramsCSV.get(CUSTOM_CSV_MAP_PARAM_USER), timestamp); params.put(EXT_SERVER_PARAM_HASH, hash); @@ -232,11 +223,12 @@ params.put(EXT_SERVER_PARAM_USER, mdlforum.getExtUsername()); params.put(EXT_SERVER_PARAM_COURSE, mdlforum.getExtCourseId()); params.put(EXT_SERVER_PARAM_SECTION, mdlforum.getExtSection()); + params.put(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID, mdlforum.getExtLmsId()); String timestamp = Long.toString(new Date().getTime()); params.put(EXT_SERVER_PARAM_TIMESTAMP, timestamp); - ExtServerOrgMap serverMap = this.getExtServerOrgMap(); + ExtServerOrgMap serverMap = getExtServerOrgMap(mdlforum.getExtLmsId()); String hash = hash(serverMap, mdlforum.getExtUsername(), timestamp); params.put(EXT_SERVER_PARAM_HASH, hash); @@ -253,6 +245,7 @@ map.put(CUSTOM_CSV_MAP_PARAM_USER, split[0]); map.put(CUSTOM_CSV_MAP_PARAM_COURSE, split[1]); map.put(CUSTOM_CSV_MAP_PARAM_SECTION, split[2]); + map.put(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID, split[3]); return map; } else { return null; @@ -262,13 +255,12 @@ public int getExternalToolOutputInt(String outputName, MdlForum mdlForum, Long userId, String extToolContentId, Long toolSessionId) { MdlForumUser user = this.getUserByUserIdAndSessionId(userId, toolSessionId); - ExtServerOrgMap extServerMap = getExtServerOrgMap(); + ExtServerOrgMap extServerMap = getExtServerOrgMap(mdlForum.getExtLmsId()); String extUserName = user.getLoginName().substring(extServerMap.getPrefix().length() + 1); try { - String outputServletUrl = mdlForumConfigItemDAO.getConfigItemByKey( - MdlForumConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String outputServletUrl = this.getExtToolAdapterServletUrl(mdlForum.getExtLmsId()); // setting the mdlForum username so the params are set up correctly mdlForum.setExtUsername(extUserName); @@ -287,6 +279,27 @@ } } + public String getExtServerUrl(String extLmsId) { + ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(extLmsId); + String ret = null; + if (serverMap != null) { + ret = serverMap.getServerUrl(); + } + return ret; + } + + public String getExtToolAdapterServletUrl(String extLmsId) { + String ret = getExtServerUrl(extLmsId); + if (ret != null) { + ret += MdlForumConstants.RELATIVE_SERVLET_URL; + } + return ret; + } + + public ExtServerOrgMap getExtServerOrgMap(String extLmsId) { + return integrationService.getExtServerOrgMap(extLmsId); + } + /** * Get the tool output for the given tool output names. * @@ -391,24 +404,6 @@ } MdlForum toContent = MdlForum.newInstance(fromContent, toContentId, mdlForumToolContentHandler); - // calling the external tool to copy it's content. - /* - try - { - - toContent.setExtToolContentId(copyExternalToolContent( - fromContent.getExtToolContentId(), - fromContent.getExtUsername(), - fromContent.getExtCourseId(), - fromContent.getExtCourseUrl() - )); - - } - catch(Exception e) - { - throw new ToolException("Failed to call external server to copy tool content" + e); - }*/ - mdlForumDAO.saveOrUpdate(toContent); } @@ -451,7 +446,7 @@ if ((fromContent == null) || fromContent.getExtToolContentId() == null) { // create the fromContent using the default tool content - fromContent = getDefaultContent(); + fromContent = getDefaultContent(params.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)); try { // notify the external server to create the default content params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, "0"); @@ -509,7 +504,6 @@ * @throws ToolException * if any other error occurs */ - public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { MdlForum mdlForum = mdlForumDAO.getByContentId(toolContentId); @@ -533,42 +527,45 @@ } } else { - URLConnection conn = null; try { // Create the directory to store the export file String toolPath = FileUtil.getFullPath(rootPath, toolContentId.toString()); FileUtil.createDirectory(toolPath); - String exportServletUrl = mdlForumConfigItemDAO.getConfigItemByKey( - MdlForumConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String exportServletUrl = getExtToolAdapterServletUrl(mdlForum.getExtLmsId()); - // setting these to arbitrary values since they are only used to construct the hash + if (exportServletUrl != null) { + // setting these to arbitrary values since they are only used to construct the hash + mdlForum.setExtCourseId("extCourse"); + mdlForum.setExtSection("0"); + mdlForum.setExtUsername("authUser"); + HashMap params = this.getRequiredExtServletParams(mdlForum); + params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT); + params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, mdlForum.getExtToolContentId().toString()); - mdlForum.setExtCourseId("extCourse"); - mdlForum.setExtSection("0"); - mdlForum.setExtUsername("authUser"); - HashMap params = this.getRequiredExtServletParams(mdlForum); - params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT); - params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, mdlForum.getExtToolContentId().toString()); + // Get the reponse stream from the external server (hopefully containing the export file + InputStream in = WebUtility.getResponseInputStreamFromExternalServer(exportServletUrl, params); - // Get the reponse stream from the external server (hopefully containing the export file - InputStream in = WebUtility.getResponseInputStreamFromExternalServer(exportServletUrl, params); + // Get the output stream to write the file for extport + OutputStream out = new BufferedOutputStream(new FileOutputStream(toolPath + "/ext_tool.txt")); - // Get the output stream to write the file for extport - OutputStream out = new BufferedOutputStream(new FileOutputStream(toolPath + "/ext_tool.txt")); + byte[] buffer = new byte[1024]; + int numRead; + long numWritten = 0; + while ((numRead = in.read(buffer)) != -1) { + out.write(buffer, 0, numRead); + numWritten += numRead; + } + logger.debug("Path to mdlForum export content: " + toolPath + "/ext_tool.txt"); - byte[] buffer = new byte[1024]; - int numRead; - long numWritten = 0; - while ((numRead = in.read(buffer)) != -1) { - out.write(buffer, 0, numRead); - numWritten += numRead; + out.flush(); + out.close(); + in.close(); + } else { + exportContentService.exportToolContent(toolContentId, mdlForum, mdlForumToolContentHandler, + rootPath); } - logger.debug("Path to mdlForum export content: " + toolPath + "/ext_tool.txt"); - out.flush(); - out.close(); - in.close(); } catch (Exception e) { logger.error("Problem exporting data from external .LRN servlet", e); } @@ -584,13 +581,6 @@ } - public ExtServerOrgMap getExtServerOrgMap() { - if (integrationService == null) - integrationService = getIntegrationService(); - IToolVO tool = toolService.getToolBySignature(MdlForumConstants.TOOL_SIGNATURE); - return integrationService.getExtServerOrgMap(tool.getExtLmsId()); - } - /** * Import the XML fragment for the tool's content, along with any files * needed for the content. @@ -609,9 +599,6 @@ try { - String importServletUrl = mdlForumConfigItemDAO.getConfigItemByKey( - MdlForumConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); - if (customCSV == null) { logger.error("Could not retrieve customCSV required for importing tool adapter tool. CustomCSV: " + customCSV); @@ -620,6 +607,9 @@ + customCSV); } + HashMap customCSVMap = decodeCustomCSV(customCSV); + String importServletUrl = getExtToolAdapterServletUrl(customCSVMap.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)); + HashMap params = getRequiredExtServletParams(customCSV); params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_IMPORT); @@ -675,17 +665,13 @@ } public MdlForum getDefaultContent() { - /* - Long defaultContentID = getDefaultContentIdBySignature(MdlForumConstants.TOOL_SIGNATURE); - MdlForum defaultContent = getMdlForumByContentId(defaultContentID); - if (defaultContent == null) { - String error = "Could not retrieve default content record for this tool"; - logger.error(error); - throw new MdlForumException(error); - } + MdlForum defaultContent = new MdlForum(); return defaultContent; - */ + } + + public MdlForum getDefaultContent(String extLmsId) { MdlForum defaultContent = new MdlForum(); + defaultContent.setExtLmsId(extLmsId); return defaultContent; } @@ -705,6 +691,59 @@ return newContent; } + @SuppressWarnings("unchecked") + public List getExtServerList() { + if (integrationService.getAllExtServerOrgMaps() != null) { + return (List) integrationService.getAllExtServerOrgMaps(); + } else { + return null; + } + + } + + public List getMappedServers() { + return integrationService.getMappedServers(MdlForumConstants.TOOL_SIGNATURE); + } + + public void saveServerMappings(String[] mappedServers) { + Tool tool = toolService.getPersistToolBySignature(MdlForumConstants.TOOL_SIGNATURE); + + Set mappedAdapterServers = new HashSet(); + + List alreadyMapped = getMappedServers(); + + if (tool != null) { + if (mappedServers != null) { + + for (int i = 0; i < mappedServers.length; i++) { + + ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(mappedServers[i]); + + if (serverMap != null) { + + ExtServerToolAdapterMap serverToolMap = integrationService.getMappedServer(serverMap + .getServerid(), MdlForumConstants.TOOL_SIGNATURE); + + if (serverToolMap == null) { + serverToolMap = new ExtServerToolAdapterMap(tool, serverMap); + integrationService.saveExtServerToolAdapterMap(serverToolMap); + } + mappedAdapterServers.add(serverToolMap); + } + } + } + } + + for (ExtServerToolAdapterMap map : alreadyMapped) { + if (!mappedAdapterServers.contains(map)) { + integrationService.deleteExtServerToolAdapterMap(map); + } + } + + //tool.setMappedServers(mappedAdapterServers); + //toolService.saveOrUpdateTool(tool); + } + public MdlForum getMdlForumByContentId(Long toolContentID) { MdlForum mdlForum = (MdlForum) mdlForumDAO.getByContentId(toolContentID); if (mdlForum == null) { @@ -713,14 +752,6 @@ return mdlForum; } - public MdlForumConfigItem getConfigItem(String key) { - return mdlForumConfigItemDAO.getConfigItemByKey(key); - } - - public void saveOrUpdateMdlForumConfigItem(MdlForumConfigItem item) { - mdlForumConfigItemDAO.saveOrUpdate(item); - } - public MdlForumSession getSessionBySessionId(Long toolSessionId) { MdlForumSession mdlForumSession = mdlForumSessionDAO.getBySessionId(toolSessionId); if (mdlForumSession == null) { @@ -850,14 +881,6 @@ this.mdlForumDAO = mdlForumDAO; } - public IMdlForumConfigItemDAO getMdlForumConfigItemDAO() { - return mdlForumConfigItemDAO; - } - - public void setMdlForumConfigItemDAO(IMdlForumConfigItemDAO mdlForumConfigItemDAO) { - this.mdlForumConfigItemDAO = mdlForumConfigItemDAO; - } - public IToolContentHandler getMdlForumToolContentHandler() { return mdlForumToolContentHandler; } @@ -930,29 +953,8 @@ * * @return */ - public IIntegrationService getIntegrationService() { - - if (integrationService == null) { - String contexts[] = { "/org/lamsfoundation/lams/applicationContext.xml", - "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", - "/org/lamsfoundation/lams/toolApplicationContext.xml", - "/org/lamsfoundation/lams/integrationContext.xml", - "/org/lamsfoundation/lams/learning/learningApplicationContext.xml", - "/org/lamsfoundation/lams/contentrepository/applicationContext.xml", - "/org/lamsfoundation/lams/tool/mdfrum/mdlForumApplicationContext.xml", - "/org/lamsfoundation/lams/commonContext.xml" }; - - ApplicationContext context = new ClassPathXmlApplicationContext(contexts); - - if (context == null) - throw new MdlForumException( - "Unable to access application context. Cannot create integration service object."); - - IIntegrationService service = (IIntegrationService) context.getBean("integrationService"); - return service; - } else { - return integrationService; - } + public IIntegrationService integrationService() { + return integrationService; } public void setIntegrationService(IIntegrationService integrationService) { Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/MdlForumConstants.java =================================================================== diff -u -r08c312af0856bca0a580ddc8494c34bb5bbc4624 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/MdlForumConstants.java (.../MdlForumConstants.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/MdlForumConstants.java (.../MdlForumConstants.java) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -47,4 +47,6 @@ public static final String PARAM_PARENT_PAGE = "parentPage"; static final String FILTER_REPLACE_TEXT = "***"; + + public static final String RELATIVE_SERVLET_URL = "mod/lamstwo/tooladapter_forum.php"; } Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/WebUtility.java =================================================================== diff -u -r08c312af0856bca0a580ddc8494c34bb5bbc4624 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/WebUtility.java (.../WebUtility.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/WebUtility.java (.../WebUtility.java) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -37,6 +37,7 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.exception.ToolException; +import org.lamsfoundation.lams.tool.mdfrum.service.MdlForumService; public class WebUtility { static Logger logger = Logger.getLogger(WebUtility.class.getName()); @@ -147,7 +148,9 @@ urlStr += "?"; for (Entry entry : params.entrySet()) { - urlStr += "&" + entry.getKey() + "=" + entry.getValue(); + if (!entry.getKey().equals(MdlForumService.CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)) { + urlStr += "&" + entry.getKey() + "=" + entry.getValue(); + } } logger.debug("Making request to external servlet: " + urlStr); Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/AdminAction.java =================================================================== diff -u -ref5d878ea024a08abf9145bdbcf2b4222ee1ab50 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/AdminAction.java (.../AdminAction.java) (revision ef5d878ea024a08abf9145bdbcf2b4222ee1ab50) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/AdminAction.java (.../AdminAction.java) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -23,17 +23,19 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.mdfrum.web.actions; +import java.util.ArrayList; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.tool.Tool; -import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumConfigItem; +import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.tool.mdfrum.service.IMdlForumService; import org.lamsfoundation.lams.tool.mdfrum.service.MdlForumServiceProxy; -import org.lamsfoundation.lams.tool.mdfrum.util.MdlForumConstants; import org.lamsfoundation.lams.tool.mdfrum.web.forms.AdminForm; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.web.action.LamsDispatchAction; @@ -63,55 +65,58 @@ if (toolService == null) { toolService = mdlForumService.getToolService(); } - Tool tool = toolService.getPersistToolBySignature(MdlForumConstants.TOOL_SIGNATURE); - MdlForumConfigItem toolAdpServlet = mdlForumService.getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_TOOL_SERVLET); - if (toolAdpServlet != null) - adminForm.setToolAdapterServlet(toolAdpServlet.getConfigValue()); + // Get a list of possible external servers to enable this tool for + List serverList = mdlForumService.getExtServerList(); + List mappedServers = mdlForumService.getMappedServers(); + populateServerList(adminForm, serverList, mappedServers); - MdlForumConfigItem extServerConfig = mdlForumService.getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_SERVER_URL); - if (extServerConfig != null) - adminForm.setExtServerUrl(extServerConfig.getConfigValue()); - - if (tool != null && tool.getExtLmsId() != null) - adminForm.setServerIdMapping(tool.getExtLmsId()); - request.setAttribute("error", false); return mapping.findForward("config"); } + public void populateServerList(AdminForm adminForm, List serverList, + List mappedServers) { + + ArrayList mappableServers = new ArrayList(); + ArrayList mappedServersInForm = new ArrayList(); + + if (serverList != null) { + for (ExtServerOrgMap serverMap : serverList) { + mappableServers.add(serverMap.getServerid().toString()); + if (mappedServers != null) { + for (ExtServerToolAdapterMap mappedServer : mappedServers) { + if (mappedServer.getExtServer().getServerid().equals(serverMap.getServerid())) { + mappedServersInForm.add(serverMap.getServerid().toString()); + } + } + + } + } + } + adminForm.setMappableServers((String[]) mappableServers.toArray(new String[mappableServers.size()])); + adminForm.setMappedServers((String[]) mappedServersInForm.toArray(new String[mappedServersInForm.size()])); + + } + public ActionForward saveContent(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { AdminForm adminForm = (AdminForm) form; - if (adminForm.getToolAdapterServlet() != null && !adminForm.getToolAdapterServlet().equals("") - && adminForm.getServerIdMapping() != null && !adminForm.getServerIdMapping().equals("") - && adminForm.getExtServerUrl() != null && !adminForm.getExtServerUrl().equals("")) { - // set up mdlForumService - if (mdlForumService == null) { - mdlForumService = MdlForumServiceProxy.getMdlForumService(this.getServlet().getServletContext()); - } + // set up mdlForumService + if (mdlForumService == null) { + mdlForumService = MdlForumServiceProxy.getMdlForumService(this.getServlet().getServletContext()); + } - MdlForumConfigItem servletConfig = mdlForumService - .getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_TOOL_SERVLET); - servletConfig.setConfigValue(adminForm.getToolAdapterServlet()); - mdlForumService.saveOrUpdateMdlForumConfigItem(servletConfig); + // Save all the mappings + mdlForumService.saveServerMappings(adminForm.getMappedServers()); - MdlForumConfigItem extServerConfig = mdlForumService - .getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_SERVER_URL); - extServerConfig.setConfigValue(adminForm.getExtServerUrl()); - mdlForumService.saveOrUpdateMdlForumConfigItem(extServerConfig); + // Get a list of possible external servers to enable this tool for + List serverList = mdlForumService.getExtServerList(); + List mappedServers = mdlForumService.getMappedServers(); + populateServerList(adminForm, serverList, mappedServers); - if (toolService == null) { - toolService = mdlForumService.getToolService(); - } - Tool tool = toolService.getPersistToolBySignature(MdlForumConstants.TOOL_SIGNATURE); - tool.setExtLmsId(adminForm.getServerIdMapping()); - toolService.saveOrUpdateTool(tool); - return mapping.findForward("config"); - } else { - request.setAttribute("error", true); - return mapping.findForward("config"); - } + return mapping.findForward("config"); + } } Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/AuthoringAction.java =================================================================== diff -u -r7183d9542e1ed9d943ea00c26e85c87a121c03da -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 7183d9542e1ed9d943ea00c26e85c87a121c03da) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -38,7 +38,6 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForum; -import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumConfigItem; import org.lamsfoundation.lams.tool.mdfrum.service.IMdlForumService; import org.lamsfoundation.lams.tool.mdfrum.service.MdlForumServiceProxy; import org.lamsfoundation.lams.tool.mdfrum.util.MdlForumConstants; @@ -108,19 +107,21 @@ String userFromCSV = null; String courseFromCSV = null; String sectionFromCSV = null; + String extLmsIdFromCSV = null; if (customCSV == null && mdlForum == null) { logger.error("CustomCSV required if mdlForum is null"); throw new ToolException("CustomCSV required if mdlForum is null"); } else if (customCSV != null) { String splitCSV[] = customCSV.split(","); - if (splitCSV.length != 3) { + if (splitCSV.length != 4) { logger.error("mdlForum tool customCSV not in required (user,course,courseURL) form: " + customCSV); throw new ToolException("mdlForum tool cusomCSV not in required (user,course,courseURL) form: " + customCSV); } else { userFromCSV = splitCSV[0]; courseFromCSV = splitCSV[1]; sectionFromCSV = splitCSV[2]; + extLmsIdFromCSV = splitCSV[3]; } } @@ -129,8 +130,17 @@ mdlForum.setExtUsername(userFromCSV); mdlForum.setExtCourseId(courseFromCSV); mdlForum.setExtSection(sectionFromCSV); + mdlForum.setExtLmsId(extLmsIdFromCSV); mdlForum.setCreateDate(new Date()); } + + if (mdlForum.getExtLmsId() == null) { + mdlForum.setExtUsername(userFromCSV); + mdlForum.setExtCourseId(courseFromCSV); + mdlForum.setExtSection(sectionFromCSV); + mdlForum.setExtLmsId(extLmsIdFromCSV); + mdlForum.setCreateDate(new Date()); + } if (mode != null && mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content @@ -143,11 +153,9 @@ // if no external content id, open the mdl author page, otherwise, open the edit page try { - // If the mdlForum has a saved course url, use it, otherwise use the one giving in the request in customCSV - //String courseUrlToBeUsed = (mdlForum.getExtCourseUrl() != null) ? mdlForum.getExtCourseUrl() : courseUrlFromCSV; - - String responseUrl = mdlForumService.getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); + // If the mdlForum has a saved course url, use it, otherwise use the one giving in the request in customCSV + String responseUrl = mdlForumService.getExtServerUrl(mdlForum.getExtLmsId()); + responseUrl += RELATIVE_MOODLE_AUTHOR_URL; String returnUpdateUrl = URLEncoder.encode(TOOL_APP_URL + "/authoring.do?dispatch=updateContent" + "&" + AttributeNames.PARAM_TOOL_CONTENT_ID + "=" + toolContentID.toString(), "UTF8"); @@ -156,7 +164,7 @@ String encodedMoodleRelativePath = URLEncoder.encode(MOODLE_EDIT_URL, "UTF8"); - responseUrl += "&dest=" + encodedMoodleRelativePath ; + responseUrl += "&dest=" + encodedMoodleRelativePath; if (mdlForum.getExtSection() != null) { responseUrl += "§ion=" + mdlForum.getExtSection(); Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/LearningAction.java =================================================================== diff -u -r7d79b14a031fb4cda57721b53cc1d420325065ff -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/LearningAction.java (.../LearningAction.java) (revision 7d79b14a031fb4cda57721b53cc1d420325065ff) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/LearningAction.java (.../LearningAction.java) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -36,17 +36,16 @@ import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.tool.ToolAccessMode; 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.mdfrum.dto.MdlForumDTO; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForum; -import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumConfigItem; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumSession; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumUser; -import org.lamsfoundation.lams.tool.mdfrum.service.MdlForumServiceProxy; import org.lamsfoundation.lams.tool.mdfrum.service.IMdlForumService; +import org.lamsfoundation.lams.tool.mdfrum.service.MdlForumServiceProxy; import org.lamsfoundation.lams.tool.mdfrum.util.MdlForumConstants; import org.lamsfoundation.lams.tool.mdfrum.util.MdlForumException; -import org.lamsfoundation.lams.tool.exception.DataMissingException; -import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; @@ -74,9 +73,7 @@ private static final String TOOL_APP_URL = Configuration .get(ConfigurationKeys.SERVER_URL) + "/tool/" + MdlForumConstants.TOOL_SIGNATURE + "/"; - - // public static final String RELATIVE_LEARNER_URL = "mod/Forum/view.php?"; - + public static final String RELATIVE_LEARNER_URL = "course/lamsframes.php?"; public static final String MOODLE_VIEW_URL = "mod/forum/view.php"; public static final String RELATIVE_TEACHER_URL = "mod/forum/view.php?"; @@ -131,9 +128,7 @@ if (mdlForum.getExtToolContentId() != null) { try { - String responseUrl = mdlForumService.getConfigItem( - MdlForumConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); + String responseUrl = mdlForumService.getExtServerUrl(mdlForum.getExtLmsId()); if (mode.equals(ToolAccessMode.TEACHER)) { responseUrl += RELATIVE_TEACHER_URL; Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/MonitoringAction.java =================================================================== diff -u -rfe8df3c212f840b465ac683100c1374df889ff9a -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision fe8df3c212f840b465ac683100c1374df889ff9a) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -37,7 +37,6 @@ import org.lamsfoundation.lams.tool.mdfrum.dto.MdlForumDTO; import org.lamsfoundation.lams.tool.mdfrum.dto.MdlForumSessionDTO; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForum; -import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumConfigItem; import org.lamsfoundation.lams.tool.mdfrum.service.IMdlForumService; import org.lamsfoundation.lams.tool.mdfrum.service.MdlForumServiceProxy; import org.lamsfoundation.lams.tool.mdfrum.util.MdlForumConstants; @@ -90,8 +89,8 @@ for (MdlForumSessionDTO sessionDTO : mdlForumDT0.getSessionDTOs()) { try { - String responseUrl = mdlForumService.getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); + String responseUrl = mdlForumService.getExtServerUrl(mdlForum.getExtLmsId()); + responseUrl += RELATIVE_MONITOR_URL; String returnUrl = TOOL_APP_URL + "learning.do?" + AttributeNames.PARAM_TOOL_SESSION_ID + "=" Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/AdminForm.java =================================================================== diff -u -ref5d878ea024a08abf9145bdbcf2b4222ee1ab50 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/AdminForm.java (.../AdminForm.java) (revision ef5d878ea024a08abf9145bdbcf2b4222ee1ab50) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/AdminForm.java (.../AdminForm.java) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -29,49 +29,38 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; +import org.apache.struts.util.LabelValueBean; /** * @struts.form name="mdfrum10AdminForm" */ public class AdminForm extends ActionForm { private static final long serialVersionUID = 8872637862875198L; - String toolAdapterServlet; - String extServerUrl; - String serverIdMapping; + String[] mappableServers; + String[] mappedServers; + @Override public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) { ActionErrors ac = new ActionErrors(); ac.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("this is an error")); return ac; } - public String getToolAdapterServlet() { - return toolAdapterServlet; + public String[] getMappedServers() { + return mappedServers; } - public void setToolAdapterServlet(String toolAdapterServlet) { - this.toolAdapterServlet = toolAdapterServlet; + public void setMappedServers(String[] mappedServers) { + this.mappedServers = mappedServers; } - public String getServerIdMapping() { - return serverIdMapping; + public String[] getMappableServers() { + return mappableServers; } - public void setServerIdMapping(String serverIdMapping) { - this.serverIdMapping = serverIdMapping; + public void setMappableServers(String[] mappableServers) { + this.mappableServers = mappableServers; } - - public String getExtServerUrl() { - return extServerUrl; - } - - public void setExtServerUrl(String extServerUrl) { - this.extServerUrl = extServerUrl; - } - - public static long getSerialVersionUID() { - return serialVersionUID; - } } Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/servlets/ExportServlet.java =================================================================== diff -u -r08c312af0856bca0a580ddc8494c34bb5bbc4624 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -41,10 +41,9 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.mdfrum.dto.MdlForumDTO; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForum; -import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumConfigItem; import org.lamsfoundation.lams.tool.mdfrum.model.MdlForumSession; -import org.lamsfoundation.lams.tool.mdfrum.service.MdlForumServiceProxy; import org.lamsfoundation.lams.tool.mdfrum.service.IMdlForumService; +import org.lamsfoundation.lams.tool.mdfrum.service.MdlForumServiceProxy; import org.lamsfoundation.lams.tool.mdfrum.util.MdlForumException; import org.lamsfoundation.lams.tool.mdfrum.util.WebUtility; import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet; @@ -166,8 +165,8 @@ private void exportFileFromExternalServer(HttpServletRequest request, HttpServletResponse response, Long extToolSessionId, MdlForum mdlForum, String fullPath) throws Exception { - String exportPortFolioServletUrl = mdlForumService.getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_TOOL_SERVLET) - .getConfigValue(); + + String exportPortFolioServletUrl = mdlForumService.getExtServerUrl(mdlForum.getExtLmsId()); String extUsername = "user"; // setting user to arbitrary values since they are only used to construct the hash Index: tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -r7183d9542e1ed9d943ea00c26e85c87a121c03da -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 7183d9542e1ed9d943ea00c26e85c87a121c03da) +++ tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -14,21 +14,21 @@ + - @@ -46,6 +46,21 @@ + + + - - - Index: tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/web.xml =================================================================== diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/web.xml (.../web.xml) (revision 368d06879c2737658c7d8e7a45d1476a0742d366) +++ tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/web.xml (.../web.xml) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -10,16 +10,16 @@ contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/integrationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/tool/mdfrum/mdlForumApplicationContext.xml - + + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.central + SystemSessionFilter @@ -34,7 +34,7 @@ sessionFactoryBeanName - mdlForumSessionFactory + coreSessionFactory Index: tool_adapters/moodle/lams_tool_mdlforum/web/pages/admin/config.jsp =================================================================== diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r40406afc67655d56953c6cef8b9dd7ac61c3f90e --- tool_adapters/moodle/lams_tool_mdlforum/web/pages/admin/config.jsp (.../config.jsp) (revision 368d06879c2737658c7d8e7a45d1476a0742d366) +++ tool_adapters/moodle/lams_tool_mdlforum/web/pages/admin/config.jsp (.../config.jsp) (revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e) @@ -30,21 +30,22 @@ - - - - - - - - - - - - - -
+

+ +

+ + + + + + +
+ + + +
+