Index: lams_bb_integration/.classpath
===================================================================
diff -u -rcb4d1ec0d063d0d5c6eb8ab9c44e712006961229 -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/.classpath (.../.classpath) (revision cb4d1ec0d063d0d5c6eb8ab9c44e712006961229)
+++ lams_bb_integration/.classpath (.../.classpath) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -10,9 +10,10 @@
-
+
+
Index: lams_bb_integration/RELEASE_NOTES.TXT
===================================================================
diff -u -rad162da27085fe8316d8b6a6a85c473c3e9dbe5a -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision ad162da27085fe8316d8b6a6a85c473c3e9dbe5a)
+++ lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -142,4 +142,11 @@
* LDEV-4164: Fix sorting in BB content area
* LDEV-4171: Remove obsolete svgFormat parameter that is no longer used in WF as long as it produces only SVGs (no PNGs)
* LDEV-4178: Escape commas when pre-adding users to a lesson
+
+1.2.21 Release Fixes
+====================
* LDEV-4169: Preview window doesn't scroll down with IE11
+
+1.2.22 Release Fixes
+====================
+* NTU-13: Make BB recurrently fetch marks from LAMS that were not yet submitted to external server
Index: lams_bb_integration/WEB-INF/bb-manifest.xml
===================================================================
diff -u -r8fc1a1bffe5907d6f05f859a8f1cb5b2b62709c4 -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision 8fc1a1bffe5907d6f05f859a8f1cb5b2b62709c4)
+++ lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -5,7 +5,7 @@
-
+
@@ -82,6 +82,8 @@
+
+
Fisheye: Tag 535a8b4b59cfcf0932f4f3835915a8635107306c refers to a dead (removed) revision in file `lams_bb_integration/WEB-INF/config/log4j.properties'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_bb_integration/build.xml
===================================================================
diff -u -rc2d3407a0f824ccd6879b4081e8fd93df53d4d97 -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/build.xml (.../build.xml) (revision c2d3407a0f824ccd6879b4081e8fd93df53d4d97)
+++ lams_bb_integration/build.xml (.../build.xml) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -2,7 +2,7 @@
-
+
@@ -60,6 +60,12 @@
+
+
+
+
+
+
Index: lams_bb_integration/lib/log4j-1.2.8.jar
===================================================================
diff -u -r8af1746d179f41095b074fef269722c6689b39eb -r535a8b4b59cfcf0932f4f3835915a8635107306c
Binary files differ
Index: lams_bb_integration/lib/slf4j-api-1.7.5.jar
===================================================================
diff -u
Binary files differ
Index: lams_bb_integration/lib/slf4j-simple-1.7.5.jar
===================================================================
diff -u
Binary files differ
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookServlet.java
===================================================================
diff -u -r325dff1f0456e1573a732bee5381490599f1980a -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookServlet.java (.../GradebookServlet.java) (revision 325dff1f0456e1573a732bee5381490599f1980a)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookServlet.java (.../GradebookServlet.java) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -41,7 +41,8 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.lamsfoundation.ld.integration.Constants;
import org.lamsfoundation.ld.integration.util.LamsPluginUtil;
import org.lamsfoundation.ld.integration.util.LamsSecurityUtil;
@@ -72,7 +73,7 @@
public class GradebookServlet extends HttpServlet {
private static final long serialVersionUID = -3587062723412672084L;
- private static Logger logger = Logger.getLogger(GradebookServlet.class);
+ private static Logger logger = LoggerFactory.getLogger(GradebookServlet.class);
/**
* Receives call from Lams ab lesson completion. After that get the latest marks for this user in this lesson and stores it in DB.
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookSyncServlet.java
===================================================================
diff -u -r325dff1f0456e1573a732bee5381490599f1980a -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookSyncServlet.java (.../GradebookSyncServlet.java) (revision 325dff1f0456e1573a732bee5381490599f1980a)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookSyncServlet.java (.../GradebookSyncServlet.java) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -42,7 +42,8 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.lamsfoundation.ld.integration.Constants;
import org.lamsfoundation.ld.integration.util.LamsBuildingBlockException;
import org.lamsfoundation.ld.integration.util.LamsSecurityUtil;
@@ -73,7 +74,7 @@
public class GradebookSyncServlet extends HttpServlet {
private static final long serialVersionUID = -3587062723412672084L;
- private static Logger logger = Logger.getLogger(GradebookSyncServlet.class);
+ private static Logger logger = LoggerFactory.getLogger(GradebookSyncServlet.class);
/**
* Monitor on BB side calls this servlet to syncronize lesson marks with LAMS Gradebook. After that get the latest
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GroupDataServlet.java
===================================================================
diff -u -rbcdec8a8d07dc56cbb3ef12d4465d3e9032666c9 -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GroupDataServlet.java (.../GroupDataServlet.java) (revision bcdec8a8d07dc56cbb3ef12d4465d3e9032666c9)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GroupDataServlet.java (.../GroupDataServlet.java) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -31,7 +31,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.lamsfoundation.ld.integration.Constants;
import org.lamsfoundation.ld.integration.util.LamsPluginUtil;
import org.lamsfoundation.ld.integration.util.LamsSecurityUtil;
@@ -59,7 +60,7 @@
public class GroupDataServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
- private static Logger logger = Logger.getLogger(GroupDataServlet.class);
+ private static Logger logger = LoggerFactory.getLogger(GroupDataServlet.class);
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LearnerMonitorServlet.java
===================================================================
diff -u -r8fc1a1bffe5907d6f05f859a8f1cb5b2b62709c4 -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LearnerMonitorServlet.java (.../LearnerMonitorServlet.java) (revision 8fc1a1bffe5907d6f05f859a8f1cb5b2b62709c4)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LearnerMonitorServlet.java (.../LearnerMonitorServlet.java) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -7,7 +7,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.lamsfoundation.ld.integration.dto.LearnerProgressDTO;
import org.lamsfoundation.ld.integration.util.LamsSecurityUtil;
@@ -38,7 +39,7 @@
public class LearnerMonitorServlet extends HttpServlet {
private static final long serialVersionUID = -351131323404991332L;
- private static Logger logger = Logger.getLogger(LearnerMonitorServlet.class);
+ private static Logger logger = LoggerFactory.getLogger(LearnerMonitorServlet.class);
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LessonManagerServlet.java
===================================================================
diff -u -r28700459414022241db578651040ca9810b51529 -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision 28700459414022241db578651040ca9810b51529)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -32,7 +32,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.lamsfoundation.ld.integration.util.BlackboardUtil;
import org.lamsfoundation.ld.integration.util.LamsSecurityUtil;
import org.lamsfoundation.ld.integration.util.LineitemUtil;
@@ -69,7 +70,7 @@
public class LessonManagerServlet extends HttpServlet {
private static final long serialVersionUID = -351131323404991332L;
- private static Logger logger = Logger.getLogger(LessonManagerServlet.class);
+ private static Logger logger = LoggerFactory.getLogger(LessonManagerServlet.class);
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
process(request, response);
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LinkToolsServlet.java
===================================================================
diff -u -rbcdec8a8d07dc56cbb3ef12d4465d3e9032666c9 -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LinkToolsServlet.java (.../LinkToolsServlet.java) (revision bcdec8a8d07dc56cbb3ef12d4465d3e9032666c9)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LinkToolsServlet.java (.../LinkToolsServlet.java) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -34,7 +34,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.lamsfoundation.ld.integration.util.BlackboardUtil;
import org.lamsfoundation.ld.integration.util.LamsSecurityUtil;
import org.lamsfoundation.ld.integration.util.LamsServerException;
@@ -72,7 +73,7 @@
public class LinkToolsServlet extends HttpServlet {
private static final long serialVersionUID = -351131323404991332L;
- private static Logger logger = Logger.getLogger(LinkToolsServlet.class);
+ private static Logger logger = LoggerFactory.getLogger(LinkToolsServlet.class);
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
process(request, response);
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/OpenLamsPageServlet.java
===================================================================
diff -u -r8fc1a1bffe5907d6f05f859a8f1cb5b2b62709c4 -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/OpenLamsPageServlet.java (.../OpenLamsPageServlet.java) (revision 8fc1a1bffe5907d6f05f859a8f1cb5b2b62709c4)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/OpenLamsPageServlet.java (.../OpenLamsPageServlet.java) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -28,7 +28,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.lamsfoundation.ld.integration.util.LamsSecurityUtil;
import blackboard.base.InitializationException;
@@ -54,7 +55,7 @@
public class OpenLamsPageServlet extends HttpServlet {
private static final long serialVersionUID = -351131323404991332L;
- private static Logger logger = Logger.getLogger(OpenLamsPageServlet.class);
+ private static Logger logger = LoggerFactory.getLogger(OpenLamsPageServlet.class);
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
process(request, response);
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/StartLessonAjaxServlet.java
===================================================================
diff -u -r8fc1a1bffe5907d6f05f859a8f1cb5b2b62709c4 -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/StartLessonAjaxServlet.java (.../StartLessonAjaxServlet.java) (revision 8fc1a1bffe5907d6f05f859a8f1cb5b2b62709c4)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/StartLessonAjaxServlet.java (.../StartLessonAjaxServlet.java) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -29,7 +29,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.lamsfoundation.ld.integration.util.BlackboardUtil;
import org.xml.sax.SAXException;
@@ -49,7 +50,7 @@
public class StartLessonAjaxServlet extends HttpServlet {
private static final long serialVersionUID = -351131323404991332L;
- private static Logger logger = Logger.getLogger(StartLessonAjaxServlet.class);
+ private static Logger logger = LoggerFactory.getLogger(StartLessonAjaxServlet.class);
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
process(request, response);
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/UpdateServerUrlServlet.java
===================================================================
diff -u -r8fc1a1bffe5907d6f05f859a8f1cb5b2b62709c4 -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/UpdateServerUrlServlet.java (.../UpdateServerUrlServlet.java) (revision 8fc1a1bffe5907d6f05f859a8f1cb5b2b62709c4)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/UpdateServerUrlServlet.java (.../UpdateServerUrlServlet.java) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -31,7 +31,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.lamsfoundation.ld.integration.Constants;
import org.lamsfoundation.ld.integration.util.BlackboardUtil;
@@ -57,7 +58,7 @@
public class UpdateServerUrlServlet extends HttpServlet {
private static final long serialVersionUID = 274843716397522792L;
- private static Logger logger = Logger.getLogger(UpdateServerUrlServlet.class);
+ private static Logger logger = LoggerFactory.getLogger(UpdateServerUrlServlet.class);
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/UserDataServlet.java
===================================================================
diff -u -r8fc1a1bffe5907d6f05f859a8f1cb5b2b62709c4 -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/UserDataServlet.java (.../UserDataServlet.java) (revision 8fc1a1bffe5907d6f05f859a8f1cb5b2b62709c4)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/UserDataServlet.java (.../UserDataServlet.java) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -28,7 +28,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.lamsfoundation.ld.integration.Constants;
import org.lamsfoundation.ld.integration.util.CSVUtil;
import org.lamsfoundation.ld.integration.util.LamsPluginUtil;
@@ -44,7 +45,7 @@
public class UserDataServlet extends HttpServlet {
private static final long serialVersionUID = 2L;
- private static Logger logger = Logger.getLogger(UserDataServlet.class);
+ private static Logger logger = LoggerFactory.getLogger(UserDataServlet.class);
/**
* The doGet method of the servlet.
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java
===================================================================
diff -u -r1e91ea68c110f3c4488d211a59401356888e7da1 -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision 1e91ea68c110f3c4488d211a59401356888e7da1)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -46,7 +46,8 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.lamsfoundation.ld.integration.dto.LearnerProgressDTO;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -73,7 +74,7 @@
*/
public class LamsSecurityUtil {
- private static Logger logger = Logger.getLogger(LamsSecurityUtil.class);
+ private static Logger logger = LoggerFactory.getLogger(LamsSecurityUtil.class);
private static final String DUMMY_COURSE = "Previews";
private static final String EXPORT_FOLDER_LAMS_SERVER = "/tmp/lams/";
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LineitemUtil.java
===================================================================
diff -u -r325dff1f0456e1573a732bee5381490599f1980a -r535a8b4b59cfcf0932f4f3835915a8635107306c
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LineitemUtil.java (.../LineitemUtil.java) (revision 325dff1f0456e1573a732bee5381490599f1980a)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LineitemUtil.java (.../LineitemUtil.java) (revision 535a8b4b59cfcf0932f4f3835915a8635107306c)
@@ -36,7 +36,8 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.lamsfoundation.ld.integration.Constants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -74,7 +75,7 @@
private final static String LAMS_LINEITEM_STORAGE = "LamsLineitemStorage";
- private static Logger logger = Logger.getLogger(LineitemUtil.class);
+ private static Logger logger = LoggerFactory.getLogger(LineitemUtil.class);
@SuppressWarnings("deprecation")
public static void createLineitem(Content bbContent, String userName)