Index: lams_bb_integration/RELEASE_NOTES.TXT =================================================================== diff -u -r535a8b4b59cfcf0932f4f3835915a8635107306c -r395273be49a085c31a20eadef9120dc429a1324b --- lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c) +++ lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision 395273be49a085c31a20eadef9120dc429a1324b) @@ -150,3 +150,8 @@ 1.2.22 Release Fixes ==================== * NTU-13: Make BB recurrently fetch marks from LAMS that were not yet submitted to external server + +1.2.23 Release Fixes +==================== +* LDEV-4381: Removed obsolete requestSrc and alternative LAMS server URL settings + Index: lams_bb_integration/WEB-INF/bb-manifest.xml =================================================================== diff -u -r535a8b4b59cfcf0932f4f3835915a8635107306c -r395273be49a085c31a20eadef9120dc429a1324b --- lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c) +++ lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision 395273be49a085c31a20eadef9120dc429a1324b) @@ -5,7 +5,7 @@ - + Index: lams_bb_integration/build.xml =================================================================== diff -u -r535a8b4b59cfcf0932f4f3835915a8635107306c -r395273be49a085c31a20eadef9120dc429a1324b --- lams_bb_integration/build.xml (.../build.xml) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c) +++ lams_bb_integration/build.xml (.../build.xml) (revision 395273be49a085c31a20eadef9120dc429a1324b) @@ -2,7 +2,7 @@ - + Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/ConfigServlet.java =================================================================== diff -u -r2136e303633dc6cfaf9367e5f279cfcd75105752 -r395273be49a085c31a20eadef9120dc429a1324b --- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/ConfigServlet.java (.../ConfigServlet.java) (revision 2136e303633dc6cfaf9367e5f279cfcd75105752) +++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/ConfigServlet.java (.../ConfigServlet.java) (revision 395273be49a085c31a20eadef9120dc429a1324b) @@ -91,9 +91,6 @@ String lamsServerTimeRefreshInterval = properties.getProperty(LamsPluginUtil.PROP_LAMS_SERVER_TIME_REFRESH_INTERVAL); request.setAttribute("lamsServerTimeRefreshInterval", lamsServerTimeRefreshInterval); - - String lamsAltServerUrl = properties.getProperty(LamsPluginUtil.PROP_ALT_LAMS_URL, "https://"); - request.setAttribute("lamsAltServerUrl", lamsAltServerUrl); request.getRequestDispatcher("/admin/config.jsp").forward(request, response); } @@ -113,14 +110,12 @@ String lamsServerId = request.getParameter("lamsServerId"); String lamsSecretKey = request.getParameter("lamsSecretKey"); String lamsServerTimeRefreshInterval = request.getParameter("lamsServerTimeRefreshInterval"); - String lamsAltServerUrl = request.getParameter("lamsAltServerUrl"); // Save the properties to Blackboard properties.setProperty(LamsPluginUtil.PROP_LAMS_URL, lamsServerUrl); properties.setProperty(LamsPluginUtil.PROP_LAMS_SECRET_KEY, lamsSecretKey); properties.setProperty(LamsPluginUtil.PROP_LAMS_SERVER_ID, lamsServerId); properties.setProperty(LamsPluginUtil.PROP_LAMS_SERVER_TIME_REFRESH_INTERVAL, lamsServerTimeRefreshInterval); - properties.setProperty(LamsPluginUtil.PROP_ALT_LAMS_URL, lamsAltServerUrl); // Persist the properties object LamsPluginUtil.setProperties(properties); Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsPluginUtil.java =================================================================== diff -u -r2136e303633dc6cfaf9367e5f279cfcd75105752 -r395273be49a085c31a20eadef9120dc429a1324b --- lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsPluginUtil.java (.../LamsPluginUtil.java) (revision 2136e303633dc6cfaf9367e5f279cfcd75105752) +++ lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsPluginUtil.java (.../LamsPluginUtil.java) (revision 395273be49a085c31a20eadef9120dc429a1324b) @@ -50,7 +50,6 @@ public static final String PROP_LAMS_SERVER_ID = "LAMS_SERVER_ID"; public static final String PROP_LAMS_URL = "LAMS_SERVER_URL"; public static final String PROP_LAMS_SERVER_TIME_REFRESH_INTERVAL = "LAMS_SERVER_TIME_REFRESH_INTERVAL"; - public static final String PROP_ALT_LAMS_URL = "LAMS_ALT_SERVER_URL"; private static Properties lamsProperties = null; Index: lams_bb_integration/web/admin/config.jsp =================================================================== diff -u -r2136e303633dc6cfaf9367e5f279cfcd75105752 -r395273be49a085c31a20eadef9120dc429a1324b --- lams_bb_integration/web/admin/config.jsp (.../config.jsp) (revision 2136e303633dc6cfaf9367e5f279cfcd75105752) +++ lams_bb_integration/web/admin/config.jsp (.../config.jsp) (revision 395273be49a085c31a20eadef9120dc429a1324b) @@ -39,9 +39,6 @@ - - -

For further information on how to configure these settings, see this tutorial.

Index: lams_bb_integration/web/admin/configSuccess.jsp =================================================================== diff -u -r2136e303633dc6cfaf9367e5f279cfcd75105752 -r395273be49a085c31a20eadef9120dc429a1324b --- lams_bb_integration/web/admin/configSuccess.jsp (.../configSuccess.jsp) (revision 2136e303633dc6cfaf9367e5f279cfcd75105752) +++ lams_bb_integration/web/admin/configSuccess.jsp (.../configSuccess.jsp) (revision 395273be49a085c31a20eadef9120dc429a1324b) @@ -33,8 +33,7 @@ LAMS_SERVER_URL: ${param.lamsServerUrl}
LAMS_SERVER_SKEY: ${param.lamsSecretKey}
LAMS_SERVER_ID: ${param.lamsServerId}
- LAMS_SERVER_TIME_REFRESH_INTERVAL: ${param.lamsServerTimeRefreshInterval}
- LAMS_ALT_SERVER_URL: ${param.lamsAltServerUrl} + LAMS_SERVER_TIME_REFRESH_INTERVAL: ${param.lamsServerTimeRefreshInterval} \ No newline at end of file