- * View Source - *
- * + * + *+ * View Source + *
+ * * @author Fei Yang */ public class MonitorTest extends AbstractTest { - - public static final String DEFAULT_LESSON_NAME = "Lesson"; - + + public static final String DEFAULT_LESSON_NAME = "Lesson"; + private String initLessonURL; - + private String createLessonClassURL; - + private String startLessonURL; - + private String getLessonDetailsURL; - + private String getContributeActivitiesURL; - + private String getLearningDesignDetailsURL; - + private String getAllLearnersProgressURL; - + private String lessonName; - + private String lsId; - + private Thread monitorThread; /** * MonitorTest Construtor * */ - public MonitorTest(String testName, CallType callType, String rmiRegistryName, String webServiceAddress, Integer minDelay, Integer maxDelay, String initLessonURL, String createLessonClassURL, String startLessonURL, String getLessonDetailsURL, String getContributeActivitiesURL, String getLearningDesignDetailsURL, String getAllLearnersProgressURL, String lessonName, String lsId) { - super(testName, callType, rmiRegistryName, webServiceAddress, minDelay, maxDelay); - this.initLessonURL = initLessonURL; - this.createLessonClassURL = createLessonClassURL; - this.startLessonURL = startLessonURL; - this.getLessonDetailsURL = getLessonDetailsURL; - this.getContributeActivitiesURL = getContributeActivitiesURL; - this.getLearningDesignDetailsURL = getLearningDesignDetailsURL; - this.getAllLearnersProgressURL = getAllLearnersProgressURL; - this.lessonName = lessonName==null? TestUtil.buildName(testName,DEFAULT_LESSON_NAME) : TestUtil.buildName(testName, lessonName); - this.lsId = lsId; + public MonitorTest(String testName, CallType callType, String rmiRegistryName, String webServiceAddress, + Integer minDelay, Integer maxDelay, String initLessonURL, String createLessonClassURL, + String startLessonURL, String getLessonDetailsURL, String getContributeActivitiesURL, + String getLearningDesignDetailsURL, String getAllLearnersProgressURL, String lessonName, String lsId) { + super(testName, callType, rmiRegistryName, webServiceAddress, minDelay, maxDelay); + this.initLessonURL = initLessonURL; + this.createLessonClassURL = createLessonClassURL; + this.startLessonURL = startLessonURL; + this.getLessonDetailsURL = getLessonDetailsURL; + this.getContributeActivitiesURL = getContributeActivitiesURL; + this.getLearningDesignDetailsURL = getLearningDesignDetailsURL; + this.getAllLearnersProgressURL = getAllLearnersProgressURL; + this.lessonName = lessonName == null ? TestUtil.buildName(testName, MonitorTest.DEFAULT_LESSON_NAME) : TestUtil + .buildName(testName, lessonName); + this.lsId = lsId; } - - @Override - protected void startWEB(){ - MockMonitor monitor = (MockMonitor)users[0]; - if(lsId == null){ - monitor.login(); - String ldId = getTestSuite().getAuthorTest().getLdId(); - setLsId(monitor.initLesson(initLessonURL,ldId,monitor.getUserId(),lessonName)); - monitor.createLessonClass(createLessonClassURL,monitor.getUserId()); - monitor.startLesson(startLessonURL,lsId,monitor.getUserId()); - } - //monitor learners progress - monitorThread = new Thread(monitor, monitor.getUsername()); - monitorThread.start(); + @Override + protected void startWEB() { + MockMonitor monitor = (MockMonitor) users[0]; + if (lsId == null) { + monitor.login(); + String organisationID = getTestSuite().getAdminTest().getCourseId(); + String ldId = getTestSuite().getAuthorTest().getLdId(); + setLsId(monitor.initLesson(initLessonURL, ldId, organisationID, monitor.getUserId(), lessonName)); + monitor.createLessonClass(createLessonClassURL, monitor.getUserId()); + monitor.startLesson(startLessonURL, lsId, monitor.getUserId()); } + // monitor learners progress + monitorThread = new Thread(monitor, monitor.getUsername()); + monitorThread.start(); + } - @Override - protected void startWS(){ - //TODO implement me - } + @Override + protected void startWS() { + // TODO implement me + } - @Override - protected void startRMI(){ - //TODO implement me - } + @Override + protected void startRMI() { + // TODO implement me + } - public void notifyMonitorToStop(CountDownLatch stopSignal){ - if((monitorThread != null) && monitorThread.isAlive()){ - ((MockMonitor)users[0]).setStopFlag(stopSignal); - }else{ - stopSignal.countDown(); - } + public void notifyMonitorToStop(CountDownLatch stopSignal) { + if ((monitorThread != null) && monitorThread.isAlive()) { + ((MockMonitor) users[0]).setStopFlag(stopSignal); + } else { + stopSignal.countDown(); } + } - public final String getCreateLessonClassURL() { - return createLessonClassURL; - } + public final String getCreateLessonClassURL() { + return createLessonClassURL; + } + public final void setCreateLessonClassURL(String createLessonClassURL) { + this.createLessonClassURL = createLessonClassURL; + } - public final void setCreateLessonClassURL(String createLessonClassURL) { - this.createLessonClassURL = createLessonClassURL; - } + public final String getInitLessonURL() { + return initLessonURL; + } + public final void setInitLessonURL(String initLessonURL) { + this.initLessonURL = initLessonURL; + } - public final String getInitLessonURL() { - return initLessonURL; - } + public final String getStartLessonURL() { + return startLessonURL; + } + public final void setStartLessonURL(String startLessonURL) { + this.startLessonURL = startLessonURL; + } - public final void setInitLessonURL(String initLessonURL) { - this.initLessonURL = initLessonURL; - } + public final String getLsId() { + return lsId; + } + public final void setLsId(String lsId) { + this.lsId = lsId; + } - public final String getStartLessonURL() { - return startLessonURL; - } + public final String getGetAllLearnersProgressURL() { + return getAllLearnersProgressURL; + } + public final String getGetContributeActivitiesURL() { + return getContributeActivitiesURL; + } - public final void setStartLessonURL(String startLessonURL) { - this.startLessonURL = startLessonURL; - } + public final String getGetLearningDesignDetailsURL() { + return getLearningDesignDetailsURL; + } + public final String getGetLessonDetailsURL() { + return getLessonDetailsURL; + } - public final String getLsId() { - return lsId; - } - - - public final void setLsId(String lsId) { - this.lsId = lsId; - } - - - public final String getGetAllLearnersProgressURL() { - return getAllLearnersProgressURL; - } - - - public final String getGetContributeActivitiesURL() { - return getContributeActivitiesURL; - } - - - public final String getGetLearningDesignDetailsURL() { - return getLearningDesignDetailsURL; - } - - - public final String getGetLessonDetailsURL() { - return getLessonDetailsURL; - } - } Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r668a627903b72826f7dffa148a7e775139af8b5e -r86f8f142891162680c6f7ed66a8c4edf574df991 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/web/servlet/AbstractStoreWDDXPacketServlet.java =================================================================== diff -u -rc8c2ba7d3dc97478709b5d00b01c0cdde3bf9f6b -r86f8f142891162680c6f7ed66a8c4edf574df991 --- lams_common/src/java/org/lamsfoundation/lams/web/servlet/AbstractStoreWDDXPacketServlet.java (.../AbstractStoreWDDXPacketServlet.java) (revision c8c2ba7d3dc97478709b5d00b01c0cdde3bf9f6b) +++ lams_common/src/java/org/lamsfoundation/lams/web/servlet/AbstractStoreWDDXPacketServlet.java (.../AbstractStoreWDDXPacketServlet.java) (revision 86f8f142891162680c6f7ed66a8c4edf574df991) @@ -24,16 +24,13 @@ package org.lamsfoundation.lams.web.servlet; import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.OutputStream; import java.io.PrintWriter; import java.io.Writer; import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -45,143 +42,132 @@ import org.springframework.web.context.support.WebApplicationContextUtils; /** - * Base servlet for handling WDDX packets sent by Flash. - * This servlet takes care of reading the packet from the - * POST body. A subclass must implement the process() method - * and the getMessageKey() method. + * Base servlet for handling WDDX packets sent by Flash. This servlet takes care of reading the packet from the POST + * body. A subclass must implement the process() method and the getMessageKey() method. *- * If an error occurs during processing, the process method - * should throw an exception. The base class will log the exception - * and return an error message to Flash. + * If an error occurs during processing, the process method should throw an exception. The base class will log the + * exception and return an error message to Flash. *
- * We cannot use Struts actions as the WDDX packet is the - * complete contents POST body and Struts consumes the body + * We cannot use Struts actions as the WDDX packet is the complete contents POST body and Struts consumes the body * before we can get to it. *
- * If this servlet receives a GET rather than a POST, then an - * error packet (in wddx format) will be returned. + * If this servlet receives a GET rather than a POST, then an error packet (in wddx format) will be returned. *
- * If the log level is set to debug, then the both the received packet
- * and the reply packet will be logged.
+ * If the log level is set to debug, then the both the received packet and the reply packet will be logged.
*
* @author Fiona Malikoff
*/
public abstract class AbstractStoreWDDXPacketServlet extends HttpServlet {
- private static Logger log = Logger.getLogger(AbstractStoreWDDXPacketServlet.class);
- private static IAuditService auditService;
+ private static Logger log = Logger.getLogger(AbstractStoreWDDXPacketServlet.class);
+ private static IAuditService auditService;
- /**
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest, HttpServletResponse)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- Writer writer = response.getWriter();
- FlashMessage flashMessage = FlashMessage.getWDDXPacketGetReceived(getMessageKey(null,request));
+ /**
+ * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest, HttpServletResponse)
+ */
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ Writer writer = response.getWriter();
+ FlashMessage flashMessage = FlashMessage.getWDDXPacketGetReceived(getMessageKey(null, request));
+ writer.write(flashMessage.serializeMessage());
+ }
+
+ /**
+ * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest, HttpServletResponse)
+ */
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ AbstractStoreWDDXPacketServlet.auditService = getAuditService();
+ PrintWriter writer = null;
+ String packet = null;
+ String replyPacket = null;
+ try {
+ writer = response.getWriter();
+
+ packet = AbstractStoreWDDXPacketServlet.getBody(request);
+ if (AbstractStoreWDDXPacketServlet.log.isDebugEnabled()) {
+ AbstractStoreWDDXPacketServlet.log.debug("Request " + request.getRequestURI()
+ + " received packet length " + packet);
+ }
+
+ if (containsNulls(packet)) {
+ FlashMessage flashMessage = new FlashMessage(getMessageKey(packet, request),
+ "WDDXPacket contains null", FlashMessage.ERROR);
writer.write(flashMessage.serializeMessage());
- }
+ }
- /**
- * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest, HttpServletResponse)
- */
- protected void doPost(HttpServletRequest request, HttpServletResponse response)
- throws IOException
- {
- auditService = getAuditService();
- PrintWriter writer = null;
- String packet = null;
- String replyPacket = null;
- try {
- writer = response.getWriter();
+ replyPacket = process(packet, request);
- packet = getBody(request);
- if ( log.isDebugEnabled() ) {
- log.debug("Request "+request.getRequestURI()+" received packet length "+packet);
- }
+ if (AbstractStoreWDDXPacketServlet.log.isDebugEnabled()) {
+ AbstractStoreWDDXPacketServlet.log.debug("Request " + request.getRequestURI() + " sending back packet "
+ + replyPacket);
+ }
- if(containsNulls(packet)){
- FlashMessage flashMessage = new FlashMessage(getMessageKey(packet,request),
- "WDDXPacket contains null",
- FlashMessage.ERROR);
- writer.write(flashMessage.serializeMessage());
- }
+ } catch (Exception e) {
+ // Don't want exceptions flowing back to Flash if we can help it.
+ String uri = request.getRequestURI();
+ AbstractStoreWDDXPacketServlet.log.error(uri + " request triggered exception ", e);
- replyPacket = process(packet, request);
+ FlashMessage flashMessage = FlashMessage.getExceptionOccured(getMessageKey(packet, request),
+ e.getMessage() != null ? e.getMessage() : e.getClass().getName());
+ writer.write(flashMessage.serializeMessage());
- if ( log.isDebugEnabled() ) {
- log.debug("Request "+request.getRequestURI()+" sending back packet "+replyPacket);
- }
-
- } catch ( Exception e ) {
- // Don't want exceptions flowing back to Flash if we can help it.
- String uri = request.getRequestURI();
- log.error(uri+" request triggered exception ",e);
-
- FlashMessage flashMessage = FlashMessage.getExceptionOccured(getMessageKey(packet,request),
- e.getMessage()!=null?e.getMessage():e.getClass().getName());
- writer.write(flashMessage.serializeMessage());
-
- auditService.log(AbstractStoreWDDXPacketServlet.class.getName(),"URL:"+uri+" triggered exception"+e.toString());
- return;
- }
-
- // can't inform Flash if an exception occurs now...
- if ( writer != null )
- writer.println(replyPacket);
+ AbstractStoreWDDXPacketServlet.auditService.log(AbstractStoreWDDXPacketServlet.class.getName(), "URL:"
+ + uri + " triggered exception" + e.toString());
+ return;
}
-
- /**
- * Checks whether the WDDX packet contains any invalid
- * "
- * If an error occurs, this method should throw an exception - * so that the base class will log the exception and return an error message - * to Flash. - * @return A string which is a WDDX packet containing a FlashMessage. - */ - abstract protected String process(String packet, HttpServletRequest request) - throws Exception; + } - /** - * Get the "name" of the servlet. This must match the name - * that is returned in the messageKey section of the FlashMessage - * when the packet is successfully stored. - *
- * If an exception is thrown by process(), the base class - * generates an error packet to send back to Flash. It will include - * this messageKey in the error message, so that the Flash client - * can match the error to the call. - * @return messageKey - */ - abstract protected String getMessageKey(String packet, HttpServletRequest request); - - /** - * Get AuditService bean. - * @return - */ - private IAuditService getAuditService(){ - if(auditService==null){ - WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(this.getServletContext()); - auditService = (IAuditService) ctx.getBean("auditService"); - } - return auditService; + /** + * Process the packet received from Flash. + *
+ * If an error occurs, this method should throw an exception so that the base class will log the exception and + * return an error message to Flash. + * + * @return A string which is a WDDX packet containing a FlashMessage. + */ + abstract protected String process(String packet, HttpServletRequest request) throws Exception; + + /** + * Get the "name" of the servlet. This must match the name that is returned in the messageKey section of the + * FlashMessage when the packet is successfully stored. + *
+ * If an exception is thrown by process(), the base class generates an error packet to send back to Flash. It will + * include this messageKey in the error message, so that the Flash client can match the error to the call. + * + * @return messageKey + */ + abstract protected String getMessageKey(String packet, HttpServletRequest request); + + /** + * Get AuditService bean. + * + * @return + */ + private IAuditService getAuditService() { + if (AbstractStoreWDDXPacketServlet.auditService == null) { + WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(this + .getServletContext()); + AbstractStoreWDDXPacketServlet.auditService = (IAuditService) ctx.getBean("auditService"); } + return AbstractStoreWDDXPacketServlet.auditService; + } } Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp =================================================================== diff -u -rd89dfbd4b29efec465fba9bb517dea1d173c3844 -r86f8f142891162680c6f7ed66a8c4edf574df991 --- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp (.../allquestions.jsp) (revision d89dfbd4b29efec465fba9bb517dea1d173c3844) +++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp (.../allquestions.jsp) (revision 86f8f142891162680c6f7ed66a8c4edf574df991) @@ -1,5 +1,5 @@ <%@ include file="/common/taglibs.jsp"%> -