Index: tool_adapters/moodle/lams_tool_mdlassignment/.classpath =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/.classpath (.../.classpath) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/.classpath (.../.classpath) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -4,12 +4,12 @@ - - - - - - - + + + + + + + Index: tool_adapters/moodle/lams_tool_mdlassignment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdasgm/model/MdlAssignment.hbm.xml =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdasgm/model/MdlAssignment.hbm.xml (.../MdlAssignment.hbm.xml) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdasgm/model/MdlAssignment.hbm.xml (.../MdlAssignment.hbm.xml) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -113,6 +113,15 @@ length="255" /> + + - - + @@ -56,10 +55,6 @@ - - - - Index: tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/model/MdlAssignment.java =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/model/MdlAssignment.java (.../MdlAssignment.java) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/model/MdlAssignment.java (.../MdlAssignment.java) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -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" + * @return + */ + 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 a0b65d229f3b02db82d0a6ea563c0d4e540e8118 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/model/MdlAssignmentConfigItem.java'. Fisheye: No comparison available. Pass `N' to diff? Index: tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/service/IMdlAssignmentService.java =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/service/IMdlAssignmentService.java (.../IMdlAssignmentService.java) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/service/IMdlAssignmentService.java (.../IMdlAssignmentService.java) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -25,18 +25,20 @@ package org.lamsfoundation.lams.tool.mdasgm.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.mdasgm.model.MdlAssignment; -import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentConfigItem; import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentSession; import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentUser; import org.lamsfoundation.lams.tool.mdasgm.util.MdlAssignmentException; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; /** - * Defines the services available to the web layer from the MdlAssignment Service + * Defines the services available to the web layer from the MdlAssignment + * Service */ public interface IMdlAssignmentService { @@ -96,22 +98,7 @@ public void saveOrUpdateMdlAssignmentSession(MdlAssignmentSession mdlAssignmentSession); /** - * Get the mdlAssignment config item by key * - * @param key - * @return - */ - public MdlAssignmentConfigItem getConfigItem(String key); - - /** - * Save a mdl configItem - * - * @param item - */ - public void saveOrUpdateMdlAssignmentConfigItem(MdlAssignmentConfigItem item); - - /** - * * @param userId * @param toolSessionId * @return @@ -126,13 +113,6 @@ public MdlAssignmentUser 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 @@ -172,8 +152,8 @@ * @param toolSessionId * @return */ - public int getExternalToolOutputInt(String outputName, MdlAssignment mdlAssignment, Long userId, String extToolContentId, - Long toolSessionId); + public int getExternalToolOutputInt(String outputName, MdlAssignment mdlAssignment, Long userId, + String extToolContentId, Long toolSessionId); /** * Converts the customCSV parameter into a hashmap @@ -186,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 - * mdlAssignment, this constructs the following: - * { ["un", username], ["cs", course], ["ts", timestamp], ["hs", hash], } + * mdlAssignment, this constructs the following: { ["un", username], ["cs", + * course], ["ts", timestamp], ["hs", hash], } * * @param mdlAssignment * @return @@ -197,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 mdlAssignment, this constructs the following: - * { ["un", username], ["cs", course], ["ts", timestamp], ["hs", hash], } + * instance in mdlAssignment, 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_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/service/MdlAssignmentService.java =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/service/MdlAssignmentService.java (.../MdlAssignmentService.java) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/service/MdlAssignmentService.java (.../MdlAssignmentService.java) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -27,26 +27,20 @@ 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 +53,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.mdasgm.dao.IMdlAssignmentConfigItemDAO; +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.mdasgm.dao.IMdlAssignmentDAO; import org.lamsfoundation.lams.tool.mdasgm.dao.IMdlAssignmentSessionDAO; import org.lamsfoundation.lams.tool.mdasgm.dao.IMdlAssignmentUserDAO; import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignment; -import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentConfigItem; import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentSession; import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentUser; import org.lamsfoundation.lams.tool.mdasgm.util.MdlAssignmentConstants; import org.lamsfoundation.lams.tool.mdasgm.util.MdlAssignmentException; import org.lamsfoundation.lams.tool.mdasgm.util.MdlAssignmentToolContentHandler; import org.lamsfoundation.lams.tool.mdasgm.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 IMdlAssignmentService interface. @@ -111,6 +102,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 +114,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 IMdlAssignmentDAO mdlAssignmentDAO = null; @@ -131,8 +123,6 @@ private IMdlAssignmentUserDAO mdlAssignmentUserDAO = null; - private IMdlAssignmentConfigItemDAO mdlAssignmentConfigItemDAO = null; - private ILearnerService learnerService; private ILamsToolService toolService; @@ -192,8 +182,7 @@ */ public Long copyExternalToolContent(HashMap params) throws ToolException, Exception { - String cloneServletUrl = mdlAssignmentConfigItemDAO.getConfigItemByKey(MdlAssignmentConfigItem.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 +205,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); @@ -232,11 +222,12 @@ params.put(EXT_SERVER_PARAM_USER, mdlassignment.getExtUsername()); params.put(EXT_SERVER_PARAM_COURSE, mdlassignment.getExtCourseId()); params.put(EXT_SERVER_PARAM_SECTION, mdlassignment.getExtSection()); + params.put(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID, mdlassignment.getExtLmsId()); String timestamp = Long.toString(new Date().getTime()); params.put(EXT_SERVER_PARAM_TIMESTAMP, timestamp); - ExtServerOrgMap serverMap = this.getExtServerOrgMap(); + ExtServerOrgMap serverMap = getExtServerOrgMap(mdlassignment.getExtLmsId()); String hash = hash(serverMap, mdlassignment.getExtUsername(), timestamp); params.put(EXT_SERVER_PARAM_HASH, hash); @@ -253,22 +244,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 int getExternalToolOutputInt(String outputName, MdlAssignment mdlAssignment, Long userId, String extToolContentId, - Long toolSessionId) { + public int getExternalToolOutputInt(String outputName, MdlAssignment mdlAssignment, Long userId, + String extToolContentId, Long toolSessionId) { MdlAssignmentUser user = this.getUserByUserIdAndSessionId(userId, toolSessionId); - ExtServerOrgMap extServerMap = getExtServerOrgMap(); + ExtServerOrgMap extServerMap = getExtServerOrgMap(mdlAssignment.getExtLmsId()); String extUserName = user.getLoginName().substring(extServerMap.getPrefix().length() + 1); try { - String outputServletUrl = mdlAssignmentConfigItemDAO.getConfigItemByKey( - MdlAssignmentConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String outputServletUrl = getExtToolAdapterServletUrl(mdlAssignment.getExtLmsId()); // setting the mdlAssignment username so the params are set up correctly mdlAssignment.setExtUsername(extUserName); @@ -299,10 +290,31 @@ if (session == null) { return null; } - return mdlAssignmentOutputFactory.getToolOutput(names, this, toolSessionId, learnerId, session.getMdlAssignment(), - session.getExtSessionId()); + return mdlAssignmentOutputFactory.getToolOutput(names, this, toolSessionId, learnerId, session + .getMdlAssignment(), session.getExtSessionId()); } + 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 += MdlAssignmentConstants.RELATIVE_SERVLET_URL; + } + return ret; + } + + public ExtServerOrgMap getExtServerOrgMap(String extLmsId) { + return integrationService.getExtServerOrgMap(extLmsId); + } + /** * Get the tool output for the given tool output name. * @@ -316,8 +328,8 @@ return null; } - return mdlAssignmentOutputFactory.getToolOutput(name, this, toolSessionId, learnerId, session.getMdlAssignment(), session - .getExtSessionId()); + return mdlAssignmentOutputFactory.getToolOutput(name, this, toolSessionId, learnerId, session + .getMdlAssignment(), session.getExtSessionId()); } /** @@ -391,24 +403,6 @@ } MdlAssignment toContent = MdlAssignment.newInstance(fromContent, toContentId, mdlAssignmentToolContentHandler); - // 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); - }*/ - mdlAssignmentDAO.saveOrUpdate(toContent); } @@ -451,7 +445,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"); @@ -527,7 +521,8 @@ mdlAssignment.setMdlAssignmentSessions(null); try { - exportContentService.exportToolContent(toolContentId, mdlAssignment, mdlAssignmentToolContentHandler, rootPath); + exportContentService.exportToolContent(toolContentId, mdlAssignment, mdlAssignmentToolContentHandler, + rootPath); } catch (ExportToolContentException e) { throw new ToolException(e); } @@ -539,36 +534,39 @@ String toolPath = FileUtil.getFullPath(rootPath, toolContentId.toString()); FileUtil.createDirectory(toolPath); - String exportServletUrl = mdlAssignmentConfigItemDAO.getConfigItemByKey( - MdlAssignmentConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String exportServletUrl = getExtToolAdapterServletUrl(mdlAssignment.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 + mdlAssignment.setExtCourseId("extCourse"); + mdlAssignment.setExtSection("0"); + mdlAssignment.setExtUsername("authUser"); + HashMap params = this.getRequiredExtServletParams(mdlAssignment); + params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT); + params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, mdlAssignment.getExtToolContentId().toString()); - mdlAssignment.setExtCourseId("extCourse"); - mdlAssignment.setExtSection("0"); - mdlAssignment.setExtUsername("authUser"); - HashMap params = this.getRequiredExtServletParams(mdlAssignment); - params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT); - params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, mdlAssignment.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 mdlAssignment 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, mdlAssignment, + mdlAssignmentToolContentHandler, rootPath); } - logger.debug("Path to mdlAssignment 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 +582,6 @@ } - public ExtServerOrgMap getExtServerOrgMap() { - if (integrationService == null) - integrationService = getIntegrationService(); - IToolVO tool = toolService.getToolBySignature(MdlAssignmentConstants.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 +600,6 @@ try { - String importServletUrl = mdlAssignmentConfigItemDAO.getConfigItemByKey( - MdlAssignmentConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); - if (customCSV == null) { logger.error("Could not retrieve customCSV required for importing tool adapter tool. CustomCSV: " + customCSV); @@ -620,6 +608,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); @@ -646,11 +637,11 @@ { try { - Object toolPOJO = exportContentService.importToolContent(toolContentPath, mdlAssignmentToolContentHandler, - fromVersion, toVersion); + Object toolPOJO = exportContentService.importToolContent(toolContentPath, + mdlAssignmentToolContentHandler, fromVersion, toVersion); if (!(toolPOJO instanceof MdlAssignment)) - throw new ImportToolContentException("Import MdlAssignment tool content failed. Deserialized object is " - + toolPOJO); + throw new ImportToolContentException( + "Import MdlAssignment tool content failed. Deserialized object is " + toolPOJO); MdlAssignment mdlAssignment = (MdlAssignment) toolPOJO; // reset it to new toolContentId mdlAssignment.setToolContentId(toolContentId); @@ -675,17 +666,13 @@ } public MdlAssignment getDefaultContent() { - /* - Long defaultContentID = getDefaultContentIdBySignature(MdlAssignmentConstants.TOOL_SIGNATURE); - MdlAssignment defaultContent = getMdlAssignmentByContentId(defaultContentID); - if (defaultContent == null) { - String error = "Could not retrieve default content record for this tool"; - logger.error(error); - throw new MdlAssignmentException(error); - } + MdlAssignment defaultContent = new MdlAssignment(); return defaultContent; - */ + } + + public MdlAssignment getDefaultContent(String extLmsId) { MdlAssignment defaultContent = new MdlAssignment(); + defaultContent.setExtLmsId(extLmsId); return defaultContent; } @@ -705,6 +692,57 @@ return newContent; } + @SuppressWarnings("unchecked") + public List getExtServerList() { + if (integrationService.getAllExtServerOrgMaps() != null) { + return (List) integrationService.getAllExtServerOrgMaps(); + } else { + return null; + } + + } + + public List getMappedServers() { + return integrationService.getMappedServers(MdlAssignmentConstants.TOOL_SIGNATURE); + } + + public void saveServerMappings(String[] mappedServers) { + Tool tool = toolService.getPersistToolBySignature(MdlAssignmentConstants.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(), MdlAssignmentConstants.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 MdlAssignment getMdlAssignmentByContentId(Long toolContentID) { MdlAssignment mdlAssignment = (MdlAssignment) mdlAssignmentDAO.getByContentId(toolContentID); if (mdlAssignment == null) { @@ -713,14 +751,6 @@ return mdlAssignment; } - public MdlAssignmentConfigItem getConfigItem(String key) { - return mdlAssignmentConfigItemDAO.getConfigItemByKey(key); - } - - public void saveOrUpdateMdlAssignmentConfigItem(MdlAssignmentConfigItem item) { - mdlAssignmentConfigItemDAO.saveOrUpdate(item); - } - public MdlAssignmentSession getSessionBySessionId(Long toolSessionId) { MdlAssignmentSession mdlAssignmentSession = mdlAssignmentSessionDAO.getBySessionId(toolSessionId); if (mdlAssignmentSession == null) { @@ -793,7 +823,8 @@ ICredentials credentials = new SimpleCredentials(MdlAssignmentToolContentHandler.repositoryUser, MdlAssignmentToolContentHandler.repositoryId); try { - ITicket ticket = repositoryService.login(credentials, MdlAssignmentToolContentHandler.repositoryWorkspaceName); + ITicket ticket = repositoryService.login(credentials, + MdlAssignmentToolContentHandler.repositoryWorkspaceName); return ticket; } catch (AccessDeniedException ae) { throw new MdlAssignmentException("Access Denied to repository." + ae.getMessage()); @@ -850,14 +881,6 @@ this.mdlAssignmentDAO = mdlAssignmentDAO; } - public IMdlAssignmentConfigItemDAO getMdlAssignmentConfigItemDAO() { - return mdlAssignmentConfigItemDAO; - } - - public void setMdlAssignmentConfigItemDAO(IMdlAssignmentConfigItemDAO mdlAssignmentConfigItemDAO) { - this.mdlAssignmentConfigItemDAO = mdlAssignmentConfigItemDAO; - } - public IToolContentHandler getMdlAssignmentToolContentHandler() { return mdlAssignmentToolContentHandler; } @@ -925,34 +948,8 @@ this.mdlAssignmentOutputFactory = mdlAssignmentOutputFactory; } - /** - * TODO: Use spring injection instead of hacking a context - * - * @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/mdasgm/mdlAssignmentApplicationContext.xml", - "/org/lamsfoundation/lams/commonContext.xml" }; - - ApplicationContext context = new ClassPathXmlApplicationContext(contexts); - - if (context == null) - throw new MdlAssignmentException( - "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_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/util/MdlAssignmentConstants.java =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/util/MdlAssignmentConstants.java (.../MdlAssignmentConstants.java) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/util/MdlAssignmentConstants.java (.../MdlAssignmentConstants.java) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -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_assignment.php"; } Index: tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/util/WebUtility.java =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/util/WebUtility.java (.../WebUtility.java) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/util/WebUtility.java (.../WebUtility.java) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -37,6 +37,7 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.exception.ToolException; +import org.lamsfoundation.lams.tool.mdasgm.service.MdlAssignmentService; 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(MdlAssignmentService.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_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/actions/AdminAction.java =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/actions/AdminAction.java (.../AdminAction.java) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/actions/AdminAction.java (.../AdminAction.java) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -1,16 +1,18 @@ package org.lamsfoundation.lams.tool.mdasgm.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.mdasgm.model.MdlAssignmentConfigItem; +import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.tool.mdasgm.service.IMdlAssignmentService; import org.lamsfoundation.lams.tool.mdasgm.service.MdlAssignmentServiceProxy; -import org.lamsfoundation.lams.tool.mdasgm.util.MdlAssignmentConstants; import org.lamsfoundation.lams.tool.mdasgm.web.forms.AdminForm; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.web.action.LamsDispatchAction; @@ -32,63 +34,68 @@ HttpServletResponse response) { // set up mdlAssignmentService if (mdlAssignmentService == null) { - mdlAssignmentService = MdlAssignmentServiceProxy.getMdlAssignmentService(this.getServlet().getServletContext()); + mdlAssignmentService = MdlAssignmentServiceProxy.getMdlAssignmentService(this.getServlet() + .getServletContext()); } AdminForm adminForm = (AdminForm) form; if (toolService == null) { toolService = mdlAssignmentService.getToolService(); } - Tool tool = toolService.getPersistToolBySignature(MdlAssignmentConstants.TOOL_SIGNATURE); - MdlAssignmentConfigItem toolAdpServlet = mdlAssignmentService.getConfigItem(MdlAssignmentConfigItem.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 = mdlAssignmentService.getExtServerList(); + List mappedServers = mdlAssignmentService.getMappedServers(); + populateServerList(adminForm, serverList, mappedServers); - MdlAssignmentConfigItem extServerConfig = mdlAssignmentService.getConfigItem(MdlAssignmentConfigItem.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 mdlAssignmentService - if (mdlAssignmentService == null) { - mdlAssignmentService = MdlAssignmentServiceProxy.getMdlAssignmentService(this.getServlet().getServletContext()); - } + // set up mdlAssignmentService + if (mdlAssignmentService == null) { + mdlAssignmentService = MdlAssignmentServiceProxy.getMdlAssignmentService(this.getServlet() + .getServletContext()); + } + + // Save all the mappings + mdlAssignmentService.saveServerMappings(adminForm.getMappedServers()); - MdlAssignmentConfigItem servletConfig = mdlAssignmentService - .getConfigItem(MdlAssignmentConfigItem.KEY_EXTERNAL_TOOL_SERVLET); - servletConfig.setConfigValue(adminForm.getToolAdapterServlet()); - mdlAssignmentService.saveOrUpdateMdlAssignmentConfigItem(servletConfig); + // Get a list of possible external servers to enable this tool for + List serverList = mdlAssignmentService.getExtServerList(); + List mappedServers = mdlAssignmentService.getMappedServers(); + populateServerList(adminForm, serverList, mappedServers); - MdlAssignmentConfigItem extServerConfig = mdlAssignmentService - .getConfigItem(MdlAssignmentConfigItem.KEY_EXTERNAL_SERVER_URL); - extServerConfig.setConfigValue(adminForm.getExtServerUrl()); - mdlAssignmentService.saveOrUpdateMdlAssignmentConfigItem(extServerConfig); + return mapping.findForward("config"); - if (toolService == null) { - toolService = mdlAssignmentService.getToolService(); - } - Tool tool = toolService.getPersistToolBySignature(MdlAssignmentConstants.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_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/actions/AuthoringAction.java =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -38,7 +38,6 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignment; -import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentConfigItem; import org.lamsfoundation.lams.tool.mdasgm.service.IMdlAssignmentService; import org.lamsfoundation.lams.tool.mdasgm.service.MdlAssignmentServiceProxy; import org.lamsfoundation.lams.tool.mdasgm.util.MdlAssignmentConstants; @@ -96,7 +95,8 @@ // set up mdlAssignmentService if (mdlAssignmentService == null) { - mdlAssignmentService = MdlAssignmentServiceProxy.getMdlAssignmentService(this.getServlet().getServletContext()); + mdlAssignmentService = MdlAssignmentServiceProxy.getMdlAssignmentService(this.getServlet() + .getServletContext()); } // retrieving MdlAssignment with given toolContentID @@ -108,19 +108,21 @@ String userFromCSV = null; String courseFromCSV = null; String sectionFromCSV = null; + String extLmsIdFromCSV = null; if (customCSV == null && mdlAssignment == null) { logger.error("CustomCSV required if mdlAssignment is null"); throw new ToolException("CustomCSV required if mdlAssignment is null"); } else if (customCSV != null) { String splitCSV[] = customCSV.split(","); - if (splitCSV.length != 3) { + if (splitCSV.length != 4) { logger.error("mdlAssignment tool customCSV not in required (user,course,courseURL) form: " + customCSV); throw new ToolException("mdlAssignment tool cusomCSV not in required (user,course,courseURL) form: " + customCSV); } else { userFromCSV = splitCSV[0]; courseFromCSV = splitCSV[1]; sectionFromCSV = splitCSV[2]; + extLmsIdFromCSV = splitCSV[3]; } } @@ -130,8 +132,17 @@ mdlAssignment.setExtCourseId(courseFromCSV); mdlAssignment.setExtSection(sectionFromCSV); mdlAssignment.setCreateDate(new Date()); + mdlAssignment.setExtLmsId(extLmsIdFromCSV); } + if (mdlAssignment.getExtLmsId() == null) { + mdlAssignment.setExtUsername(userFromCSV); + mdlAssignment.setExtCourseId(courseFromCSV); + mdlAssignment.setExtSection(sectionFromCSV); + mdlAssignment.setExtLmsId(extLmsIdFromCSV); + mdlAssignment.setCreateDate(new Date()); + } + if (mode != null && mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we @@ -144,20 +155,18 @@ try { // If the mdlAssignment has a saved course url, use it, otherwise use the one giving in the request in customCSV - //String courseUrlToBeUsed = (mdlAssignment.getExtCourseUrl() != null) ? mdlAssignment.getExtCourseUrl() : courseUrlFromCSV; - - String responseUrl = mdlAssignmentService.getConfigItem(MdlAssignmentConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); + String responseUrl = mdlAssignmentService.getExtServerUrl(mdlAssignment.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"); - + responseUrl += "&lamsUpdateURL=" + returnUpdateUrl; - + String encodedMoodleRelativePath = URLEncoder.encode(MOODLE_EDIT_URL, "UTF8"); - - responseUrl += "&dest=" + encodedMoodleRelativePath ; + responseUrl += "&dest=" + encodedMoodleRelativePath; + if (mdlAssignment.getExtSection() != null) { responseUrl += "§ion=" + mdlAssignment.getExtSection(); } else { @@ -201,9 +210,9 @@ mdlAssignmentService.saveOrUpdateMdlAssignment(mdlAssignment); String redirectString = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/" - + MdlAssignmentConstants.TOOL_SIGNATURE + "/clearsession.do" + "?action=confirm&mode=author" + "&signature=" - + MdlAssignmentConstants.TOOL_SIGNATURE + "&toolContentID=" + toolContentID.toString() + "&defineLater=no" - + "&customiseSessionID=" + "&contentFolderID=0"; + + MdlAssignmentConstants.TOOL_SIGNATURE + "/clearsession.do" + "?action=confirm&mode=author" + + "&signature=" + MdlAssignmentConstants.TOOL_SIGNATURE + "&toolContentID=" + toolContentID.toString() + + "&defineLater=no" + "&customiseSessionID=" + "&contentFolderID=0"; log.debug("Manual redirect for MdlAssignment to: " + redirectString); Index: tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/actions/LearningAction.java =================================================================== diff -u -r9a30c1bf0ba47c02d2a883e4ea9b3b3764ff5bca -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/actions/LearningAction.java (.../LearningAction.java) (revision 9a30c1bf0ba47c02d2a883e4ea9b3b3764ff5bca) +++ tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/actions/LearningAction.java (.../LearningAction.java) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -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.mdasgm.dto.MdlAssignmentDTO; import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignment; -import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentConfigItem; import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentSession; import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentUser; -import org.lamsfoundation.lams.tool.mdasgm.service.MdlAssignmentServiceProxy; import org.lamsfoundation.lams.tool.mdasgm.service.IMdlAssignmentService; +import org.lamsfoundation.lams.tool.mdasgm.service.MdlAssignmentServiceProxy; import org.lamsfoundation.lams.tool.mdasgm.util.MdlAssignmentConstants; import org.lamsfoundation.lams.tool.mdasgm.util.MdlAssignmentException; -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; @@ -75,10 +74,10 @@ + MdlAssignmentConstants.TOOL_SIGNATURE + "/"; //public static final String RELATIVE_LEARNER_URL = "mod/assignment/view.php?"; - + public static final String RELATIVE_LEARNER_URL = "course/lamsframes.php?"; public static final String MOODLE_VIEW_URL = "mod/assignment/view.php"; - public static final String RELATIVE_TEACHER_URL = "mod/assignment/submissions.php?"; + public static final String RELATIVE_TEACHER_URL = "mod/assignment/submissions.php?"; private IMdlAssignmentService mdlAssignmentService; @@ -89,11 +88,12 @@ // set up mdlAssignmentService if (mdlAssignmentService == null) { - mdlAssignmentService = MdlAssignmentServiceProxy.getMdlAssignmentService(this.getServlet().getServletContext()); + mdlAssignmentService = MdlAssignmentServiceProxy.getMdlAssignmentService(this.getServlet() + .getServletContext()); } // Retrieve the session and content. - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, false); + ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, false); MdlAssignmentSession mdlAssignmentSession = mdlAssignmentService.getSessionBySessionId(toolSessionID); if (mdlAssignmentSession == null) { throw new MdlAssignmentException("Cannot retreive session with toolSessionID: " + toolSessionID); @@ -123,31 +123,24 @@ if (mdlAssignment.getExtToolContentId() != null) { try { - String responseUrl = mdlAssignmentService.getConfigItem(MdlAssignmentConfigItem.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; - } + String responseUrl = mdlAssignmentService.getExtServerUrl(mdlAssignment.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=" + mdlAssignmentSession.getExtSessionId() + "&returnUrl=" + returnUrl - + "&dest=" + encodedMoodleRelativePath + "&is_learner=1"+ "&isFinished=" + mdlAssignmentUser.isFinishedActivity(); - + responseUrl += "&id=" + mdlAssignmentSession.getExtSessionId() + "&returnUrl=" + returnUrl + "&dest=" + + encodedMoodleRelativePath + "&is_learner=1" + "&isFinished=" + + mdlAssignmentUser.isFinishedActivity(); log.debug("Redirecting for mdl assignment learner: " + responseUrl); response.sendRedirect(responseUrl); @@ -164,8 +157,8 @@ UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); // attempt to retrieve user using userId and toolSessionId - MdlAssignmentUser mdlAssignmentUser = mdlAssignmentService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()), - toolSessionId); + MdlAssignmentUser mdlAssignmentUser = mdlAssignmentService.getUserByUserIdAndSessionId(new Long(user + .getUserID().intValue()), toolSessionId); if (mdlAssignmentUser == null) { MdlAssignmentSession mdlAssignmentSession = mdlAssignmentService.getSessionBySessionId(toolSessionId); Index: tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/actions/MonitoringAction.java =================================================================== diff -u -rfe8df3c212f840b465ac683100c1374df889ff9a -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision fe8df3c212f840b465ac683100c1374df889ff9a) +++ tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -37,7 +37,6 @@ import org.lamsfoundation.lams.tool.mdasgm.dto.MdlAssignmentDTO; import org.lamsfoundation.lams.tool.mdasgm.dto.MdlAssignmentSessionDTO; import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignment; -import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentConfigItem; import org.lamsfoundation.lams.tool.mdasgm.service.IMdlAssignmentService; import org.lamsfoundation.lams.tool.mdasgm.service.MdlAssignmentServiceProxy; import org.lamsfoundation.lams.tool.mdasgm.util.MdlAssignmentConstants; @@ -90,15 +89,16 @@ for (MdlAssignmentSessionDTO sessionDTO : mdlAssignmentDT0.getSessionDTOs()) { try { - String responseUrl = mdlAssignmentService.getConfigItem(MdlAssignmentConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); + String responseUrl = mdlAssignmentService.getExtServerUrl(mdlAssignment.getExtLmsId()); + responseUrl += RELATIVE_MONITOR_URL; String returnUrl = TOOL_APP_URL + "learning.do?" + AttributeNames.PARAM_TOOL_SESSION_ID + "=" + sessionDTO.getSessionID().toString() + "&dispatch=finishActivity"; returnUrl = URLEncoder.encode(returnUrl, "UTF8"); - responseUrl += "&id=" + sessionDTO.getExtSessionID() + "&update=" + sessionDTO.getExtSessionID() + "&returnUrl=" + returnUrl; + responseUrl += "&id=" + sessionDTO.getExtSessionID() + "&update=" + sessionDTO.getExtSessionID() + + "&returnUrl=" + returnUrl; sessionDTO.setRunTimeUrl(responseUrl); } catch (UnsupportedEncodingException e) { @@ -116,7 +116,8 @@ */ private void setupService() { if (mdlAssignmentService == null) { - mdlAssignmentService = MdlAssignmentServiceProxy.getMdlAssignmentService(this.getServlet().getServletContext()); + mdlAssignmentService = MdlAssignmentServiceProxy.getMdlAssignmentService(this.getServlet() + .getServletContext()); } } } Index: tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/forms/AdminForm.java =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/forms/AdminForm.java (.../AdminForm.java) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/forms/AdminForm.java (.../AdminForm.java) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -14,42 +14,31 @@ 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[] 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_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/servlets/ExportServlet.java =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/src/java/org/lamsfoundation/lams/tool/mdasgm/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -41,10 +41,9 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.mdasgm.dto.MdlAssignmentDTO; import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignment; -import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentConfigItem; import org.lamsfoundation.lams.tool.mdasgm.model.MdlAssignmentSession; -import org.lamsfoundation.lams.tool.mdasgm.service.MdlAssignmentServiceProxy; import org.lamsfoundation.lams.tool.mdasgm.service.IMdlAssignmentService; +import org.lamsfoundation.lams.tool.mdasgm.service.MdlAssignmentServiceProxy; import org.lamsfoundation.lams.tool.mdasgm.util.MdlAssignmentException; import org.lamsfoundation.lams.tool.mdasgm.util.WebUtility; import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet; @@ -166,8 +165,8 @@ private void exportFileFromExternalServer(HttpServletRequest request, HttpServletResponse response, Long extToolSessionId, MdlAssignment mdlAssignment, String fullPath) throws Exception { - String exportPortFolioServletUrl = mdlAssignmentService.getConfigItem(MdlAssignmentConfigItem.KEY_EXTERNAL_TOOL_SERVLET) - .getConfigValue(); + + String exportPortFolioServletUrl = mdlAssignmentService.getExtServerUrl(mdlAssignment.getExtLmsId()); String extUsername = "user"; // setting user to arbitrary values since they are only used to construct the hash Index: tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -18,14 +18,14 @@ type="org.lamsfoundation.lams.tool.mdasgm.web.forms.MonitoringForm" /> - + @@ -61,13 +61,6 @@ /> - - + + + - Index: tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/web.xml =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/web.xml (.../web.xml) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/web.xml (.../web.xml) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -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/mdasgm/mdlAssignmentApplicationContext.xml - + + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.central + SystemSessionFilter @@ -34,7 +34,7 @@ sessionFactoryBeanName - mdlAssignmentSessionFactory + coreSessionFactory Index: tool_adapters/moodle/lams_tool_mdlassignment/web/pages/admin/config.jsp =================================================================== diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 --- tool_adapters/moodle/lams_tool_mdlassignment/web/pages/admin/config.jsp (.../config.jsp) (revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85) +++ tool_adapters/moodle/lams_tool_mdlassignment/web/pages/admin/config.jsp (.../config.jsp) (revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118) @@ -30,21 +30,19 @@ - - - - - - - - - - - - - -
+

+ +

+ + + + +
+ + +
+