Index: tool_adapters/moodle/lams_tool_mdlglossary/.classpath =================================================================== diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/.classpath (.../.classpath) (revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b) +++ tool_adapters/moodle/lams_tool_mdlglossary/.classpath (.../.classpath) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -3,13 +3,13 @@ - - - - - - - + + + + + + + Fisheye: Tag fa37195a28464d5c7753243498cce58c46084240 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlglossary/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdglos/model/MdlGlossaryConfigItem.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fa37195a28464d5c7753243498cce58c46084240 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlglossary/conf/language/ApplicationResources.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: tool_adapters/moodle/lams_tool_mdlglossary/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rce463d39fcd1ed84c6959bcf3215ab9552aca31c -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision ce463d39fcd1ed84c6959bcf3215ab9552aca31c) +++ tool_adapters/moodle/lams_tool_mdlglossary/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -11,9 +11,7 @@ activity.description =Moodle Glossary Tool pageTitle.authoring =Moodle Glossary Authoring pageTitle.admin =Moodle Glossary Configuration -admin.extToolAdapterServletUrl =External tool adapter servlet URL -admin.extServerId =External server id mapping -admin.extServerUrl =External server url +admin.enableForIntegratedServers =Enable/disable servers for this Tool Adapter admin.formError =There was an error processing the form, please ensure both fields are filled and click save again. admin.return =Return to maintain LAMS monitor.sessions =Sessions @@ -43,4 +41,4 @@ error.defineLater =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity. learner.number.of.entries = Learner's number of entries learner.number.of.comments =Learner's number of comments -#======= End labels ===== +#======= End labels ===== \ No newline at end of file Index: tool_adapters/moodle/lams_tool_mdlglossary/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rce463d39fcd1ed84c6959bcf3215ab9552aca31c -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision ce463d39fcd1ed84c6959bcf3215ab9552aca31c) +++ tool_adapters/moodle/lams_tool_mdlglossary/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -11,9 +11,7 @@ activity.description =Moodle Glossary Tool pageTitle.authoring =Moodle Glossary Authoring pageTitle.admin =Moodle Glossary Configuration -admin.extToolAdapterServletUrl =External tool adapter servlet URL -admin.extServerId =External server id mapping -admin.extServerUrl =External server url +admin.enableForIntegratedServers =Enable/disable servers for this Tool Adapter admin.formError =There was an error processing the form, please ensure both fields are filled and click save again. admin.return =Return to maintain LAMS monitor.sessions =Sessions Index: tool_adapters/moodle/lams_tool_mdlglossary/conf/language/rams/ApplicationResources.properties =================================================================== diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/conf/language/rams/ApplicationResources.properties (.../ApplicationResources.properties) (revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b) +++ tool_adapters/moodle/lams_tool_mdlglossary/conf/language/rams/ApplicationResources.properties (.../ApplicationResources.properties) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -11,9 +11,7 @@ activity.description =Moodle Glossary Tool pageTitle.authoring =Moodle Glossary Authoring pageTitle.admin =Moodle Glossary Configuration -admin.extToolAdapterServletUrl =External tool adapter servlet URL -admin.extServerId =External server id mapping -admin.extServerUrl =External server url +admin.enableForIntegratedServers =Enable/disable servers for this Tool Adapter admin.formError =There was an error processing the form, please ensure both fields are filled and click save again. admin.return =Return to maintain LAMS monitor.sessions =Sessions @@ -41,5 +39,6 @@ label.save =Save label.cancel =Cancel error.defineLater =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity. - +learner.number.of.entries = Learner's number of entries +learner.number.of.comments =Learner's number of comments #======= End labels ===== Index: tool_adapters/moodle/lams_tool_mdlglossary/conf/language/rams/ApplicationResources_en_AU.properties =================================================================== diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/conf/language/rams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b) +++ tool_adapters/moodle/lams_tool_mdlglossary/conf/language/rams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -11,9 +11,7 @@ activity.description =Moodle Glossary Tool pageTitle.authoring =Moodle Glossary Authoring pageTitle.admin =Moodle Glossary Configuration -admin.extToolAdapterServletUrl =External tool adapter servlet URL -admin.extServerId =External server id mapping -admin.extServerUrl =External server url +admin.enableForIntegratedServers =Enable/disable servers for this Tool Adapter admin.formError =There was an error processing the form, please ensure both fields are filled and click save again. admin.return =Return to maintain LAMS monitor.sessions =Sessions @@ -41,5 +39,6 @@ label.save =Save label.cancel =Cancel error.defineLater =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity. - +learner.number.of.entries = Learner's number of entries +learner.number.of.comments =Learner's number of comments #======= End labels ===== Index: tool_adapters/moodle/lams_tool_mdlglossary/db/sql/create_lams_tool_mdlGlossary.sql =================================================================== diff -u -r457901bc825b33406a9f304ffed3cd170fb98de6 -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/db/sql/create_lams_tool_mdlGlossary.sql (.../create_lams_tool_mdlGlossary.sql) (revision 457901bc825b33406a9f304ffed3cd170fb98de6) +++ tool_adapters/moodle/lams_tool_mdlglossary/db/sql/create_lams_tool_mdlGlossary.sql (.../create_lams_tool_mdlGlossary.sql) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -1,35 +1,15 @@ -- CVS ID: $Id$ SET FOREIGN_KEY_CHECKS=0; -drop table if exists tl_mdglos10_configuration; drop table if exists tl_mdglos10_mdlglossary; drop table if exists tl_mdglos10_session; drop table if exists tl_mdglos10_user; -create table tl_mdglos10_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))TYPE=InnoDB; -create table tl_mdglos10_mdlglossary (uid bigint not null auto_increment, create_date datetime, update_date datetime, define_later bit, content_in_use bit, run_offline bit, tool_content_id bigint, ext_tool_content_id bigint, ext_user_name varchar(255), ext_course_id varchar(255), ext_section varchar(255), primary key (uid))TYPE=InnoDB; +create table tl_mdglos10_mdlglossary (uid bigint not null auto_increment, create_date datetime, update_date datetime, define_later bit, content_in_use bit, run_offline bit, tool_content_id bigint, ext_tool_content_id bigint, ext_user_name varchar(255), ext_lms_id varchar(255), ext_course_id varchar(255), ext_section varchar(255), primary key (uid))TYPE=InnoDB; create table tl_mdglos10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, ext_session_id bigint, session_name varchar(250), mdlglossary_uid bigint, primary key (uid))TYPE=InnoDB; create table tl_mdglos10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, mdlglossary_session_uid bigint, entry_uid bigint, primary key (uid))TYPE=InnoDB; -alter table tl_mdglos10_session add index FKBA4AC37B89669C81 (mdlglossary_uid), add constraint FKBA4AC37B89669C81 foreign key (mdlglossary_uid) references tl_mdglos10_mdlglossary (uid); -alter table tl_mdglos10_user add index FK1B25DD0618E034DA (mdlglossary_session_uid), add constraint FK1B25DD0618E034DA foreign key (mdlglossary_session_uid) references tl_mdglos10_session (uid); +alter table tl_mdglos10_session add index FKGLOSBA4AC37B89669C81 (mdlglossary_uid), add constraint FKGLOSBA4AC37B89669C81 foreign key (mdlglossary_uid) references tl_mdglos10_mdlglossary (uid); +alter table tl_mdglos10_user add index FKGLOS1B25DD0618E034DA (mdlglossary_session_uid), add constraint FKGLOS1B25DD0618E034DA foreign key (mdlglossary_session_uid) references tl_mdglos10_session (uid); -INSERT INTO tl_mdglos10_configuration ( - config_key, - config_value -) -VALUES( - "toolAdapterServlet", - "http://localhost:8000/lams2conf/tooladapter_mdglos10" -); - -INSERT INTO tl_mdglos10_configuration ( - config_key, - config_value -) -VALUES( - "extServerUrl", - "http://localhost/moodle19/" -); - INSERT INTO tl_mdglos10_mdlglossary ( tool_content_id, ext_tool_content_id, Fisheye: Tag fa37195a28464d5c7753243498cce58c46084240 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/dao/IMdlGlossaryConfigItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fa37195a28464d5c7753243498cce58c46084240 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/dao/hibernate/MdlGlossaryConfigItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/mdlGlossaryApplicationContext.xml =================================================================== diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/mdlGlossaryApplicationContext.xml (.../mdlGlossaryApplicationContext.xml) (revision b6544cfe682554653a9590c0bf74ed52186d71ff) +++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/mdlGlossaryApplicationContext.xml (.../mdlGlossaryApplicationContext.xml) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -19,10 +19,9 @@ - - + @@ -56,10 +55,6 @@ - - - - Index: tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/model/MdlGlossary.java =================================================================== diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/model/MdlGlossary.java (.../MdlGlossary.java) (revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b) +++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/model/MdlGlossary.java (.../MdlGlossary.java) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -48,6 +48,7 @@ private static final String CUSTOM_CSV_MAP_PARAM_USER = "user"; private static final String CUSTOM_CSV_MAP_PARAM_COURSE = "course"; private static final String CUSTOM_CSV_MAP_PARAM_SECTION = "section"; + private static final String CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID = "extlmsid"; // Fields /** @@ -65,6 +66,7 @@ private String extUsername; private String extCourseId; private String extSection; + private String extLmsId; //*********** NON Persistent fields private IToolContentHandler toolContentHandler; @@ -227,10 +229,19 @@ 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="mdlglossary_uid" @@ -316,5 +327,6 @@ this.extUsername = params.get(CUSTOM_CSV_MAP_PARAM_USER); this.extCourseId = params.get(CUSTOM_CSV_MAP_PARAM_COURSE); this.extSection = params.get(CUSTOM_CSV_MAP_PARAM_SECTION); + this.extLmsId = params.get(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID); } } Fisheye: Tag fa37195a28464d5c7753243498cce58c46084240 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/model/MdlGlossaryConfigItem.java'. Fisheye: No comparison available. Pass `N' to diff? Index: tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/service/IMdlGlossaryService.java =================================================================== diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/service/IMdlGlossaryService.java (.../IMdlGlossaryService.java) (revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b) +++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/service/IMdlGlossaryService.java (.../IMdlGlossaryService.java) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -25,10 +25,11 @@ package org.lamsfoundation.lams.tool.mdglos.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.mdglos.model.MdlGlossary; -import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryConfigItem; import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossarySession; import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryUser; import org.lamsfoundation.lams.tool.mdglos.util.MdlGlossaryException; @@ -96,22 +97,7 @@ public void saveOrUpdateMdlGlossarySession(MdlGlossarySession mdlGlossarySession); /** - * Get the mdlGlossary config item by key * - * @param key - * @return - */ - public MdlGlossaryConfigItem getConfigItem(String key); - - /** - * Save a mdl configItem - * - * @param item - */ - public void saveOrUpdateMdlGlossaryConfigItem(MdlGlossaryConfigItem item); - - /** - * * @param userId * @param toolSessionId * @return @@ -126,13 +112,6 @@ public MdlGlossaryUser 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 +151,8 @@ * @param toolSessionId * @return */ - public int getExternalToolOutputInt(String outputName, MdlGlossary mdlGlossary, Long userId, String extToolContentId, - Long toolSessionId); + public int getExternalToolOutputInt(String outputName, MdlGlossary mdlGlossary, Long userId, + String extToolContentId, Long toolSessionId); /** * Converts the customCSV parameter into a hashmap @@ -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 - * mdlGlossary, this constructs the following: - * { ["un", username], ["cs", course], ["ts", timestamp], ["hs", hash], } + * mdlGlossary, this constructs the following: { ["un", username], ["cs", + * course], ["ts", timestamp], ["hs", hash], } * * @param mdlGlossary * @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 mdlGlossary, this constructs the following: - * { ["un", username], ["cs", course], ["ts", timestamp], ["hs", hash], } + * instance in mdlGlossary, 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_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/service/MdlGlossaryService.java =================================================================== diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/service/MdlGlossaryService.java (.../MdlGlossaryService.java) (revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b) +++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/service/MdlGlossaryService.java (.../MdlGlossaryService.java) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -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.mdglos.dao.IMdlGlossaryConfigItemDAO; +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.mdglos.dao.IMdlGlossaryDAO; import org.lamsfoundation.lams.tool.mdglos.dao.IMdlGlossarySessionDAO; import org.lamsfoundation.lams.tool.mdglos.dao.IMdlGlossaryUserDAO; import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossary; -import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryConfigItem; import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossarySession; import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryUser; import org.lamsfoundation.lams.tool.mdglos.util.MdlGlossaryConstants; import org.lamsfoundation.lams.tool.mdglos.util.MdlGlossaryException; import org.lamsfoundation.lams.tool.mdglos.util.MdlGlossaryToolContentHandler; import org.lamsfoundation.lams.tool.mdglos.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 IMdlGlossaryService 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 IMdlGlossaryDAO mdlGlossaryDAO = null; @@ -131,8 +123,6 @@ private IMdlGlossaryUserDAO mdlGlossaryUserDAO = null; - private IMdlGlossaryConfigItemDAO mdlGlossaryConfigItemDAO = null; - private ILearnerService learnerService; private ILamsToolService toolService; @@ -192,8 +182,7 @@ */ public Long copyExternalToolContent(HashMap params) throws ToolException, Exception { - String cloneServletUrl = mdlGlossaryConfigItemDAO.getConfigItemByKey(MdlGlossaryConfigItem.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, mdlglossary.getExtUsername()); params.put(EXT_SERVER_PARAM_COURSE, mdlglossary.getExtCourseId()); params.put(EXT_SERVER_PARAM_SECTION, mdlglossary.getExtSection()); + params.put(CUSTOM_CSV_MAP_PARAM_EXT_LMS_ID, mdlglossary.getExtLmsId()); String timestamp = Long.toString(new Date().getTime()); params.put(EXT_SERVER_PARAM_TIMESTAMP, timestamp); - ExtServerOrgMap serverMap = this.getExtServerOrgMap(); + ExtServerOrgMap serverMap = getExtServerOrgMap(mdlglossary.getExtLmsId()); String hash = hash(serverMap, mdlglossary.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, MdlGlossary mdlGlossary, Long userId, String extToolContentId, - Long toolSessionId) { + public int getExternalToolOutputInt(String outputName, MdlGlossary mdlGlossary, Long userId, + String extToolContentId, Long toolSessionId) { MdlGlossaryUser user = this.getUserByUserIdAndSessionId(userId, toolSessionId); - ExtServerOrgMap extServerMap = getExtServerOrgMap(); + ExtServerOrgMap extServerMap = getExtServerOrgMap(mdlGlossary.getExtLmsId()); String extUserName = user.getLoginName().substring(extServerMap.getPrefix().length() + 1); try { - String outputServletUrl = mdlGlossaryConfigItemDAO.getConfigItemByKey( - MdlGlossaryConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String outputServletUrl = getExtToolAdapterServletUrl(mdlGlossary.getExtLmsId()); // setting the mdlGlossary username so the params are set up correctly mdlGlossary.setExtUsername(extUserName); @@ -316,8 +307,8 @@ return null; } - return mdlGlossaryOutputFactory.getToolOutput(name, this, toolSessionId, learnerId, session.getMdlGlossary(), session - .getExtSessionId()); + return mdlGlossaryOutputFactory.getToolOutput(name, this, toolSessionId, learnerId, session.getMdlGlossary(), + session.getExtSessionId()); } /** @@ -339,6 +330,27 @@ return mdlGlossaryOutputFactory.getToolOutputDefinitions(mdglos); } + 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 += MdlGlossaryConstants.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(); } MdlGlossary toContent = MdlGlossary.newInstance(fromContent, toContentId, mdlGlossaryToolContentHandler); - - // 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); - }*/ - mdlGlossaryDAO.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"); @@ -527,7 +520,8 @@ mdlGlossary.setMdlGlossarySessions(null); try { - exportContentService.exportToolContent(toolContentId, mdlGlossary, mdlGlossaryToolContentHandler, rootPath); + exportContentService.exportToolContent(toolContentId, mdlGlossary, mdlGlossaryToolContentHandler, + rootPath); } catch (ExportToolContentException e) { throw new ToolException(e); } @@ -539,36 +533,39 @@ String toolPath = FileUtil.getFullPath(rootPath, toolContentId.toString()); FileUtil.createDirectory(toolPath); - String exportServletUrl = mdlGlossaryConfigItemDAO.getConfigItemByKey( - MdlGlossaryConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); + String exportServletUrl = getExtToolAdapterServletUrl(mdlGlossary.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 + mdlGlossary.setExtCourseId("extCourse"); + mdlGlossary.setExtSection("0"); + mdlGlossary.setExtUsername("authUser"); + HashMap params = this.getRequiredExtServletParams(mdlGlossary); + params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT); + params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, mdlGlossary.getExtToolContentId().toString()); - mdlGlossary.setExtCourseId("extCourse"); - mdlGlossary.setExtSection("0"); - mdlGlossary.setExtUsername("authUser"); - HashMap params = this.getRequiredExtServletParams(mdlGlossary); - params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_EXPORT); - params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, mdlGlossary.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 mdlGlossary 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, mdlGlossary, mdlGlossaryToolContentHandler, + rootPath); } - logger.debug("Path to mdlGlossary export content: " + toolPath + "/ext_tool.txt"); - - out.flush(); - out.close(); - in.close(); } catch (Exception e) { logger.error("Problem exporting data from external .LRN servlet", e); } @@ -584,13 +581,6 @@ } - public ExtServerOrgMap getExtServerOrgMap() { - if (integrationService == null) - integrationService = getIntegrationService(); - IToolVO tool = toolService.getToolBySignature(MdlGlossaryConstants.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 +598,6 @@ if (extExportFile.exists()) { try { - - String importServletUrl = mdlGlossaryConfigItemDAO.getConfigItemByKey( - MdlGlossaryConfigItem.KEY_EXTERNAL_TOOL_SERVLET).getConfigValue(); - if (customCSV == null) { logger.error("Could not retrieve customCSV required for importing tool adapter tool. CustomCSV: " + customCSV); @@ -620,6 +606,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 +635,11 @@ { try { - Object toolPOJO = exportContentService.importToolContent(toolContentPath, mdlGlossaryToolContentHandler, - fromVersion, toVersion); + Object toolPOJO = exportContentService.importToolContent(toolContentPath, + mdlGlossaryToolContentHandler, fromVersion, toVersion); if (!(toolPOJO instanceof MdlGlossary)) - throw new ImportToolContentException("Import MdlGlossary tool content failed. Deserialized object is " - + toolPOJO); + throw new ImportToolContentException( + "Import MdlGlossary tool content failed. Deserialized object is " + toolPOJO); MdlGlossary mdlGlossary = (MdlGlossary) toolPOJO; // reset it to new toolContentId mdlGlossary.setToolContentId(toolContentId); @@ -675,18 +664,15 @@ } public MdlGlossary getDefaultContent() { - /* - Long defaultContentID = getDefaultContentIdBySignature(MdlGlossaryConstants.TOOL_SIGNATURE); - MdlGlossary defaultContent = getMdlGlossaryByContentId(defaultContentID); - if (defaultContent == null) { - String error = "Could not retrieve default content record for this tool"; - logger.error(error); - throw new MdlGlossaryException(error); - } + MdlGlossary defaultContent = new MdlGlossary(); return defaultContent; - */ + } + + public MdlGlossary getDefaultContent(String extLmsId) { MdlGlossary defaultContent = new MdlGlossary(); + defaultContent.setExtLmsId(extLmsId); return defaultContent; + } public MdlGlossary copyDefaultContent(Long newContentID) { @@ -705,6 +691,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(MdlGlossaryConstants.TOOL_SIGNATURE); + } + + public void saveServerMappings(String[] mappedServers) { + Tool tool = toolService.getPersistToolBySignature(MdlGlossaryConstants.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(), MdlGlossaryConstants.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 MdlGlossary getMdlGlossaryByContentId(Long toolContentID) { MdlGlossary mdlGlossary = (MdlGlossary) mdlGlossaryDAO.getByContentId(toolContentID); if (mdlGlossary == null) { @@ -713,14 +750,6 @@ return mdlGlossary; } - public MdlGlossaryConfigItem getConfigItem(String key) { - return mdlGlossaryConfigItemDAO.getConfigItemByKey(key); - } - - public void saveOrUpdateMdlGlossaryConfigItem(MdlGlossaryConfigItem item) { - mdlGlossaryConfigItemDAO.saveOrUpdate(item); - } - public MdlGlossarySession getSessionBySessionId(Long toolSessionId) { MdlGlossarySession mdlGlossarySession = mdlGlossarySessionDAO.getBySessionId(toolSessionId); if (mdlGlossarySession == null) { @@ -793,7 +822,8 @@ ICredentials credentials = new SimpleCredentials(MdlGlossaryToolContentHandler.repositoryUser, MdlGlossaryToolContentHandler.repositoryId); try { - ITicket ticket = repositoryService.login(credentials, MdlGlossaryToolContentHandler.repositoryWorkspaceName); + ITicket ticket = repositoryService + .login(credentials, MdlGlossaryToolContentHandler.repositoryWorkspaceName); return ticket; } catch (AccessDeniedException ae) { throw new MdlGlossaryException("Access Denied to repository." + ae.getMessage()); @@ -850,14 +880,6 @@ this.mdlGlossaryDAO = mdlGlossaryDAO; } - public IMdlGlossaryConfigItemDAO getMdlGlossaryConfigItemDAO() { - return mdlGlossaryConfigItemDAO; - } - - public void setMdlGlossaryConfigItemDAO(IMdlGlossaryConfigItemDAO mdlGlossaryConfigItemDAO) { - this.mdlGlossaryConfigItemDAO = mdlGlossaryConfigItemDAO; - } - public IToolContentHandler getMdlGlossaryToolContentHandler() { return mdlGlossaryToolContentHandler; } @@ -931,28 +953,7 @@ * @return */ public IIntegrationService getIntegrationService() { - - if (integrationService == null) { - String contexts[] = { "/org/lamsfoundation/lams/applicationContext.xml", - "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", - "/org/lamsfoundation/lams/toolApplicationContext.xml", - "/org/lamsfoundation/lams/integrationContext.xml", - "/org/lamsfoundation/lams/learning/learningApplicationContext.xml", - "/org/lamsfoundation/lams/contentrepository/applicationContext.xml", - "/org/lamsfoundation/lams/tool/mdglos/mdlGlossaryApplicationContext.xml", - "/org/lamsfoundation/lams/commonContext.xml" }; - - ApplicationContext context = new ClassPathXmlApplicationContext(contexts); - - if (context == null) - throw new MdlGlossaryException( - "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_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/util/MdlGlossaryConstants.java =================================================================== diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/util/MdlGlossaryConstants.java (.../MdlGlossaryConstants.java) (revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b) +++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/util/MdlGlossaryConstants.java (.../MdlGlossaryConstants.java) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -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_glossary.php"; } Index: tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/AdminAction.java =================================================================== diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/AdminAction.java (.../AdminAction.java) (revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b) +++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/AdminAction.java (.../AdminAction.java) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -23,14 +23,18 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.mdglos.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.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.tool.Tool; -import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryConfigItem; import org.lamsfoundation.lams.tool.mdglos.service.IMdlGlossaryService; import org.lamsfoundation.lams.tool.mdglos.service.MdlGlossaryServiceProxy; import org.lamsfoundation.lams.tool.mdglos.util.MdlGlossaryConstants; @@ -59,59 +63,52 @@ } AdminForm adminForm = (AdminForm) form; + // Get a list of possible external servers to enable this tool for + List serverList = mdlGlossaryService.getExtServerList(); + List mappedServers = mdlGlossaryService.getMappedServers(); + populateServerList(adminForm, serverList, mappedServers); - if (toolService == null) { - toolService = mdlGlossaryService.getToolService(); - } - Tool tool = toolService.getPersistToolBySignature(MdlGlossaryConstants.TOOL_SIGNATURE); - - MdlGlossaryConfigItem toolAdpServlet = mdlGlossaryService.getConfigItem(MdlGlossaryConfigItem.KEY_EXTERNAL_TOOL_SERVLET); - if (toolAdpServlet != null) - adminForm.setToolAdapterServlet(toolAdpServlet.getConfigValue()); - - MdlGlossaryConfigItem extServerConfig = mdlGlossaryService.getConfigItem(MdlGlossaryConfigItem.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 mdlGlossaryService - if (mdlGlossaryService == null) { - mdlGlossaryService = MdlGlossaryServiceProxy.getMdlGlossaryService(this.getServlet().getServletContext()); - } + if (mdlGlossaryService == null) { + mdlGlossaryService = MdlGlossaryServiceProxy.getMdlGlossaryService(this.getServlet().getServletContext()); + } + // Save all the mappings + mdlGlossaryService.saveServerMappings(adminForm.getMappedServers()); + + // Get a list of possible external servers to enable this tool for + List serverList = mdlGlossaryService.getExtServerList(); + List mappedServers = mdlGlossaryService.getMappedServers(); + populateServerList(adminForm, serverList, mappedServers); - MdlGlossaryConfigItem servletConfig = mdlGlossaryService - .getConfigItem(MdlGlossaryConfigItem.KEY_EXTERNAL_TOOL_SERVLET); - servletConfig.setConfigValue(adminForm.getToolAdapterServlet()); - mdlGlossaryService.saveOrUpdateMdlGlossaryConfigItem(servletConfig); + return mapping.findForward("config"); - MdlGlossaryConfigItem extServerConfig = mdlGlossaryService - .getConfigItem(MdlGlossaryConfigItem.KEY_EXTERNAL_SERVER_URL); - extServerConfig.setConfigValue(adminForm.getExtServerUrl()); - mdlGlossaryService.saveOrUpdateMdlGlossaryConfigItem(extServerConfig); - - if (toolService == null) { - toolService = mdlGlossaryService.getToolService(); - } - Tool tool = toolService.getPersistToolBySignature(MdlGlossaryConstants.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_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/AuthoringAction.java =================================================================== diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b) +++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -38,7 +38,6 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossary; -import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryConfigItem; import org.lamsfoundation.lams.tool.mdglos.service.IMdlGlossaryService; import org.lamsfoundation.lams.tool.mdglos.service.MdlGlossaryServiceProxy; import org.lamsfoundation.lams.tool.mdglos.util.MdlGlossaryConstants; @@ -64,7 +63,7 @@ public IMdlGlossaryService mdlGlossaryService; - //public static final String RELATIVE_MOODLE_AUTHOR_URL = "/course/modedit-lams.php?"; + //public static final String RELATIVE_MOODLE_AUTHOR_URL = "/course/modedit-lams.php?"; public static final String RELATIVE_MOODLE_AUTHOR_URL = "course/lamsframes.php?"; public static final String MOODLE_EDIT_URL = "course/modedit-lams.php"; @@ -108,19 +107,21 @@ String userFromCSV = null; String courseFromCSV = null; String sectionFromCSV = null; + String extLmsIdFromCSV = null; if (customCSV == null && mdlGlossary == null) { logger.error("CustomCSV required if mdlGlossary is null"); throw new ToolException("CustomCSV required if mdlGlossary is null"); } else if (customCSV != null) { String splitCSV[] = customCSV.split(","); - if (splitCSV.length != 3) { + if (splitCSV.length != 4) { logger.error("mdlGlossary tool customCSV not in required (user,course,courseURL) form: " + customCSV); throw new ToolException("mdlGlossary 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 @@ mdlGlossary.setExtUsername(userFromCSV); mdlGlossary.setExtCourseId(courseFromCSV); mdlGlossary.setExtSection(sectionFromCSV); + mdlGlossary.setExtLmsId(extLmsIdFromCSV); mdlGlossary.setCreateDate(new Date()); } + if (mdlGlossary.getExtLmsId() == null) { + mdlGlossary.setExtUsername(userFromCSV); + mdlGlossary.setExtCourseId(courseFromCSV); + mdlGlossary.setExtSection(sectionFromCSV); + mdlGlossary.setExtLmsId(extLmsIdFromCSV); + mdlGlossary.setCreateDate(new Date()); + } + if (mode != null && mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we @@ -144,30 +154,20 @@ try { // If the mdlGlossary has a saved course url, use it, otherwise use the one giving in the request in customCSV - //String courseUrlToBeUsed = (mdlGlossary.getExtCourseUrl() != null) ? mdlGlossary.getExtCourseUrl() : courseUrlFromCSV; + String responseUrl = mdlGlossaryService.getExtServerUrl(mdlGlossary.getExtLmsId()); - String responseUrl = mdlGlossaryService.getConfigItem(MdlGlossaryConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); - /* responseUrl += RELATIVE_MOODLE_AUTHOR_URL; + 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;*/ - - - responseUrl += RELATIVE_MOODLE_AUTHOR_URL; - String returnUpdateUrl = URLEncoder.encode(TOOL_APP_URL + "/authoring.do?dispatch=updateContent" + "&" - + AttributeNames.PARAM_TOOL_CONTENT_ID + "=" + toolContentID.toString(), "UTF8"); - - - returnUpdateUrl = URLEncoder.encode(returnUpdateUrl, "UTF8"); - - responseUrl += "lamsUpdateURL=" + returnUpdateUrl; - - String encodedMoodleRelativePath = URLEncoder.encode(MOODLE_EDIT_URL, "UTF8"); - - responseUrl += "&dest=" + encodedMoodleRelativePath ; - + returnUpdateUrl = URLEncoder.encode(returnUpdateUrl, "UTF8"); + + responseUrl += "lamsUpdateURL=" + returnUpdateUrl; + + String encodedMoodleRelativePath = URLEncoder.encode(MOODLE_EDIT_URL, "UTF8"); + + responseUrl += "&dest=" + encodedMoodleRelativePath; + if (mdlGlossary.getExtSection() != null) { responseUrl += "§ion=" + mdlGlossary.getExtSection(); } else { @@ -211,9 +211,9 @@ mdlGlossaryService.saveOrUpdateMdlGlossary(mdlGlossary); String redirectString = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/" - + MdlGlossaryConstants.TOOL_SIGNATURE + "/clearsession.do" + "?action=confirm&mode=author" + "&signature=" - + MdlGlossaryConstants.TOOL_SIGNATURE + "&toolContentID=" + toolContentID.toString() + "&defineLater=no" - + "&customiseSessionID=" + "&contentFolderID=0"; + + MdlGlossaryConstants.TOOL_SIGNATURE + "/clearsession.do" + "?action=confirm&mode=author" + + "&signature=" + MdlGlossaryConstants.TOOL_SIGNATURE + "&toolContentID=" + toolContentID.toString() + + "&defineLater=no" + "&customiseSessionID=" + "&contentFolderID=0"; log.debug("Manual redirect for MdlGlossary to: " + redirectString); Index: tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/LearningAction.java =================================================================== diff -u -rdf4b6219e1a88f0395eb11292e5e3cb7e7750397 -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/LearningAction.java (.../LearningAction.java) (revision df4b6219e1a88f0395eb11292e5e3cb7e7750397) +++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/LearningAction.java (.../LearningAction.java) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -38,11 +38,10 @@ 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.mdglos.model.MdlGlossaryUser; import org.lamsfoundation.lams.tool.mdglos.dto.MdlGlossaryDTO; import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossary; -import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryConfigItem; import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossarySession; +import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryUser; import org.lamsfoundation.lams.tool.mdglos.service.IMdlGlossaryService; import org.lamsfoundation.lams.tool.mdglos.service.MdlGlossaryServiceProxy; import org.lamsfoundation.lams.tool.mdglos.util.MdlGlossaryConstants; @@ -76,7 +75,7 @@ public static final String RELATIVE_LEARNER_URL = "course/lamsframes.php?"; public static final String MOODLE_VIEW_URL = "mod/glossary/view.php"; - public static final String RELATIVE_TEACHER_URL = "mod/glossary/view.php?mode=author&"; + public static final String RELATIVE_TEACHER_URL = "mod/glossary/view.php?mode=author&"; private IMdlGlossaryService mdlGlossaryService; @@ -91,7 +90,7 @@ } // Retrieve the session and content. - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, false); + ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, false); MdlGlossarySession mdlGlossarySession = mdlGlossaryService.getSessionBySessionId(toolSessionID); if (mdlGlossarySession == null) { throw new MdlGlossaryException("Cannot retreive session with toolSessionID: " + toolSessionID); @@ -120,31 +119,26 @@ } if (mdlGlossary.getExtToolContentId() != null) { - try { - String responseUrl = mdlGlossaryService.getConfigItem(MdlGlossaryConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); - - if(mode.equals(ToolAccessMode.TEACHER)) - { - responseUrl += RELATIVE_TEACHER_URL; - } - else if (mode.equals(ToolAccessMode.LEARNER) || mode.equals(ToolAccessMode.AUTHOR)) - { - responseUrl += RELATIVE_LEARNER_URL; - } + try { + String responseUrl = mdlGlossaryService.getExtServerUrl(mdlGlossary.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=" + mdlGlossarySession.getExtSessionId() + "&returnUrl=" + returnUrl - + "&dest=" + encodedMoodleRelativePath + "&is_learner=1" + "&isFinished=" + mdlGlossaryUser.isFinishedActivity(); - - + responseUrl += "&id=" + mdlGlossarySession.getExtSessionId() + "&returnUrl=" + returnUrl + "&dest=" + + encodedMoodleRelativePath + "&is_learner=1" + "&isFinished=" + + mdlGlossaryUser.isFinishedActivity(); + log.debug("Redirecting for mdl glossary learner: " + responseUrl); response.sendRedirect(responseUrl); } catch (Exception e) { @@ -160,8 +154,8 @@ UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); // attempt to retrieve user using userId and toolSessionId - MdlGlossaryUser mdlGlossaryUser = mdlGlossaryService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()), - toolSessionId); + MdlGlossaryUser mdlGlossaryUser = mdlGlossaryService.getUserByUserIdAndSessionId(new Long(user.getUserID() + .intValue()), toolSessionId); if (mdlGlossaryUser == null) { MdlGlossarySession mdlGlossarySession = mdlGlossaryService.getSessionBySessionId(toolSessionId); Index: tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/MonitoringAction.java =================================================================== diff -u -rfe8df3c212f840b465ac683100c1374df889ff9a -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision fe8df3c212f840b465ac683100c1374df889ff9a) +++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -37,7 +37,6 @@ import org.lamsfoundation.lams.tool.mdglos.dto.MdlGlossaryDTO; import org.lamsfoundation.lams.tool.mdglos.dto.MdlGlossarySessionDTO; import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossary; -import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryConfigItem; import org.lamsfoundation.lams.tool.mdglos.service.IMdlGlossaryService; import org.lamsfoundation.lams.tool.mdglos.service.MdlGlossaryServiceProxy; import org.lamsfoundation.lams.tool.mdglos.util.MdlGlossaryConstants; @@ -90,15 +89,15 @@ for (MdlGlossarySessionDTO sessionDTO : mdlGlossaryDT0.getSessionDTOs()) { try { - String responseUrl = mdlGlossaryService.getConfigItem(MdlGlossaryConfigItem.KEY_EXTERNAL_SERVER_URL) - .getConfigValue(); + String responseUrl = mdlGlossaryService.getExtServerUrl(mdlGlossary.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_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/forms/AdminForm.java =================================================================== diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/forms/AdminForm.java (.../AdminForm.java) (revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b) +++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/forms/AdminForm.java (.../AdminForm.java) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -36,9 +36,8 @@ public class AdminForm extends ActionForm { private static final long serialVersionUID = 8872637862875198L; - String toolAdapterServlet; - String extServerUrl; - String serverIdMapping; + String[] mappableServers; + String[] mappedServers; @Override public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) { @@ -47,31 +46,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_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/servlets/ExportServlet.java =================================================================== diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b) +++ tool_adapters/moodle/lams_tool_mdlglossary/src/java/org/lamsfoundation/lams/tool/mdglos/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -41,10 +41,9 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.mdglos.dto.MdlGlossaryDTO; import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossary; -import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossaryConfigItem; import org.lamsfoundation.lams.tool.mdglos.model.MdlGlossarySession; -import org.lamsfoundation.lams.tool.mdglos.service.MdlGlossaryServiceProxy; import org.lamsfoundation.lams.tool.mdglos.service.IMdlGlossaryService; +import org.lamsfoundation.lams.tool.mdglos.service.MdlGlossaryServiceProxy; import org.lamsfoundation.lams.tool.mdglos.util.MdlGlossaryException; import org.lamsfoundation.lams.tool.mdglos.util.WebUtility; import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet; @@ -166,8 +165,7 @@ private void exportFileFromExternalServer(HttpServletRequest request, HttpServletResponse response, Long extToolSessionId, MdlGlossary mdlGlossary, String fullPath) throws Exception { - String exportPortFolioServletUrl = mdlGlossaryService.getConfigItem(MdlGlossaryConfigItem.KEY_EXTERNAL_TOOL_SERVLET) - .getConfigValue(); + String exportPortFolioServletUrl = mdlGlossaryService.getExtServerUrl(mdlGlossary.getExtLmsId()); String extUsername = "user"; // setting user to arbitrary values since they are only used to construct the hash Index: tool_adapters/moodle/lams_tool_mdlglossary/web/pages/admin/config.jsp =================================================================== diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rfa37195a28464d5c7753243498cce58c46084240 --- tool_adapters/moodle/lams_tool_mdlglossary/web/pages/admin/config.jsp (.../config.jsp) (revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b) +++ tool_adapters/moodle/lams_tool_mdlglossary/web/pages/admin/config.jsp (.../config.jsp) (revision fa37195a28464d5c7753243498cce58c46084240) @@ -30,21 +30,22 @@ - - - - - - - - - - - - - -
+

+ +

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