Index: lams_admin/conf/xdoclet/struts-forms.xml =================================================================== diff -u -r4248afaa041552a4c2d026140e1b1704e98d7ed1 -rf0baac16e87a8029d100301ad9c5390244a9f725 --- lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision 4248afaa041552a4c2d026140e1b1704e98d7ed1) +++ lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision f0baac16e87a8029d100301ad9c5390244a9f725) @@ -66,7 +66,7 @@ - + @@ -81,9 +81,6 @@ - - - Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerListAction.java =================================================================== diff -u -r4248afaa041552a4c2d026140e1b1704e98d7ed1 -rf0baac16e87a8029d100301ad9c5390244a9f725 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerListAction.java (.../ServerListAction.java) (revision 4248afaa041552a4c2d026140e1b1704e98d7ed1) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerListAction.java (.../ServerListAction.java) (revision f0baac16e87a8029d100301ad9c5390244a9f725) @@ -33,7 +33,7 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.admin.service.AdminServiceProxy; -import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServer; /** * @@ -48,8 +48,8 @@ @SuppressWarnings("unchecked") public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { - List list = AdminServiceProxy.getIntegrationService(getServlet().getServletContext()) - .getAllExtServerOrgMaps(); + List list = AdminServiceProxy.getIntegrationService(getServlet().getServletContext()) + .getAllExtServers(); Collections.sort(list); request.setAttribute("servers", list); return mapping.findForward("serverlist"); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java =================================================================== diff -u -r45dd45991655ace968c10e54e3e0d641882e52f5 -rf0baac16e87a8029d100301ad9c5390244a9f725 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java (.../ServerMaintainAction.java) (revision 45dd45991655ace968c10e54e3e0d641882e52f5) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java (.../ServerMaintainAction.java) (revision f0baac16e87a8029d100301ad9c5390244a9f725) @@ -22,12 +22,6 @@ */ package org.lamsfoundation.lams.admin.web; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -37,11 +31,8 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm; import org.lamsfoundation.lams.admin.service.AdminServiceProxy; -import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServer; import org.lamsfoundation.lams.integration.service.IIntegrationService; -import org.lamsfoundation.lams.usermanagement.Organisation; -import org.lamsfoundation.lams.usermanagement.OrganisationState; -import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; @@ -55,7 +46,7 @@ /** * struts doclets * - * @struts.action path="/servermaintain" parameter="method" name="ServerOrgMapForm" scope="request" validate="false" + * @struts.action path="/servermaintain" parameter="method" name="ExtServerForm" scope="request" validate="false" * @struts.action-forward name="servermaintain" path=".servermaintain" * @struts.action-forward name="serverlist" path="/serverlist.do" */ @@ -64,30 +55,12 @@ @SuppressWarnings("unchecked") public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { - Map properties = new HashMap(); - properties.put("organisationType.organisationTypeId", OrganisationType.COURSE_TYPE); - properties.put("organisationState.organisationStateId", OrganisationState.ACTIVE); - List list = AdminServiceProxy.getService(getServlet().getServletContext()) - .findByProperties(Organisation.class, properties); - Organisation dummy = new Organisation(); - dummy.setOrganisationId(-1); - dummy.setName(AdminServiceProxy.getMessageService(getServlet().getServletContext()) - .getMessage("sysadmin.organisation.select")); - if (list == null) { - list = new ArrayList(); - } - Collections.sort(list); - list.add(0, dummy); - request.setAttribute("orgs", list); - DynaActionForm serverOrgMapForm = (DynaActionForm) form; + DynaActionForm extServerForm = (DynaActionForm) form; Integer sid = WebUtil.readIntParam(request, "sid", true); if (sid != null) { - ExtServerOrgMap map = AdminServiceProxy.getIntegrationService(getServlet().getServletContext()) - .getExtServerOrgMap(sid); - BeanUtils.copyProperties(serverOrgMapForm, map); - if (map.getOrganisation() != null) { - serverOrgMapForm.set("orgId", map.getOrganisation().getOrganisationId()); - } + ExtServer extServer = AdminServiceProxy.getIntegrationService(getServlet().getServletContext()) + .getExtServer(sid); + BeanUtils.copyProperties(extServerForm, extServer); } return mapping.findForward("servermaintain"); } @@ -96,26 +69,26 @@ HttpServletResponse response) throws Exception { IIntegrationService service = AdminServiceProxy.getIntegrationService(getServlet().getServletContext()); Integer sid = WebUtil.readIntParam(request, "sid", false); - ExtServerOrgMap map = service.getExtServerOrgMap(sid); - map.setDisabled(true); - service.saveExtServerOrgMap(map); + ExtServer extServer = service.getExtServer(sid); + extServer.setDisabled(true); + service.saveExtServer(extServer); return mapping.findForward("serverlist"); } public ActionForward enable(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { IIntegrationService service = AdminServiceProxy.getIntegrationService(getServlet().getServletContext()); Integer sid = WebUtil.readIntParam(request, "sid", false); - ExtServerOrgMap map = service.getExtServerOrgMap(sid); - map.setDisabled(false); - service.saveExtServerOrgMap(map); + ExtServer extServer = service.getExtServer(sid); + extServer.setDisabled(false); + service.saveExtServer(extServer); return mapping.findForward("serverlist"); } public ActionForward delete(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { Integer sid = WebUtil.readIntParam(request, "sid", false); - AdminServiceProxy.getService(getServlet().getServletContext()).deleteById(ExtServerOrgMap.class, sid); + AdminServiceProxy.getService(getServlet().getServletContext()).deleteById(ExtServer.class, sid); return mapping.findForward("serverlist"); } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java =================================================================== diff -u -r4248afaa041552a4c2d026140e1b1704e98d7ed1 -rf0baac16e87a8029d100301ad9c5390244a9f725 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java (.../ServerSaveAction.java) (revision 4248afaa041552a4c2d026140e1b1704e98d7ed1) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java (.../ServerSaveAction.java) (revision f0baac16e87a8029d100301ad9c5390244a9f725) @@ -40,7 +40,7 @@ import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm; import org.lamsfoundation.lams.admin.service.AdminServiceProxy; -import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServer; import org.lamsfoundation.lams.integration.service.IIntegrationService; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationState; @@ -61,7 +61,7 @@ * * @author Fei Yang * - * @struts.action path="/serversave" input=".servermaintain" name="ServerOrgMapForm" scope="request" validate="false" + * @struts.action path="/serversave" input=".servermaintain" name="ExtServerForm" scope="request" validate="false" * @struts.action-forward name="success" path="/serverlist.do" */ public class ServerSaveAction extends Action { @@ -83,65 +83,30 @@ userService = AdminServiceProxy.getService(getServlet().getServletContext()); messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext()); - DynaActionForm serverOrgMapForm = (DynaActionForm) form; + DynaActionForm extServerForm = (DynaActionForm) form; ActionMessages errors = new ActionMessages(); String[] requiredFields = { "serverid", "serverkey", "servername", "prefix", "userinfoUrl", "timeoutUrl" }; for (String requiredField : requiredFields) { - if (StringUtils.trimToNull(serverOrgMapForm.getString(requiredField)) == null) { + if (StringUtils.trimToNull(extServerForm.getString(requiredField)) == null) { errors.add(requiredField, new ActionMessage("error.required", messageService.getMessage("sysadmin." + requiredField))); } } - Organisation org = null; + UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); - if ((Boolean) serverOrgMapForm.get("newOrg")) { - String orgName = serverOrgMapForm.getString("orgName"); - if (StringUtils.trimToNull(orgName) == null) { - errors.add("orgId", - new ActionMessage("error.required", messageService.getMessage("sysadmin.organisation"))); - - } else if (!ValidationUtil.isOrgNameValid(orgName)) { - errors.add("orgId", new ActionMessage("error.name.invalid.characters")); - - } else { - - org = new Organisation(); - org.setName(orgName); - org.setParentOrganisation(userService.getRootOrganisation()); - org.setOrganisationType( - (OrganisationType) userService.findById(OrganisationType.class, OrganisationType.COURSE_TYPE)); - org.setOrganisationState( - (OrganisationState) userService.findById(OrganisationState.class, OrganisationState.ACTIVE)); - SupportedLocale locale = LanguageUtil.getDefaultLocale(); - org.setLocale(locale); - userService.saveOrganisation(org, user.getUserID()); - serverOrgMapForm.set("orgId", org.getOrganisationId()); - serverOrgMapForm.set("newOrg", false); - serverOrgMapForm.set("orgName", null); - } - - } else { - Integer orgId = (Integer) serverOrgMapForm.get("orgId"); - if (orgId.equals(-1)) { - // LDEV-1284 no need for integration organisation anymore - // errors.add("orgId",new ActionMessage("error.required", messageService.getMessage("sysadmin.organisation"))); - } else { - org = (Organisation) userService.findById(Organisation.class, orgId); - } - } - Integer sid = (Integer) serverOrgMapForm.get("sid"); + Integer sid = (Integer) extServerForm.get("sid"); if (errors.isEmpty()) {//check duplication String[] uniqueFields = { "serverid", "prefix" }; for (String uniqueField : uniqueFields) { - List list = userService.findByProperty(ExtServerOrgMap.class, uniqueField, - serverOrgMapForm.get(uniqueField)); + List list = userService.findByProperty(ExtServer.class, uniqueField, + extServerForm.get(uniqueField)); if (list != null && list.size() > 0) { if (sid.equals(-1)) {//new map errors.add(uniqueField, new ActionMessage("error.not.unique", messageService.getMessage("sysadmin." + uniqueField))); } else { - ExtServerOrgMap map = (ExtServerOrgMap) list.get(0); + ExtServer map = (ExtServer) list.get(0); if (!map.getSid().equals(sid)) { errors.add(uniqueField, new ActionMessage("error.not.unique", messageService.getMessage("sysadmin." + uniqueField))); @@ -152,33 +117,20 @@ } } if (errors.isEmpty()) { - ExtServerOrgMap map = null; + ExtServer map = null; if (sid.equals(-1)) { - map = new ExtServerOrgMap(); - BeanUtils.copyProperties(map, serverOrgMapForm); + map = new ExtServer(); + BeanUtils.copyProperties(map, extServerForm); map.setSid(null); - map.setServerTypeId(ExtServerOrgMap.LTI_CONSUMER_SERVER_TYPE); + map.setServerTypeId(ExtServer.INTEGRATION_SERVER_TYPE); } else { - map = service.getExtServerOrgMap(sid); - BeanUtils.copyProperties(map, serverOrgMapForm); + map = service.getExtServer(sid); + BeanUtils.copyProperties(map, extServerForm); } - map.setOrganisation(org); - service.saveExtServerOrgMap(map); + service.saveExtServer(map); return mapping.findForward("success"); } else { saveErrors(request, errors); - Map properties = new HashMap(); - properties.put("organisationType.organisationTypeId", OrganisationType.COURSE_TYPE); - properties.put("organisationState.organisationStateId", OrganisationState.ACTIVE); - List list = userService.findByProperties(Organisation.class, properties); - Organisation dummy = new Organisation(); - dummy.setOrganisationId(-1); - dummy.setName(messageService.getMessage("sysadmin.organisation.select")); - if (list == null) { - list = new ArrayList(); - } - list.add(dummy); - request.setAttribute("orgs", list); return mapping.getInputForward(); } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LtiConsumerManagementAction.java =================================================================== diff -u -r4248afaa041552a4c2d026140e1b1704e98d7ed1 -rf0baac16e87a8029d100301ad9c5390244a9f725 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LtiConsumerManagementAction.java (.../LtiConsumerManagementAction.java) (revision 4248afaa041552a4c2d026140e1b1704e98d7ed1) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LtiConsumerManagementAction.java (.../LtiConsumerManagementAction.java) (revision f0baac16e87a8029d100301ad9c5390244a9f725) @@ -16,7 +16,7 @@ import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm; import org.lamsfoundation.lams.admin.service.AdminServiceProxy; -import org.lamsfoundation.lams.integration.ExtServerOrgMap; +import org.lamsfoundation.lams.integration.ExtServer; import org.lamsfoundation.lams.integration.service.IIntegrationService; import org.lamsfoundation.lams.integration.util.LtiUtils; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; @@ -60,7 +60,7 @@ HttpServletResponse response) { initServices(); - List ltiConsumers = integrationService.getAllToolConsumers(); + List ltiConsumers = integrationService.getAllToolConsumers(); Collections.sort(ltiConsumers); request.setAttribute("ltiConsumers", ltiConsumers); @@ -80,7 +80,7 @@ // editing a tool consumer if (sid != null) { - ExtServerOrgMap ltiConsumer = integrationService.getExtServerOrgMap(sid); + ExtServer ltiConsumer = integrationService.getExtServer(sid); BeanUtils.copyProperties(ltiConsumerForm, ltiConsumer); String lessonFinishUrl = ltiConsumer.getLessonFinishUrl() == null ? "-" : ltiConsumer.getLessonFinishUrl(); request.setAttribute("lessonFinishUrl", lessonFinishUrl); @@ -103,9 +103,9 @@ Integer sid = WebUtil.readIntParam(request, "sid", true); boolean disable = WebUtil.readBooleanParam(request, "disable"); - ExtServerOrgMap ltiConsumer = integrationService.getExtServerOrgMap(sid); + ExtServer ltiConsumer = integrationService.getExtServer(sid); ltiConsumer.setDisabled(disable); - integrationService.saveExtServerOrgMap(ltiConsumer); + integrationService.saveExtServer(ltiConsumer); return unspecified(mapping, form, request, response); } @@ -119,7 +119,7 @@ initServices(); Integer sid = WebUtil.readIntParam(request, "sid", true); - userManagementService.deleteById(ExtServerOrgMap.class, sid); + userManagementService.deleteById(ExtServer.class, sid); return unspecified(mapping, form, request, response); } @@ -137,30 +137,30 @@ return unspecified(mapping, form, request, response); } - DynaActionForm serverOrgMapForm = (DynaActionForm) form; + DynaActionForm extServerForm = (DynaActionForm) form; ActionMessages errors = new ActionMessages(); String[] requiredFields = { "serverid", "serverkey", "servername", "prefix" }; for (String requiredField : requiredFields) { - if (StringUtils.trimToNull(serverOrgMapForm.getString(requiredField)) == null) { + if (StringUtils.trimToNull(extServerForm.getString(requiredField)) == null) { errors.add(requiredField, new ActionMessage("error.required", messageService.getMessage("sysadmin." + requiredField))); } } - Integer sid = (Integer) serverOrgMapForm.get("sid"); + Integer sid = (Integer) extServerForm.get("sid"); //check duplication if (errors.isEmpty()) { String[] uniqueFields = { "serverid", "prefix" }; for (String uniqueField : uniqueFields) { - List list = userManagementService.findByProperty(ExtServerOrgMap.class, uniqueField, - serverOrgMapForm.get(uniqueField)); + List list = userManagementService.findByProperty(ExtServer.class, uniqueField, + extServerForm.get(uniqueField)); if (list != null && list.size() > 0) { if (sid.equals(0)) {//new map errors.add(uniqueField, new ActionMessage("error.not.unique", messageService.getMessage("sysadmin." + uniqueField))); } else { - ExtServerOrgMap map = list.get(0); - if (!map.getSid().equals(sid)) { + ExtServer ltiConsumer = list.get(0); + if (!ltiConsumer.getSid().equals(sid)) { errors.add(uniqueField, new ActionMessage("error.not.unique", messageService.getMessage("sysadmin." + uniqueField))); } @@ -170,19 +170,19 @@ } } if (errors.isEmpty()) { - ExtServerOrgMap map = null; + ExtServer ltiConsumer = null; if (sid.equals(0)) { - map = new ExtServerOrgMap(); - BeanUtils.copyProperties(map, serverOrgMapForm); - map.setSid(null); - map.setServerTypeId(ExtServerOrgMap.LTI_CONSUMER_SERVER_TYPE); - map.setUserinfoUrl("blank"); - map.setTimeoutUrl("blank"); + ltiConsumer = new ExtServer(); + BeanUtils.copyProperties(ltiConsumer, extServerForm); + ltiConsumer.setSid(null); + ltiConsumer.setServerTypeId(ExtServer.LTI_CONSUMER_SERVER_TYPE); + ltiConsumer.setUserinfoUrl("blank"); + ltiConsumer.setTimeoutUrl("blank"); } else { - map = integrationService.getExtServerOrgMap(sid); - BeanUtils.copyProperties(map, serverOrgMapForm); + ltiConsumer = integrationService.getExtServer(sid); + BeanUtils.copyProperties(ltiConsumer, extServerForm); } - integrationService.saveExtServerOrgMap(map); + integrationService.saveExtServer(ltiConsumer); return unspecified(mapping, form, request, response); } else { Index: lams_admin/web/lti/ltiConsumerList.jsp =================================================================== diff -u -r4248afaa041552a4c2d026140e1b1704e98d7ed1 -rf0baac16e87a8029d100301ad9c5390244a9f725 --- lams_admin/web/lti/ltiConsumerList.jsp (.../ltiConsumerList.jsp) (revision 4248afaa041552a4c2d026140e1b1704e98d7ed1) +++ lams_admin/web/lti/ltiConsumerList.jsp (.../ltiConsumerList.jsp) (revision f0baac16e87a8029d100301ad9c5390244a9f725) @@ -22,7 +22,6 @@ - @@ -43,7 +42,6 @@ - Index: lams_admin/web/serverlist.jsp =================================================================== diff -u -r4248afaa041552a4c2d026140e1b1704e98d7ed1 -rf0baac16e87a8029d100301ad9c5390244a9f725 --- lams_admin/web/serverlist.jsp (.../serverlist.jsp) (revision 4248afaa041552a4c2d026140e1b1704e98d7ed1) +++ lams_admin/web/serverlist.jsp (.../serverlist.jsp) (revision f0baac16e87a8029d100301ad9c5390244a9f725) @@ -22,47 +22,45 @@ - - + - - - - - + + + + + - + - - +   - - + + - +   - + Index: lams_admin/web/servermaintain.jsp =================================================================== diff -u -r4248afaa041552a4c2d026140e1b1704e98d7ed1 -rf0baac16e87a8029d100301ad9c5390244a9f725 --- lams_admin/web/servermaintain.jsp (.../servermaintain.jsp) (revision 4248afaa041552a4c2d026140e1b1704e98d7ed1) +++ lams_admin/web/servermaintain.jsp (.../servermaintain.jsp) (revision f0baac16e87a8029d100301ad9c5390244a9f725) @@ -69,17 +69,6 @@ : - - - - : - - - -   - - - : * @@ -115,12 +104,7 @@ -