Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rb6d0779192887979b5d3d244dec3506d12a7e401 -r459c29c159a6f5665479ed2490cf2d4a9db30d6e --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b6d0779192887979b5d3d244dec3506d12a7e401) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 459c29c159a6f5665479ed2490cf2d4a9db30d6e) @@ -678,4 +678,5 @@ config.header.etherpad =Etherpad config.etherpad.server.url =Server URL config.etherpad.api.key =API key +config.etherpad.instance.id =Instance ID #======= End labels: Exported 627 labels for en AU ===== Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql =================================================================== diff -u -rb6d0779192887979b5d3d244dec3506d12a7e401 -r459c29c159a6f5665479ed2490cf2d4a9db30d6e --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql (.../patch20200326.sql) (revision b6d0779192887979b5d3d244dec3506d12a7e401) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql (.../patch20200326.sql) (revision 459c29c159a6f5665479ed2490cf2d4a9db30d6e) @@ -4,10 +4,10 @@ -- LDEV-4997 Etherpad as service INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required) -VALUES ('EtherpadServerUrl', 'http://localhost:9001', 'config.etherpad.server.url', 'config.header.etherpad', 'STRING', 0), - ('EtherpadApiKey', '', 'config.etherpad.api.key', 'config.header.etherpad', 'STRING', 0); +VALUES ('EtherpadServerUrl', 'http://localhost:9001', 'config.etherpad.server.url', 'config.header.etherpad', 'STRING', 0), + ('EtherpadApiKey', '', 'config.etherpad.api.key', 'config.header.etherpad', 'STRING', 0), + ('EtherpadInstanceID','LAMS', 'config.etherpad.instance.id','config.header.etherpad', 'STRING', 0); - COMMIT; SET AUTOCOMMIT = 1; set FOREIGN_KEY_CHECKS = 1; Index: lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java =================================================================== diff -u -rdd66f49ea651e9bee0b6876bb71aa950ce65f2d8 -r459c29c159a6f5665479ed2490cf2d4a9db30d6e --- lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java (.../EtherpadService.java) (revision dd66f49ea651e9bee0b6876bb71aa950ce65f2d8) +++ lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java (.../EtherpadService.java) (revision 459c29c159a6f5665479ed2490cf2d4a9db30d6e) @@ -33,7 +33,12 @@ Map result = new HashMap<>(); result.put("client", client); - // create Etherpad Group assossiated with this session + // add Etherpad instance ID so we can group LAMS instances to share Etherpads + String instanceID = Configuration.get(ConfigurationKeys.ETHERPAD_INSTANCE_ID); + if (StringUtils.isNotBlank(instanceID)) { + groupIdentifier = instanceID + "-" + groupIdentifier; + } + // create Etherpad Group associated with this session Map map = client.createGroupIfNotExistsFor(groupIdentifier); String groupId = (String) map.get("groupID"); result.put("groupId", groupId); Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== diff -u -rb6d0779192887979b5d3d244dec3506d12a7e401 -r459c29c159a6f5665479ed2490cf2d4a9db30d6e --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision b6d0779192887979b5d3d244dec3506d12a7e401) +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 459c29c159a6f5665479ed2490cf2d4a9db30d6e) @@ -320,4 +320,5 @@ // LDEV-4997 Etherpad as service public static String ETHERPAD_SERVER_URL = "EtherpadServerUrl"; public static String ETHERPAD_API_KEY = "EtherpadApiKey"; + public static String ETHERPAD_INSTANCE_ID = "EtherpadInstanceID"; } \ No newline at end of file