Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rcb0894c5e852e8ca4d71dc7109900814af113dc7 -r1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision cb0894c5e852e8ca4d71dc7109900814af113dc7) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f) @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jan 03 13:36:39 CST 2012 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Jan 12 13:57:54 CST 2012 #=================== labels for LAMS Administration =================# @@ -473,6 +473,7 @@ config.kaltura.user.secret =User secret config.kaltura.kcw.uiconfid =Kaltura Contribution Wizard (KCW) ui config id config.kaltura.kdp.uiconfid =Kaltura Dynamic Player (KDP) ui config id +config.server2server.registration.enable =Enable remote server user registration -#======= End labels: Exported 467 labels for en AU ===== +#======= End labels: Exported 468 labels for en AU ===== Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rcb0894c5e852e8ca4d71dc7109900814af113dc7 -r1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision cb0894c5e852e8ca4d71dc7109900814af113dc7) +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f) @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jan 03 13:36:39 CST 2012 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Jan 12 13:57:54 CST 2012 #=================== labels for LAMS Administration =================# @@ -473,6 +473,7 @@ config.kaltura.user.secret =User secret config.kaltura.kcw.uiconfid =Kaltura Contribution Wizard (KCW) ui config id config.kaltura.kdp.uiconfid =Kaltura Dynamic Player (KDP) ui config id +config.server2server.registration.enable =Enable remote server user registration -#======= End labels: Exported 467 labels for en AU ===== +#======= End labels: Exported 468 labels for en AU ===== Index: lams_admin/conf/language/lams/ApplicationResources_es_ES.properties =================================================================== diff -u -rcb0894c5e852e8ca4d71dc7109900814af113dc7 -r1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f --- lams_admin/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision cb0894c5e852e8ca4d71dc7109900814af113dc7) +++ lams_admin/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision 1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f) @@ -2,7 +2,7 @@ #language code: es #locale code: ES - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jan 03 13:36:34 CST 2012 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Jan 12 13:57:49 CST 2012 #=================== labels for LAMS Administration =================# @@ -473,6 +473,7 @@ config.kaltura.user.secret =Secreto de usuario (User secret) config.kaltura.kcw.uiconfid =Kaltura Contribution Wizard (KCW) ui config id config.kaltura.kdp.uiconfid =Kaltura Dynamic Player (KDP) ui config id +config.server2server.registration.enable =Activar registraci\u00f3n de usuarios remota -#======= End labels: Exported 467 labels for es ES ===== +#======= End labels: Exported 468 labels for es ES ===== Index: lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterAction.java =================================================================== diff -u -r4af0f8bf74537396cc140d363f96338cc928175e -r1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f --- lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterAction.java (.../RegisterAction.java) (revision 4af0f8bf74537396cc140d363f96338cc928175e) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterAction.java (.../RegisterAction.java) (revision 1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f) @@ -68,6 +68,8 @@ import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.CentralConstants; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HashUtil; import org.lamsfoundation.lams.util.MessageService; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -174,6 +176,15 @@ */ public void addUserToGroupLessons(HttpServletRequest request, HttpServletResponse response) throws IOException { try { + + // Check if Server registration is available + boolean serverToServerEnable = Configuration.getAsBoolean(ConfigurationKeys.ENABLE_SERVER_REGISTRATION); + if (!serverToServerEnable) { + String msg = "Server to server registration is not enabled"; + logger.error(msg); + response.sendError(response.SC_METHOD_NOT_ALLOWED, msg); + return; + } String method = request.getParameter(CentralConstants.PARAM_METHOD); String serverId = request.getParameter(CentralConstants.PARAM_SERVER_ID); String datetime = request.getParameter(CentralConstants.PARAM_DATE_TIME); @@ -308,7 +319,15 @@ */ public void removeUserFromGroup(HttpServletRequest request, HttpServletResponse response) throws IOException { try { - String method = request.getParameter(CentralConstants.PARAM_METHOD); + // Check if Server registration is available + boolean serverToServerEnable = Configuration.getAsBoolean(ConfigurationKeys.ENABLE_SERVER_REGISTRATION); + if (!serverToServerEnable) { + String msg = "Server to server registration is not enabled"; + logger.error(msg); + response.sendError(response.SC_METHOD_NOT_ALLOWED, msg); + return; + } + String method = request.getParameter(CentralConstants.PARAM_METHOD); String serverId = request.getParameter(CentralConstants.PARAM_SERVER_ID); String datetime = request.getParameter(CentralConstants.PARAM_DATE_TIME); String hashValue = request.getParameter(CentralConstants.PARAM_HASH_VALUE); @@ -389,6 +408,15 @@ */ public void resetUserTimeLimit(HttpServletRequest request, HttpServletResponse response) throws IOException { try { + // Check if Server registration is available + boolean serverToServerEnable = Configuration.getAsBoolean(ConfigurationKeys.ENABLE_SERVER_REGISTRATION); + if (!serverToServerEnable) { + String msg = "Server to server registration is not enabled"; + logger.error(msg); + response.sendError(response.SC_METHOD_NOT_ALLOWED, msg); + return; + } + String method = request.getParameter(CentralConstants.PARAM_METHOD); String serverId = request.getParameter(CentralConstants.PARAM_SERVER_ID); String datetime = request.getParameter(CentralConstants.PARAM_DATE_TIME); Index: lams_common/db/sql/insert_lams_unix_config_data.sql =================================================================== diff -u -r532468b83582c03fdaa89c2265e73acfc17c0af0 -r1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f --- lams_common/db/sql/insert_lams_unix_config_data.sql (.../insert_lams_unix_config_data.sql) (revision 532468b83582c03fdaa89c2265e73acfc17c0af0) +++ lams_common/db/sql/insert_lams_unix_config_data.sql (.../insert_lams_unix_config_data.sql) (revision 1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f) @@ -1,5 +1,5 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('ServerURL','http://shaun.melcoe.mq.edu.au/lams/', 'config.server.url', 'config.header.system', 'STRING', 1); +values ('ServerURL','http://137.111.246.19:8080/lams/', 'config.server.url', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('ServerURLContextPath','lams/', 'config.server.url.context.path', 'config.header.system', 'STRING', 1); @@ -16,6 +16,9 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('EARDir','/usr/local/jboss-5.1/server/default/deploy/lams.ear/', 'config.ear.dir', 'config.header.system', 'STRING', 1); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('EnableServerRegistration', 'false', 'config.server2server.registration.enable', 'config.header.system', 'BOOLEAN', 1); + insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('InternalSMTPServer','true', 'config.use.internal.smtp.server', 'config.header.email', 'BOOLEAN', 0); Index: lams_common/db/sql/insert_lams_windows_config_data.sql =================================================================== diff -u -rc4de57fdf30d9a854fbfa3c66710b18b29c71e7e -r1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f --- lams_common/db/sql/insert_lams_windows_config_data.sql (.../insert_lams_windows_config_data.sql) (revision c4de57fdf30d9a854fbfa3c66710b18b29c71e7e) +++ lams_common/db/sql/insert_lams_windows_config_data.sql (.../insert_lams_windows_config_data.sql) (revision 1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f) @@ -112,6 +112,9 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('ForceMobileDevToUseFlashless','false', 'config.force.mobile.use.flashlesh', 'config.header.features', 'BOOLEAN', 1); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('EnableServerRegistration', 'false', 'config.server2server.registration.enable', 'config.header.features', 'BOOLEAN', 1); + insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPProvisioningEnabled','false', 'config.ldap.provisioning.enabled', 'config.header.ldap', 'BOOLEAN', 1); Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql =================================================================== diff -u -r097c7143c4edf7a649e785d0f58a1bbf640edd3b -r1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql (.../patch02040006.sql) (revision 097c7143c4edf7a649e785d0f58a1bbf640edd3b) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql (.../patch02040006.sql) (revision 1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f) @@ -106,6 +106,10 @@ -- LDEV-2560 Add original author information ALTER TABLE lams_learning_design ADD COLUMN original_user_id BIGINT(20) AFTER user_id; +-- LDEV-2747 An API to create users in bulk from an external system +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('EnableServerRegistration', 'false', 'config.server2server.registration.enable', 'config.header.system', 'BOOLEAN', 1); + COMMIT; SET AUTOCOMMIT = 1; set FOREIGN_KEY_CHECKS = 1; Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== diff -u -rc4de57fdf30d9a854fbfa3c66710b18b29c71e7e -r1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision c4de57fdf30d9a854fbfa3c66710b18b29c71e7e) +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 1b5e1d1a56b7c671c57bbd9257fdba49c85abc3f) @@ -275,5 +275,7 @@ public static String KALTURA_KDP_UI_CONF_ID = "KalturaKDPUiConfId"; + // LDEV-2747 + public static String ENABLE_SERVER_REGISTRATION = "EnableServerRegistration"; -} \ No newline at end of file +}