Index: tool_adapters/moodle/lams_tool_mdlchoice/.classpath =================================================================== diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/.classpath (.../.classpath) (revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f) +++ tool_adapters/moodle/lams_tool_mdlchoice/.classpath (.../.classpath) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -3,13 +3,13 @@ - - - - - - - + + + + + + + Index: tool_adapters/moodle/lams_tool_mdlchoice/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdchce/model/MdlChoice.hbm.xml =================================================================== diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdchce/model/MdlChoice.hbm.xml (.../MdlChoice.hbm.xml) (revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f) +++ tool_adapters/moodle/lams_tool_mdlchoice/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdchce/model/MdlChoice.hbm.xml (.../MdlChoice.hbm.xml) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -113,6 +113,15 @@ length="255" /> + + - - + @@ -56,10 +55,6 @@ - - - - Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/model/MdlChoice.java =================================================================== diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/model/MdlChoice.java (.../MdlChoice.java) (revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f) +++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/model/MdlChoice.java (.../MdlChoice.java) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -48,6 +48,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 /** @@ -65,6 +66,7 @@ private String extUsername; private String extCourseId; private String extSection; + private String extLmsId; //*********** NON Persistent fields private IToolContentHandler toolContentHandler; @@ -226,9 +228,18 @@ public void setExtSection(String extSection) { this.extSection = extSection; } + + + /** + * @hibernate.property column="ext_lms_id" length="255" + * @return + */ + public String getExtLmsId() { + return extLmsId; + } - public static long getSerialVersionUID() { - return serialVersionUID; + public void setExtLmsId(String extLmsId) { + this.extLmsId = extLmsId; } /** @@ -316,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 5181e43286f8cbcb65916789cd6c669180a411a8 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/model/MdlChoiceConfigItem.java'. Fisheye: No comparison available. Pass `N' to diff? Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/service/IMdlChoiceService.java =================================================================== diff -u -r7a10d149f243fd4df6f17cf754f1a35b7cb483e5 -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/service/IMdlChoiceService.java (.../IMdlChoiceService.java) (revision 7a10d149f243fd4df6f17cf754f1a35b7cb483e5) +++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/service/IMdlChoiceService.java (.../IMdlChoiceService.java) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -25,10 +25,11 @@ package org.lamsfoundation.lams.tool.mdchce.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.mdchce.model.MdlChoice; -import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceConfigItem; import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceSession; import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceUser; import org.lamsfoundation.lams.tool.mdchce.util.MdlChoiceException; @@ -97,22 +98,7 @@ public void saveOrUpdateMdlChoiceSession(MdlChoiceSession mdlChoiceSession); /** - * Get the mdlChoice config item by key * - * @param key - * @return - */ - public MdlChoiceConfigItem getConfigItem(String key); - - /** - * Save a mdl configItem - * - * @param item - */ - public void saveOrUpdateMdlChoiceConfigItem(MdlChoiceConfigItem item); - - /** - * * @param userId * @param toolSessionId * @return @@ -127,13 +113,6 @@ public MdlChoiceUser 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 * * @param serverMap @@ -173,8 +152,8 @@ * @param toolSessionId * @return */ - public boolean getExternalToolOutputBoolean(String outputName, MdlChoice mdlChoice, Long userId, String extToolContentId, - Long toolSessionId, String choiceID); + public boolean getExternalToolOutputBoolean(String outputName, MdlChoice mdlChoice, Long userId, + String extToolContentId, Long toolSessionId, String choiceID); /** * Converts the customCSV parameter into a hashmap @@ -187,8 +166,8 @@ /** * Constructs a parameter hashmap to be used for the default parameters * required by the external LMS tool adapter servlet. For instance in - * mdlChoice, this constructs the following: - * { ["un", username], ["cs", course], ["ts", timestamp], ["hs", hash], } + * mdlChoice, this constructs the following: { ["un", username], ["cs", + * course], ["ts", timestamp], ["hs", hash], } * * @param mdlChoice * @return @@ -198,12 +177,41 @@ /** * Constructs a parameter hashmap based off customCSV to be used for the * default parameters required by the external LMS tool adapter servlet. For - * instance in mdlChoice, this constructs the following: - * { ["un", username], ["cs", course], ["ts", timestamp], ["hs", hash], } + * instance in mdlChoice, this constructs the following: { ["un", username], + * ["cs", course], ["ts", timestamp], ["hs", hash], } * * @param user * @param course * @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_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/service/MdlChoiceService.java =================================================================== diff -u -r47de0a7602b9baa8435fbe90d5c0e16e1f41ae95 -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/service/MdlChoiceService.java (.../MdlChoiceService.java) (revision 47de0a7602b9baa8435fbe90d5c0e16e1f41ae95) +++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/service/MdlChoiceService.java (.../MdlChoiceService.java) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -33,13 +33,14 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.StringReader; -import java.net.URLConnection; import java.net.URLEncoder; import java.util.ArrayList; 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 javax.xml.parsers.DocumentBuilder; @@ -56,14 +57,15 @@ 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; @@ -73,13 +75,11 @@ 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.mdchce.dao.IMdlChoiceConfigItemDAO; import org.lamsfoundation.lams.tool.mdchce.dao.IMdlChoiceDAO; import org.lamsfoundation.lams.tool.mdchce.dao.IMdlChoiceSessionDAO; import org.lamsfoundation.lams.tool.mdchce.dao.IMdlChoiceUserDAO; import org.lamsfoundation.lams.tool.mdchce.dto.MdlChoiceOutputDTO; import org.lamsfoundation.lams.tool.mdchce.model.MdlChoice; -import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceConfigItem; import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceSession; import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceUser; import org.lamsfoundation.lams.tool.mdchce.util.MdlChoiceConstants; @@ -91,8 +91,6 @@ 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; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; @@ -114,6 +112,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"; @@ -125,7 +124,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 IMdlChoiceDAO mdlChoiceDAO = null; @@ -134,8 +133,6 @@ private IMdlChoiceUserDAO mdlChoiceUserDAO = null; - private IMdlChoiceConfigItemDAO mdlChoiceConfigItemDAO = null; - private ILearnerService learnerService; private ILamsToolService toolService; @@ -195,8 +192,7 @@ */ public Long copyExternalToolContent(HashMap params) throws ToolException, Exception { - String cloneServletUrl = mdlChoiceConfigItemDAO.getConfigItemByKey( - MdlChoiceConfigItem.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); @@ -219,11 +215,12 @@ 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)); String hash = hash(serverMap, paramsCSV.get(CUSTOM_CSV_MAP_PARAM_USER), timestamp); params.put(EXT_SERVER_PARAM_HASH, hash); @@ -235,11 +232,12 @@ params.put(EXT_SERVER_PARAM_USER, mdlchoice.getExtUsername()); params.put(EXT_SERVER_PARAM_COURSE, mdlchoice.getExtCourseId()); params.put(EXT_SERVER_PARAM_SECTION, mdlchoice.getExtSection()); + params.put(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID, mdlchoice.getExtLmsId()); String timestamp = Long.toString(new Date().getTime()); params.put(EXT_SERVER_PARAM_TIMESTAMP, timestamp); - ExtServerOrgMap serverMap = this.getExtServerOrgMap(); + ExtServerOrgMap serverMap = getExtServerOrgMap(mdlchoice.getExtLmsId()); String hash = hash(serverMap, mdlchoice.getExtUsername(), timestamp); params.put(EXT_SERVER_PARAM_HASH, hash); @@ -256,22 +254,22 @@ 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; } } - public boolean getExternalToolOutputBoolean(String outputName, MdlChoice mdlChoice, Long userId, String extToolContentId, - Long toolSessionId, String choiceOrderId) { + public boolean getExternalToolOutputBoolean(String outputName, MdlChoice mdlChoice, Long userId, + String extToolContentId, Long toolSessionId, String choiceOrderId) { MdlChoiceUser user = this.getUserByUserIdAndSessionId(userId, toolSessionId); - ExtServerOrgMap extServerMap = getExtServerOrgMap(); + ExtServerOrgMap extServerMap = getExtServerOrgMap(mdlChoice.getExtLmsId()); String extUserName = user.getLoginName().substring(extServerMap.getPrefix().length() + 1); try { - String outputServletUrl = mdlChoiceConfigItemDAO.getConfigItemByKey( - MdlChoiceConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String outputServletUrl = getExtToolAdapterServletUrl(mdlChoice.getExtLmsId()); // setting the mdlChoice username so the params are set up correctly mdlChoice.setExtUsername(extUserName); @@ -291,6 +289,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 += MdlChoiceConstants.RELATIVE_SERVLET_URL; + } + return ret; + } + + public ExtServerOrgMap getExtServerOrgMap(String extLmsId) { + return integrationService.getExtServerOrgMap(extLmsId); + } + /** * Get the tool output for the given tool output names. * @@ -340,26 +359,20 @@ if (mdchce == null) { mdchce = getDefaultContent(); } - + List choices = getPossibleChoices(mdchce); - - //HashMap map = new HashMap(); - //map.put("toolContent", mdchce); - //map.put("choices", choices); - + return mdlChoiceOutputFactory.getToolOutputDefinitions(choices); } private List getPossibleChoices(MdlChoice mdchce) { try { - if (mdchce.getExtToolContentId() == null) - { + if (mdchce.getExtToolContentId() == null) { return new ArrayList(); } - - String servletUrl = mdlChoiceConfigItemDAO - .getConfigItemByKey(MdlChoiceConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String servletUrl = getExtToolAdapterServletUrl(mdchce.getExtLmsId()); + // Get the required params, then call the eternal server HashMap params = this.getRequiredExtServletParams(mdchce); params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT_GET_CHOICES); @@ -373,7 +386,7 @@ throw new UserInfoFetchException("Fail to clone choice in .LRN:" + " - No data returned from external server"); } - + return getChoicesFromString(str); } catch (Exception e) { @@ -386,7 +399,7 @@ private List getChoicesFromString(String string) { try { List choices = new ArrayList(); - + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilder db = dbf.newDocumentBuilder(); Document document = db.parse(new InputSource(new StringReader(string))); @@ -399,7 +412,7 @@ MdlChoiceOutputDTO dto = new MdlChoiceOutputDTO(id, choice); choices.add(dto); } - + return choices; } catch (Exception e) { @@ -460,24 +473,6 @@ } MdlChoice toContent = MdlChoice.newInstance(fromContent, toContentId, mdlChoiceToolContentHandler); - // 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); - }*/ - mdlChoiceDAO.saveOrUpdate(toContent); } @@ -520,7 +515,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"); @@ -602,42 +597,44 @@ } } 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 = mdlChoiceConfigItemDAO.getConfigItemByKey( - MdlChoiceConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String exportServletUrl = getExtToolAdapterServletUrl(mdlChoice.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 + mdlChoice.setExtCourseId("extCourse"); + mdlChoice.setExtSection("0"); + mdlChoice.setExtUsername("authUser"); + HashMap params = this.getRequiredExtServletParams(mdlChoice); + params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT); + params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, mdlChoice.getExtToolContentId().toString()); - mdlChoice.setExtCourseId("extCourse"); - mdlChoice.setExtSection("0"); - mdlChoice.setExtUsername("authUser"); - HashMap params = this.getRequiredExtServletParams(mdlChoice); - params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT); - params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, mdlChoice.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 mdlChoice 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, mdlChoice, mdlChoiceToolContentHandler, + rootPath); } - logger.debug("Path to mdlChoice 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); } @@ -653,13 +650,6 @@ } - public ExtServerOrgMap getExtServerOrgMap() { - if (integrationService == null) - integrationService = getIntegrationService(); - IToolVO tool = toolService.getToolBySignature(MdlChoiceConstants.TOOL_SIGNATURE); - return integrationService.getExtServerOrgMap(tool.getExtLmsId()); - } - /** * Import the XML fragment for the tool's content, along with any files * needed for the content. @@ -678,9 +668,6 @@ try { - String importServletUrl = mdlChoiceConfigItemDAO.getConfigItemByKey( - MdlChoiceConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); - if (customCSV == null) { logger.error("Could not retrieve customCSV required for importing tool adapter tool. CustomCSV: " + customCSV); @@ -689,6 +676,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); @@ -744,16 +734,6 @@ } public MdlChoice getDefaultContent() { - /* - Long defaultContentID = getDefaultContentIdBySignature(MdlChoiceConstants.TOOL_SIGNATURE); - MdlChoice defaultContent = getMdlChoiceByContentId(defaultContentID); - if (defaultContent == null) { - String error = "Could not retrieve default content record for this tool"; - logger.error(error); - throw new MdlChoiceException(error); - } - return defaultContent; - */ MdlChoice defaultContent = new MdlChoice(); return defaultContent; } @@ -774,6 +754,63 @@ return newContent; } + public MdlChoice getDefaultContent(String extLmsId) { + MdlChoice defaultContent = new MdlChoice(); + defaultContent.setExtLmsId(extLmsId); + return defaultContent; + } + + @SuppressWarnings("unchecked") + public List getExtServerList() { + if (integrationService.getAllExtServerOrgMaps() != null) { + return (List) integrationService.getAllExtServerOrgMaps(); + } else { + return null; + } + + } + + public List getMappedServers() { + return integrationService.getMappedServers(MdlChoiceConstants.TOOL_SIGNATURE); + } + + public void saveServerMappings(String[] mappedServers) { + Tool tool = toolService.getPersistToolBySignature(MdlChoiceConstants.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(), MdlChoiceConstants.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); + } + } + + } + public MdlChoice getMdlChoiceByContentId(Long toolContentID) { MdlChoice mdlChoice = (MdlChoice) mdlChoiceDAO.getByContentId(toolContentID); if (mdlChoice == null) { @@ -782,14 +819,6 @@ return mdlChoice; } - public MdlChoiceConfigItem getConfigItem(String key) { - return mdlChoiceConfigItemDAO.getConfigItemByKey(key); - } - - public void saveOrUpdateMdlChoiceConfigItem(MdlChoiceConfigItem item) { - mdlChoiceConfigItemDAO.saveOrUpdate(item); - } - public MdlChoiceSession getSessionBySessionId(Long toolSessionId) { MdlChoiceSession mdlChoiceSession = mdlChoiceSessionDAO.getBySessionId(toolSessionId); if (mdlChoiceSession == null) { @@ -919,14 +948,6 @@ this.mdlChoiceDAO = mdlChoiceDAO; } - public IMdlChoiceConfigItemDAO getMdlChoiceConfigItemDAO() { - return mdlChoiceConfigItemDAO; - } - - public void setMdlChoiceConfigItemDAO(IMdlChoiceConfigItemDAO mdlChoiceConfigItemDAO) { - this.mdlChoiceConfigItemDAO = mdlChoiceConfigItemDAO; - } - public IToolContentHandler getMdlChoiceToolContentHandler() { return mdlChoiceToolContentHandler; } @@ -1000,28 +1021,7 @@ * @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/mdchce/mdlChoiceApplicationContext.xml", - "/org/lamsfoundation/lams/commonContext.xml" }; - - ApplicationContext context = new ClassPathXmlApplicationContext(contexts); - - if (context == null) - throw new MdlChoiceException( - "Unable to access application context. Cannot create integration service object."); - - IIntegrationService service = (IIntegrationService) context.getBean("integrationService"); - return service; - } else { - return integrationService; - } + return integrationService; } public void setIntegrationService(IIntegrationService integrationService) { Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/util/MdlChoiceConstants.java =================================================================== diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/util/MdlChoiceConstants.java (.../MdlChoiceConstants.java) (revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f) +++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/util/MdlChoiceConstants.java (.../MdlChoiceConstants.java) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -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_choice.php"; } Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/util/WebUtility.java =================================================================== diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/util/WebUtility.java (.../WebUtility.java) (revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f) +++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/util/WebUtility.java (.../WebUtility.java) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -37,6 +37,7 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.exception.ToolException; +import org.lamsfoundation.lams.tool.mdchce.service.MdlChoiceService; 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(MdlChoiceService.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_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/AdminAction.java =================================================================== diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/AdminAction.java (.../AdminAction.java) (revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f) +++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/AdminAction.java (.../AdminAction.java) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -23,17 +23,19 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.mdchce.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.mdchce.model.MdlChoiceConfigItem; +import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.tool.mdchce.service.IMdlChoiceService; import org.lamsfoundation.lams.tool.mdchce.service.MdlChoiceServiceProxy; -import org.lamsfoundation.lams.tool.mdchce.util.MdlChoiceConstants; import org.lamsfoundation.lams.tool.mdchce.web.forms.AdminForm; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.web.action.LamsDispatchAction; @@ -63,55 +65,51 @@ if (toolService == null) { toolService = mdlChoiceService.getToolService(); } - Tool tool = toolService.getPersistToolBySignature(MdlChoiceConstants.TOOL_SIGNATURE); - MdlChoiceConfigItem toolAdpServlet = mdlChoiceService.getConfigItem(MdlChoiceConfigItem.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 = mdlChoiceService.getExtServerList(); + List mappedServers = mdlChoiceService.getMappedServers(); + populateServerList(adminForm, serverList, mappedServers); - MdlChoiceConfigItem extServerConfig = mdlChoiceService.getConfigItem(MdlChoiceConfigItem.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 mdlChoiceService - if (mdlChoiceService == null) { - mdlChoiceService = MdlChoiceServiceProxy.getMdlChoiceService(this.getServlet().getServletContext()); - } + // Save all the mappings + mdlChoiceService.saveServerMappings(adminForm.getMappedServers()); - MdlChoiceConfigItem servletConfig = mdlChoiceService - .getConfigItem(MdlChoiceConfigItem.KEY_EXTERNAL_TOOL_SERVLET); - servletConfig.setConfigValue(adminForm.getToolAdapterServlet()); - mdlChoiceService.saveOrUpdateMdlChoiceConfigItem(servletConfig); + // Get a list of possible external servers to enable this tool for + List serverList = mdlChoiceService.getExtServerList(); + List mappedServers = mdlChoiceService.getMappedServers(); + populateServerList(adminForm, serverList, mappedServers); + return mapping.findForward("config"); - MdlChoiceConfigItem extServerConfig = mdlChoiceService - .getConfigItem(MdlChoiceConfigItem.KEY_EXTERNAL_SERVER_URL); - extServerConfig.setConfigValue(adminForm.getExtServerUrl()); - mdlChoiceService.saveOrUpdateMdlChoiceConfigItem(extServerConfig); - - if (toolService == null) { - toolService = mdlChoiceService.getToolService(); - } - Tool tool = toolService.getPersistToolBySignature(MdlChoiceConstants.TOOL_SIGNATURE); - tool.setExtLmsId(adminForm.getServerIdMapping()); - toolService.saveOrUpdateTool(tool); - return mapping.findForward("config"); - } else { - request.setAttribute("error", true); - return mapping.findForward("config"); - } } } Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/AuthoringAction.java =================================================================== diff -u -r09ef6f966a98b137bb8388349d8feee0fcf23216 -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 09ef6f966a98b137bb8388349d8feee0fcf23216) +++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -38,7 +38,6 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.mdchce.model.MdlChoice; -import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceConfigItem; import org.lamsfoundation.lams.tool.mdchce.service.IMdlChoiceService; import org.lamsfoundation.lams.tool.mdchce.service.MdlChoiceServiceProxy; import org.lamsfoundation.lams.tool.mdchce.util.MdlChoiceConstants; @@ -64,7 +63,7 @@ public IMdlChoiceService mdlChoiceService; - //public static final String RELATIVE_MOODLE_AUTHOR_URL = "/course/modedit-lams.php?"; + //public static final String RELATIVE_MOODLE_AUTHOR_URL = "/course/modedit-lams.php?"; public static final String RELATIVE_MOODLE_AUTHOR_URL = "course/lamsframes.php?"; public static final String MOODLE_EDIT_URL = "course/modedit-lams.php"; @@ -108,19 +107,21 @@ String userFromCSV = null; String courseFromCSV = null; String sectionFromCSV = null; + String extLmsIdFromCSV = null; if (customCSV == null && mdlChoice == null) { logger.error("CustomCSV required if mdlChoice is null"); throw new ToolException("CustomCSV required if mdlChoice is null"); } else if (customCSV != null) { String splitCSV[] = customCSV.split(","); - if (splitCSV.length != 3) { + if (splitCSV.length != 4) { logger.error("mdlChoice tool customCSV not in required (user,course,courseURL) form: " + customCSV); throw new ToolException("mdlChoice tool cusomCSV not in required (user,course,courseURL) form: " + customCSV); } else { userFromCSV = splitCSV[0]; courseFromCSV = splitCSV[1]; sectionFromCSV = splitCSV[2]; + extLmsIdFromCSV = splitCSV[3]; } } @@ -132,6 +133,14 @@ mdlChoice.setCreateDate(new Date()); } + if (mdlChoice.getExtLmsId() == null) { + mdlChoice.setExtUsername(userFromCSV); + mdlChoice.setExtCourseId(courseFromCSV); + mdlChoice.setExtSection(sectionFromCSV); + mdlChoice.setExtLmsId(extLmsIdFromCSV); + mdlChoice.setCreateDate(new Date()); + } + if (mode != null && mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we @@ -143,26 +152,20 @@ // if no external content id, open the mdl author page, otherwise, open the edit page try { - // If the mdlChoice has a saved course url, use it, otherwise use the one giving in the request in customCSV - //String courseUrlToBeUsed = (mdlChoice.getExtCourseUrl() != null) ? mdlChoice.getExtCourseUrl() : courseUrlFromCSV; + String responseUrl = mdlChoiceService.getExtServerUrl(mdlChoice.getExtLmsId()); - String responseUrl = mdlChoiceService.getConfigItem(MdlChoiceConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); - - responseUrl += RELATIVE_MOODLE_AUTHOR_URL; - String returnUpdateUrl = URLEncoder.encode(TOOL_APP_URL + "/authoring.do?dispatch=updateContent" + "&" - + AttributeNames.PARAM_TOOL_CONTENT_ID + "=" + toolContentID.toString(), "UTF8"); - - - returnUpdateUrl = URLEncoder.encode(returnUpdateUrl, "UTF8"); - - responseUrl += "lamsUpdateURL=" + returnUpdateUrl; - - String encodedMoodleRelativePath = URLEncoder.encode(MOODLE_EDIT_URL, "UTF8"); - - responseUrl += "&dest=" + encodedMoodleRelativePath ; - + responseUrl += RELATIVE_MOODLE_AUTHOR_URL; + String returnUpdateUrl = URLEncoder.encode(TOOL_APP_URL + "/authoring.do?dispatch=updateContent" + "&" + + AttributeNames.PARAM_TOOL_CONTENT_ID + "=" + toolContentID.toString(), "UTF8"); + returnUpdateUrl = URLEncoder.encode(returnUpdateUrl, "UTF8"); + + responseUrl += "lamsUpdateURL=" + returnUpdateUrl; + + String encodedMoodleRelativePath = URLEncoder.encode(MOODLE_EDIT_URL, "UTF8"); + + responseUrl += "&dest=" + encodedMoodleRelativePath; + if (mdlChoice.getExtSection() != null) { responseUrl += "§ion=" + mdlChoice.getExtSection(); } else { @@ -206,9 +209,9 @@ mdlChoiceService.saveOrUpdateMdlChoice(mdlChoice); String redirectString = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/" - + MdlChoiceConstants.TOOL_SIGNATURE + "/clearsession.do" + "?action=confirm&mode=author" + "&signature=" - + MdlChoiceConstants.TOOL_SIGNATURE + "&toolContentID=" + toolContentID.toString() + "&defineLater=no" - + "&customiseSessionID=" + "&contentFolderID=0"; + + MdlChoiceConstants.TOOL_SIGNATURE + "/clearsession.do" + "?action=confirm&mode=author" + + "&signature=" + MdlChoiceConstants.TOOL_SIGNATURE + "&toolContentID=" + toolContentID.toString() + + "&defineLater=no" + "&customiseSessionID=" + "&contentFolderID=0"; log.debug("Manual redirect for MdlChoice to: " + redirectString); Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/LearningAction.java =================================================================== diff -u -r09ef6f966a98b137bb8388349d8feee0fcf23216 -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/LearningAction.java (.../LearningAction.java) (revision 09ef6f966a98b137bb8388349d8feee0fcf23216) +++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/LearningAction.java (.../LearningAction.java) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -40,7 +40,6 @@ import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.mdchce.dto.MdlChoiceDTO; import org.lamsfoundation.lams.tool.mdchce.model.MdlChoice; -import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceConfigItem; import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceSession; import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceUser; import org.lamsfoundation.lams.tool.mdchce.service.IMdlChoiceService; @@ -91,7 +90,7 @@ } // Retrieve the session and content. - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, false); + ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, false); MdlChoiceSession mdlChoiceSession = mdlChoiceService.getSessionBySessionId(toolSessionID); if (mdlChoiceSession == null) { throw new MdlChoiceException("Cannot retreive session with toolSessionID: " + toolSessionID); @@ -120,31 +119,26 @@ } if (mdlChoice.getExtToolContentId() != null) { - try { - String responseUrl = mdlChoiceService.getConfigItem(MdlChoiceConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); - - if(mode.equals(ToolAccessMode.TEACHER)) - { - responseUrl += RELATIVE_TEACHER_URL; - } - else if (mode.equals(ToolAccessMode.LEARNER)|| mode.equals(ToolAccessMode.AUTHOR)) - { - responseUrl += RELATIVE_LEARNER_URL; - } + try { + String responseUrl = mdlChoiceService.getExtServerUrl(mdlChoice.getExtLmsId()); + if (mode.equals(ToolAccessMode.TEACHER)) { + responseUrl += RELATIVE_TEACHER_URL; + } else if (mode.equals(ToolAccessMode.LEARNER) || mode.equals(ToolAccessMode.AUTHOR)) { + responseUrl += RELATIVE_LEARNER_URL; + } + String returnUrl = TOOL_APP_URL + "learning.do?" + AttributeNames.PARAM_TOOL_SESSION_ID + "=" + toolSessionID.toString() + "&dispatch=finishActivity"; - + String encodedMoodleRelativePath = URLEncoder.encode(MOODLE_VIEW_URL, "UTF8"); returnUrl = URLEncoder.encode(returnUrl, "UTF8"); - - responseUrl += "&id=" + mdlChoiceSession.getExtSessionId() + "&returnUrl=" + returnUrl - + "&dest=" + encodedMoodleRelativePath + "&is_learner=1" + "&isFinished=" + mdlChoiceUser.isFinishedActivity(); - - + responseUrl += "&id=" + mdlChoiceSession.getExtSessionId() + "&returnUrl=" + returnUrl + "&dest=" + + encodedMoodleRelativePath + "&is_learner=1" + "&isFinished=" + + mdlChoiceUser.isFinishedActivity(); + log.debug("Redirecting for mdl choice learner: " + responseUrl); response.sendRedirect(responseUrl); } catch (Exception e) { @@ -160,8 +154,8 @@ UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); // attempt to retrieve user using userId and toolSessionId - MdlChoiceUser mdlChoiceUser = mdlChoiceService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()), - toolSessionId); + MdlChoiceUser mdlChoiceUser = mdlChoiceService.getUserByUserIdAndSessionId( + new Long(user.getUserID().intValue()), toolSessionId); if (mdlChoiceUser == null) { MdlChoiceSession mdlChoiceSession = mdlChoiceService.getSessionBySessionId(toolSessionId); Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/MonitoringAction.java =================================================================== diff -u -r1bf101888677ad56dfd3a998e490dc6bdb6647a8 -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 1bf101888677ad56dfd3a998e490dc6bdb6647a8) +++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -37,7 +37,6 @@ import org.lamsfoundation.lams.tool.mdchce.dto.MdlChoiceDTO; import org.lamsfoundation.lams.tool.mdchce.dto.MdlChoiceSessionDTO; import org.lamsfoundation.lams.tool.mdchce.model.MdlChoice; -import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceConfigItem; import org.lamsfoundation.lams.tool.mdchce.service.IMdlChoiceService; import org.lamsfoundation.lams.tool.mdchce.service.MdlChoiceServiceProxy; import org.lamsfoundation.lams.tool.mdchce.util.MdlChoiceConstants; @@ -90,8 +89,9 @@ for (MdlChoiceSessionDTO sessionDTO : mdlChoiceDT0.getSessionDTOs()) { try { - String responseUrl = mdlChoiceService.getConfigItem(MdlChoiceConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); + + String responseUrl = mdlChoiceService.getExtServerUrl(mdlChoice.getExtLmsId()); + responseUrl += RELATIVE_MONITOR_URL; String returnUrl = TOOL_APP_URL + "learning.do?" + AttributeNames.PARAM_TOOL_SESSION_ID + "=" Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/forms/AdminForm.java =================================================================== diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/forms/AdminForm.java (.../AdminForm.java) (revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f) +++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/forms/AdminForm.java (.../AdminForm.java) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -36,9 +36,8 @@ 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) { @@ -47,31 +46,21 @@ return ac; } - public String getToolAdapterServlet() { - return toolAdapterServlet; + public String[] getMappableServers() { + return mappableServers; } - public void setToolAdapterServlet(String toolAdapterServlet) { - this.toolAdapterServlet = toolAdapterServlet; + public void setMappableServers(String[] mappableServers) { + this.mappableServers = mappableServers; } - public String getServerIdMapping() { - return serverIdMapping; + public String[] getMappedServers() { + return mappedServers; } - public void setServerIdMapping(String serverIdMapping) { - this.serverIdMapping = serverIdMapping; + public void setMappedServers(String[] mappedServers) { + this.mappedServers = mappedServers; } - 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_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/servlets/ExportServlet.java =================================================================== diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f) +++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -41,10 +41,9 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.mdchce.dto.MdlChoiceDTO; import org.lamsfoundation.lams.tool.mdchce.model.MdlChoice; -import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceConfigItem; import org.lamsfoundation.lams.tool.mdchce.model.MdlChoiceSession; -import org.lamsfoundation.lams.tool.mdchce.service.MdlChoiceServiceProxy; import org.lamsfoundation.lams.tool.mdchce.service.IMdlChoiceService; +import org.lamsfoundation.lams.tool.mdchce.service.MdlChoiceServiceProxy; import org.lamsfoundation.lams.tool.mdchce.util.MdlChoiceException; import org.lamsfoundation.lams.tool.mdchce.util.WebUtility; import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet; @@ -166,8 +165,7 @@ private void exportFileFromExternalServer(HttpServletRequest request, HttpServletResponse response, Long extToolSessionId, MdlChoice mdlChoice, String fullPath) throws Exception { - String exportPortFolioServletUrl = mdlChoiceService.getConfigItem(MdlChoiceConfigItem.KEY_EXTERNAL_TOOL_SERVLET) - .getConfigValue(); + String exportPortFolioServletUrl = mdlChoiceService.getExtServerUrl(mdlChoice.getExtLmsId()); String extUsername = "user"; // setting user to arbitrary values since they are only used to construct the hash Index: tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -ra893b7295d93ddde4f0f7945b7c49eccc8b1efe4 -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision a893b7295d93ddde4f0f7945b7c49eccc8b1efe4) +++ tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -14,16 +14,16 @@ - - - - + + + + Index: tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/web.xml =================================================================== diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/web.xml (.../web.xml) (revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f) +++ tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/web.xml (.../web.xml) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -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/mdchce/mdlChoiceApplicationContext.xml - + + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.central + SystemSessionFilter @@ -34,7 +34,7 @@ sessionFactoryBeanName - mdlChoiceSessionFactory + coreSessionFactory Index: tool_adapters/moodle/lams_tool_mdlchoice/web/pages/admin/config.jsp =================================================================== diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r5181e43286f8cbcb65916789cd6c669180a411a8 --- tool_adapters/moodle/lams_tool_mdlchoice/web/pages/admin/config.jsp (.../config.jsp) (revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f) +++ tool_adapters/moodle/lams_tool_mdlchoice/web/pages/admin/config.jsp (.../config.jsp) (revision 5181e43286f8cbcb65916789cd6c669180a411a8) @@ -30,26 +30,21 @@ - - - - - - - - - - - - - -
+

+ +

+ + + + +
+ +
+ - - - +