Index: tool_adapters/moodle/lams_tool_mdlscorm/.classpath =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/.classpath,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlscorm/.classpath 6 Jan 2009 00:59:35 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlscorm/.classpath 24 Jun 2009 02:30:24 -0000 1.2 @@ -4,12 +4,12 @@ - - - - - - - + + + + + + + Index: tool_adapters/moodle/lams_tool_mdlscorm/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdscrm/model/MdlScorm.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdscrm/model/MdlScorm.hbm.xml,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlscorm/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdscrm/model/MdlScorm.hbm.xml 6 Jan 2009 00:59:35 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlscorm/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdscrm/model/MdlScorm.hbm.xml 24 Jun 2009 02:30:22 -0000 1.2 @@ -113,6 +113,15 @@ length="255" /> + + - - + @@ -56,10 +55,6 @@ - - - - Fisheye: Tag 1.2 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/dao/IMdlScormConfigItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/dao/hibernate/MdlScormConfigItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/model/MdlScorm.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/model/MdlScorm.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/model/MdlScorm.java 6 Jan 2009 00:59:35 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/model/MdlScorm.java 24 Jun 2009 02:30:24 -0000 1.2 @@ -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; @@ -228,10 +230,18 @@ this.extSection = extSection; } - public static long getSerialVersionUID() { - return serialVersionUID; + /** + * @hibernate.property column="ext_lms_id" length="255" + * @return + */ + public String getExtLmsId() { + return extLmsId; } + public void setExtLmsId(String extLmsId) { + this.extLmsId = extLmsId; + } + /** * @hibernate.set lazy="true" inverse="true" cascade="none" * @hibernate.collection-key column="mdlscorm_uid" @@ -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 1.2 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/model/MdlScormConfigItem.java'. Fisheye: No comparison available. Pass `N' to diff? Index: tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/service/IMdlScormService.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/service/IMdlScormService.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/service/IMdlScormService.java 6 Jan 2009 00:59:35 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/service/IMdlScormService.java 24 Jun 2009 02:30:22 -0000 1.2 @@ -25,10 +25,11 @@ package org.lamsfoundation.lams.tool.mdscrm.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.mdscrm.model.MdlScorm; -import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormConfigItem; import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormSession; import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormUser; import org.lamsfoundation.lams.tool.mdscrm.util.MdlScormException; @@ -96,22 +97,7 @@ public void saveOrUpdateMdlScormSession(MdlScormSession mdlScormSession); /** - * Get the mdlScorm config item by key * - * @param key - * @return - */ - public MdlScormConfigItem getConfigItem(String key); - - /** - * Save a mdl configItem - * - * @param item - */ - public void saveOrUpdateMdlScormConfigItem(MdlScormConfigItem item); - - /** - * * @param userId * @param toolSessionId * @return @@ -126,13 +112,6 @@ public MdlScormUser 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 @@ -186,8 +165,8 @@ /** * Constructs a parameter hashmap to be used for the default parameters * required by the external LMS tool adapter servlet. For instance in - * mdlScorm, this constructs the following: - * { ["un", username], ["cs", course], ["ts", timestamp], ["hs", hash], } + * mdlScorm, this constructs the following: { ["un", username], ["cs", + * course], ["ts", timestamp], ["hs", hash], } * * @param mdlScorm * @return @@ -197,12 +176,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 mdlScorm, this constructs the following: - * { ["un", username], ["cs", course], ["ts", timestamp], ["hs", hash], } + * instance in mdlScorm, 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_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/service/MdlScormService.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/service/MdlScormService.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/service/MdlScormService.java 6 Jan 2009 00:59:35 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/service/MdlScormService.java 24 Jun 2009 02:30:22 -0000 1.2 @@ -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.mdscrm.dao.IMdlScormConfigItemDAO; +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.mdscrm.dao.IMdlScormDAO; import org.lamsfoundation.lams.tool.mdscrm.dao.IMdlScormSessionDAO; import org.lamsfoundation.lams.tool.mdscrm.dao.IMdlScormUserDAO; import org.lamsfoundation.lams.tool.mdscrm.model.MdlScorm; -import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormConfigItem; import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormSession; import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormUser; import org.lamsfoundation.lams.tool.mdscrm.util.MdlScormConstants; import org.lamsfoundation.lams.tool.mdscrm.util.MdlScormException; import org.lamsfoundation.lams.tool.mdscrm.util.MdlScormToolContentHandler; import org.lamsfoundation.lams.tool.mdscrm.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 IMdlScormService 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 IMdlScormDAO mdlScormDAO = null; @@ -131,8 +123,6 @@ private IMdlScormUserDAO mdlScormUserDAO = null; - private IMdlScormConfigItemDAO mdlScormConfigItemDAO = null; - private ILearnerService learnerService; private ILamsToolService toolService; @@ -192,8 +182,7 @@ */ public Long copyExternalToolContent(HashMap params) throws ToolException, Exception { - String cloneServletUrl = mdlScormConfigItemDAO.getConfigItemByKey(MdlScormConfigItem.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, mdlscorm.getExtUsername()); params.put(EXT_SERVER_PARAM_COURSE, mdlscorm.getExtCourseId()); params.put(EXT_SERVER_PARAM_SECTION, mdlscorm.getExtSection()); + params.put(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID, mdlscorm.getExtLmsId()); String timestamp = Long.toString(new Date().getTime()); params.put(EXT_SERVER_PARAM_TIMESTAMP, timestamp); - ExtServerOrgMap serverMap = this.getExtServerOrgMap(); + ExtServerOrgMap serverMap = getExtServerOrgMap(mdlscorm.getExtLmsId()); String hash = hash(serverMap, mdlscorm.getExtUsername(), timestamp); params.put(EXT_SERVER_PARAM_HASH, hash); @@ -253,6 +244,7 @@ map.put(CUSTOM_CSV_MAP_PARAM_USER, split[0]); map.put(CUSTOM_CSV_MAP_PARAM_COURSE, split[1]); map.put(CUSTOM_CSV_MAP_PARAM_SECTION, split[2]); + map.put(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID, split[3]); return map; } else { return null; @@ -262,13 +254,12 @@ public int getExternalToolOutputInt(String outputName, MdlScorm mdlScorm, Long userId, String extToolContentId, Long toolSessionId) { MdlScormUser user = this.getUserByUserIdAndSessionId(userId, toolSessionId); - ExtServerOrgMap extServerMap = getExtServerOrgMap(); + ExtServerOrgMap extServerMap = getExtServerOrgMap(mdlScorm.getExtLmsId()); String extUserName = user.getLoginName().substring(extServerMap.getPrefix().length() + 1); try { - String outputServletUrl = mdlScormConfigItemDAO.getConfigItemByKey( - MdlScormConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String outputServletUrl = getExtToolAdapterServletUrl(mdlScorm.getExtLmsId()); // setting the mdlScorm username so the params are set up correctly mdlScorm.setExtUsername(extUserName); @@ -339,6 +330,27 @@ return mdlScormOutputFactory.getToolOutputDefinitions(mdscrm); } + 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 += MdlScormConstants.RELATIVE_SERVLET_URL; + } + return ret; + } + + public ExtServerOrgMap getExtServerOrgMap(String extLmsId) { + return integrationService.getExtServerOrgMap(extLmsId); + } + public String hash(ExtServerOrgMap serverMap, String extUsername, String timestamp) { String serverId = serverMap.getServerid(); String serverKey = serverMap.getServerkey(); @@ -390,25 +402,6 @@ fromContent = getDefaultContent(); } MdlScorm toContent = MdlScorm.newInstance(fromContent, toContentId, mdlScormToolContentHandler); - - // 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); - }*/ - mdlScormDAO.saveOrUpdate(toContent); } @@ -451,7 +444,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"); @@ -539,36 +532,39 @@ String toolPath = FileUtil.getFullPath(rootPath, toolContentId.toString()); FileUtil.createDirectory(toolPath); - String exportServletUrl = mdlScormConfigItemDAO.getConfigItemByKey( - MdlScormConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String exportServletUrl = getExtToolAdapterServletUrl(mdlScorm.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 + mdlScorm.setExtCourseId("extCourse"); + mdlScorm.setExtSection("0"); + mdlScorm.setExtUsername("authUser"); + HashMap params = this.getRequiredExtServletParams(mdlScorm); + params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT); + params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, mdlScorm.getExtToolContentId().toString()); - mdlScorm.setExtCourseId("extCourse"); - mdlScorm.setExtSection("0"); - mdlScorm.setExtUsername("authUser"); - HashMap params = this.getRequiredExtServletParams(mdlScorm); - params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT); - params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, mdlScorm.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 mdlScorm 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, mdlScorm, mdlScormToolContentHandler, + rootPath); } - logger.debug("Path to mdlScorm 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 +580,6 @@ } - public ExtServerOrgMap getExtServerOrgMap() { - if (integrationService == null) - integrationService = getIntegrationService(); - IToolVO tool = toolService.getToolBySignature(MdlScormConstants.TOOL_SIGNATURE); - return integrationService.getExtServerOrgMap(tool.getExtLmsId()); - } - /** * Import the XML fragment for the tool's content, along with any files * needed for the content. @@ -608,10 +597,6 @@ if (extExportFile.exists()) { try { - - String importServletUrl = mdlScormConfigItemDAO.getConfigItemByKey( - MdlScormConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); - if (customCSV == null) { logger.error("Could not retrieve customCSV required for importing tool adapter tool. CustomCSV: " + customCSV); @@ -620,6 +605,9 @@ + customCSV); } + HashMap customCSVMap = decodeCustomCSV(customCSV); + String importServletUrl = getExtToolAdapterServletUrl(customCSVMap.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID)); + HashMap params = getRequiredExtServletParams(customCSV); params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_IMPORT); @@ -675,17 +663,13 @@ } public MdlScorm getDefaultContent() { - /* - Long defaultContentID = getDefaultContentIdBySignature(MdlScormConstants.TOOL_SIGNATURE); - MdlScorm defaultContent = getMdlScormByContentId(defaultContentID); - if (defaultContent == null) { - String error = "Could not retrieve default content record for this tool"; - logger.error(error); - throw new MdlScormException(error); - } + MdlScorm defaultContent = new MdlScorm(); return defaultContent; - */ + } + + public MdlScorm getDefaultContent(String extLmsId) { MdlScorm defaultContent = new MdlScorm(); + defaultContent.setExtLmsId(extLmsId); return defaultContent; } @@ -705,6 +689,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(MdlScormConstants.TOOL_SIGNATURE); + } + + public void saveServerMappings(String[] mappedServers) { + Tool tool = toolService.getPersistToolBySignature(MdlScormConstants.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(), MdlScormConstants.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 MdlScorm getMdlScormByContentId(Long toolContentID) { MdlScorm mdlScorm = (MdlScorm) mdlScormDAO.getByContentId(toolContentID); if (mdlScorm == null) { @@ -713,14 +748,6 @@ return mdlScorm; } - public MdlScormConfigItem getConfigItem(String key) { - return mdlScormConfigItemDAO.getConfigItemByKey(key); - } - - public void saveOrUpdateMdlScormConfigItem(MdlScormConfigItem item) { - mdlScormConfigItemDAO.saveOrUpdate(item); - } - public MdlScormSession getSessionBySessionId(Long toolSessionId) { MdlScormSession mdlScormSession = mdlScormSessionDAO.getBySessionId(toolSessionId); if (mdlScormSession == null) { @@ -850,14 +877,6 @@ this.mdlScormDAO = mdlScormDAO; } - public IMdlScormConfigItemDAO getMdlScormConfigItemDAO() { - return mdlScormConfigItemDAO; - } - - public void setMdlScormConfigItemDAO(IMdlScormConfigItemDAO mdlScormConfigItemDAO) { - this.mdlScormConfigItemDAO = mdlScormConfigItemDAO; - } - public IToolContentHandler getMdlScormToolContentHandler() { return mdlScormToolContentHandler; } @@ -925,34 +944,8 @@ this.mdlScormOutputFactory = mdlScormOutputFactory; } - /** - * 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/mdscrm/mdlScormApplicationContext.xml", - "/org/lamsfoundation/lams/commonContext.xml" }; - - ApplicationContext context = new ClassPathXmlApplicationContext(contexts); - - if (context == null) - throw new MdlScormException( - "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_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/util/MdlScormConstants.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/util/MdlScormConstants.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/util/MdlScormConstants.java 6 Jan 2009 00:59:35 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/util/MdlScormConstants.java 24 Jun 2009 02:30:23 -0000 1.2 @@ -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_scorm.php"; } Index: tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/util/WebUtility.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/util/WebUtility.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/util/WebUtility.java 6 Jan 2009 00:59:35 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/util/WebUtility.java 24 Jun 2009 02:30:23 -0000 1.2 @@ -37,6 +37,7 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.exception.ToolException; +import org.lamsfoundation.lams.tool.mdscrm.service.MdlScormService; 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(MdlScormService.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_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/AdminAction.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/AdminAction.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/AdminAction.java 6 Jan 2009 00:59:35 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/AdminAction.java 24 Jun 2009 02:30:23 -0000 1.2 @@ -1,16 +1,18 @@ package org.lamsfoundation.lams.tool.mdscrm.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.mdscrm.model.MdlScormConfigItem; +import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.tool.mdscrm.service.IMdlScormService; import org.lamsfoundation.lams.tool.mdscrm.service.MdlScormServiceProxy; -import org.lamsfoundation.lams.tool.mdscrm.util.MdlScormConstants; import org.lamsfoundation.lams.tool.mdscrm.web.forms.AdminForm; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.web.action.LamsDispatchAction; @@ -37,58 +39,54 @@ AdminForm adminForm = (AdminForm) form; - if (toolService == null) { - toolService = mdlScormService.getToolService(); - } - Tool tool = toolService.getPersistToolBySignature(MdlScormConstants.TOOL_SIGNATURE); + // Get a list of possible external servers to enable this tool for + List serverList = mdlScormService.getExtServerList(); + List mappedServers = mdlScormService.getMappedServers(); + populateServerList(adminForm, serverList, mappedServers); - MdlScormConfigItem toolAdpServlet = mdlScormService.getConfigItem(MdlScormConfigItem.KEY_EXTERNAL_TOOL_SERVLET); - if (toolAdpServlet != null) - adminForm.setToolAdapterServlet(toolAdpServlet.getConfigValue()); - - MdlScormConfigItem extServerConfig = mdlScormService.getConfigItem(MdlScormConfigItem.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 mdlScormService - if (mdlScormService == null) { - mdlScormService = MdlScormServiceProxy.getMdlScormService(this.getServlet().getServletContext()); - } + // Save all the mappings + mdlScormService.saveServerMappings(adminForm.getMappedServers()); - MdlScormConfigItem servletConfig = mdlScormService - .getConfigItem(MdlScormConfigItem.KEY_EXTERNAL_TOOL_SERVLET); - servletConfig.setConfigValue(adminForm.getToolAdapterServlet()); - mdlScormService.saveOrUpdateMdlScormConfigItem(servletConfig); + // Get a list of possible external servers to enable this tool for + List serverList = mdlScormService.getExtServerList(); + List mappedServers = mdlScormService.getMappedServers(); + populateServerList(adminForm, serverList, mappedServers); - MdlScormConfigItem extServerConfig = mdlScormService - .getConfigItem(MdlScormConfigItem.KEY_EXTERNAL_SERVER_URL); - extServerConfig.setConfigValue(adminForm.getExtServerUrl()); - mdlScormService.saveOrUpdateMdlScormConfigItem(extServerConfig); - - if (toolService == null) { - toolService = mdlScormService.getToolService(); - } - Tool tool = toolService.getPersistToolBySignature(MdlScormConstants.TOOL_SIGNATURE); - tool.setExtLmsId(adminForm.getServerIdMapping()); - toolService.saveOrUpdateTool(tool); - return mapping.findForward("config"); - } else { - request.setAttribute("error", true); - return mapping.findForward("config"); + // set up mdlScormService + if (mdlScormService == null) { + mdlScormService = MdlScormServiceProxy.getMdlScormService(this.getServlet().getServletContext()); } + + return mapping.findForward("config"); + } } Index: tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/AuthoringAction.java,v diff -u -r1.2 -r1.3 --- tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/AuthoringAction.java 12 Jan 2009 05:39:44 -0000 1.2 +++ tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/AuthoringAction.java 24 Jun 2009 02:30:23 -0000 1.3 @@ -38,7 +38,6 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.mdscrm.model.MdlScorm; -import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormConfigItem; import org.lamsfoundation.lams.tool.mdscrm.service.IMdlScormService; import org.lamsfoundation.lams.tool.mdscrm.service.MdlScormServiceProxy; import org.lamsfoundation.lams.tool.mdscrm.util.MdlScormConstants; @@ -108,19 +107,21 @@ String userFromCSV = null; String courseFromCSV = null; String sectionFromCSV = null; + String extLmsIdFromCSV = null; if (customCSV == null && mdlScorm == null) { logger.error("CustomCSV required if mdlScorm is null"); throw new ToolException("CustomCSV required if mdlScorm is null"); } else if (customCSV != null) { String splitCSV[] = customCSV.split(","); - if (splitCSV.length != 3) { + if (splitCSV.length != 4) { logger.error("mdlScorm tool customCSV not in required (user,course,courseURL) form: " + customCSV); throw new ToolException("mdlScorm tool cusomCSV not in required (user,course,courseURL) form: " + customCSV); } else { userFromCSV = splitCSV[0]; courseFromCSV = splitCSV[1]; sectionFromCSV = splitCSV[2]; + extLmsIdFromCSV = splitCSV[3]; } } @@ -129,9 +130,18 @@ mdlScorm.setExtUsername(userFromCSV); mdlScorm.setExtCourseId(courseFromCSV); mdlScorm.setExtSection(sectionFromCSV); + mdlScorm.setExtLmsId(extLmsIdFromCSV); mdlScorm.setCreateDate(new Date()); } + if (mdlScorm.getExtLmsId() == null) { + mdlScorm.setExtUsername(userFromCSV); + mdlScorm.setExtCourseId(courseFromCSV); + mdlScorm.setExtSection(sectionFromCSV); + mdlScorm.setExtLmsId(extLmsIdFromCSV); + mdlScorm.setCreateDate(new Date()); + } + if (mode != null && mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we @@ -144,20 +154,18 @@ try { // If the mdlScorm has a saved course url, use it, otherwise use the one giving in the request in customCSV - //String courseUrlToBeUsed = (mdlScorm.getExtCourseUrl() != null) ? mdlScorm.getExtCourseUrl() : courseUrlFromCSV; - - String responseUrl = mdlScormService.getConfigItem(MdlScormConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); + String responseUrl = mdlScormService.getExtServerUrl(mdlScorm.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 (mdlScorm.getExtSection() != null) { responseUrl += "§ion=" + mdlScorm.getExtSection(); } else { Index: tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/LearningAction.java,v diff -u -r1.2 -r1.3 --- tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/LearningAction.java 13 Jan 2009 22:36:39 -0000 1.2 +++ tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/LearningAction.java 24 Jun 2009 02:30:23 -0000 1.3 @@ -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.mdscrm.dto.MdlScormDTO; import org.lamsfoundation.lams.tool.mdscrm.model.MdlScorm; -import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormConfigItem; import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormSession; import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormUser; -import org.lamsfoundation.lams.tool.mdscrm.service.MdlScormServiceProxy; import org.lamsfoundation.lams.tool.mdscrm.service.IMdlScormService; +import org.lamsfoundation.lams.tool.mdscrm.service.MdlScormServiceProxy; import org.lamsfoundation.lams.tool.mdscrm.util.MdlScormConstants; import org.lamsfoundation.lams.tool.mdscrm.util.MdlScormException; -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 @@ + MdlScormConstants.TOOL_SIGNATURE + "/"; //public static final String RELATIVE_LEARNER_URL = "mod/scorm/view.php?"; - + public static final String RELATIVE_LEARNER_URL = "course/lamsframes.php?"; public static final String MOODLE_VIEW_URL = "mod/scorm/view.php"; - public static final String RELATIVE_TEACHER_URL = "mod/scorm/report.php?"; + public static final String RELATIVE_TEACHER_URL = "mod/scorm/report.php?"; private IMdlScormService mdlScormService; @@ -93,7 +92,7 @@ } // Retrieve the session and content. - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, false); + ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, false); MdlScormSession mdlScormSession = mdlScormService.getSessionBySessionId(toolSessionID); if (mdlScormSession == null) { throw new MdlScormException("Cannot retreive session with toolSessionID: " + toolSessionID); @@ -123,31 +122,24 @@ if (mdlScorm.getExtToolContentId() != null) { try { - String responseUrl = mdlScormService.getConfigItem(MdlScormConfigItem.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 = mdlScormService.getExtServerUrl(mdlScorm.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=" + mdlScormSession.getExtSessionId() + "&returnUrl=" + returnUrl - + "&dest=" + encodedMoodleRelativePath + "&is_learner=1"+ "&isFinished=" + mdlScormUser.isFinishedActivity(); - + responseUrl += "&id=" + mdlScormSession.getExtSessionId() + "&returnUrl=" + returnUrl + "&dest=" + + encodedMoodleRelativePath + "&is_learner=1" + "&isFinished=" + + mdlScormUser.isFinishedActivity(); log.debug("Redirecting for mdl scorm learner: " + responseUrl); response.sendRedirect(responseUrl); Index: tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/MonitoringAction.java,v diff -u -r1.2 -r1.3 --- tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/MonitoringAction.java 12 Jan 2009 05:38:46 -0000 1.2 +++ tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/actions/MonitoringAction.java 24 Jun 2009 02:30:23 -0000 1.3 @@ -37,7 +37,6 @@ import org.lamsfoundation.lams.tool.mdscrm.dto.MdlScormDTO; import org.lamsfoundation.lams.tool.mdscrm.dto.MdlScormSessionDTO; import org.lamsfoundation.lams.tool.mdscrm.model.MdlScorm; -import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormConfigItem; import org.lamsfoundation.lams.tool.mdscrm.service.IMdlScormService; import org.lamsfoundation.lams.tool.mdscrm.service.MdlScormServiceProxy; import org.lamsfoundation.lams.tool.mdscrm.util.MdlScormConstants; @@ -90,15 +89,15 @@ for (MdlScormSessionDTO sessionDTO : mdlScormDT0.getSessionDTOs()) { try { - String responseUrl = mdlScormService.getConfigItem(MdlScormConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); + String responseUrl = mdlScormService.getExtServerUrl(mdlScorm.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 += "&update=" + sessionDTO.getExtSessionID()+"&id=" + sessionDTO.getExtSessionID() + "&returnUrl=" + returnUrl; + responseUrl += "&update=" + sessionDTO.getExtSessionID() + "&id=" + sessionDTO.getExtSessionID() + + "&returnUrl=" + returnUrl; sessionDTO.setRunTimeUrl(responseUrl); } catch (UnsupportedEncodingException e) { Index: tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/forms/AdminForm.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/forms/AdminForm.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/forms/AdminForm.java 6 Jan 2009 00:59:35 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/forms/AdminForm.java 24 Jun 2009 02:30:24 -0000 1.2 @@ -14,9 +14,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) { @@ -25,31 +24,20 @@ 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_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/servlets/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/servlets/ExportServlet.java,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/servlets/ExportServlet.java 6 Jan 2009 00:59:35 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlscorm/src/java/org/lamsfoundation/lams/tool/mdscrm/web/servlets/ExportServlet.java 24 Jun 2009 02:30:22 -0000 1.2 @@ -41,10 +41,9 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.mdscrm.dto.MdlScormDTO; import org.lamsfoundation.lams.tool.mdscrm.model.MdlScorm; -import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormConfigItem; import org.lamsfoundation.lams.tool.mdscrm.model.MdlScormSession; -import org.lamsfoundation.lams.tool.mdscrm.service.MdlScormServiceProxy; import org.lamsfoundation.lams.tool.mdscrm.service.IMdlScormService; +import org.lamsfoundation.lams.tool.mdscrm.service.MdlScormServiceProxy; import org.lamsfoundation.lams.tool.mdscrm.util.MdlScormException; import org.lamsfoundation.lams.tool.mdscrm.util.WebUtility; import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet; @@ -166,8 +165,7 @@ private void exportFileFromExternalServer(HttpServletRequest request, HttpServletResponse response, Long extToolSessionId, MdlScorm mdlScorm, String fullPath) throws Exception { - String exportPortFolioServletUrl = mdlScormService.getConfigItem(MdlScormConfigItem.KEY_EXTERNAL_TOOL_SERVLET) - .getConfigValue(); + String exportPortFolioServletUrl = mdlScormService.getExtServerUrl(mdlScorm.getExtLmsId()); String extUsername = "user"; // setting user to arbitrary values since they are only used to construct the hash Index: tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/web.xml,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/web.xml 6 Jan 2009 00:59:35 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/web.xml 24 Jun 2009 02:30:25 -0000 1.2 @@ -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/mdscrm/mdlScormApplicationContext.xml - + + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.central + SystemSessionFilter @@ -34,7 +34,7 @@ sessionFactoryBeanName - mdlScormSessionFactory + coreSessionFactory Index: tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/struts/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/struts/struts-config.xml,v diff -u -r1.1 -r1.2 --- tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/struts/struts-config.xml 6 Jan 2009 00:59:35 -0000 1.1 +++ tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/struts/struts-config.xml 24 Jun 2009 02:30:24 -0000 1.2 @@ -14,21 +14,21 @@ - + @@ -46,6 +46,31 @@ + + + + + - - - - - - - - - - - - - - - - - - -
+

+ +

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