Index: lams_build/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/build.xml,v diff -u -r1.50.2.1 -r1.50.2.2 --- lams_build/build.xml 12 Mar 2007 04:37:15 -0000 1.50.2.1 +++ lams_build/build.xml 26 Mar 2007 05:59:43 -0000 1.50.2.2 @@ -206,7 +206,25 @@ + + + + + + + + + + + + + + + + Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/deploy-tool/lib/lams-tool-deploy.jar,v diff -u -r1.9.4.1 -r1.9.4.2 Binary files differ Fisheye: Tag 1.2.2.2 refers to a dead (removed) revision in file `lams_central/conf/language/lams/ApplicationResources_el_GK.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/db/sql/insert_unix_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_unix_config_data.sql,v diff -u -r1.8.6.2 -r1.8.6.3 --- lams_common/db/sql/insert_unix_config_data.sql 12 Mar 2007 08:19:20 -0000 1.8.6.2 +++ lams_common/db/sql/insert_unix_config_data.sql 26 Mar 2007 06:03:53 -0000 1.8.6.3 @@ -1,9 +1,9 @@ insert into lams_configuration (config_key, config_value) values ('ServerURL','http://shaun.melcoe.mq.edu.au/lams/'); -insert into lams_configuration (config_key, config_value) values ('Version','2.0.1'); +insert into lams_configuration (config_key, config_value) values ('Version','2.0.2'); insert into lams_configuration (config_key, config_value) values ('TempDir','/var/opt/lams/temp'); insert into lams_configuration (config_key, config_value) values ('DumpDir','/var/opt/lams/dump'); insert into lams_configuration (config_key, config_value) values ('EARDir','/usr/local/jboss-4.0.2/server/default/deploy/lams.ear'); -insert into lams_configuration (config_key, config_value) values ('SMTPServer','mail.lib.mq.edu.au'); +insert into lams_configuration (config_key, config_value) values ('SMTPServer',''); insert into lams_configuration (config_key, config_value) values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au'); insert into lams_configuration (config_key, config_value) values ('ContentRepositoryPath','/var/opt/lams/repository'); insert into lams_configuration (config_key, config_value) values ('UploadFileMaxSize','1048576'); @@ -14,13 +14,13 @@ insert into lams_configuration (config_key, config_value) values ('UseCacheDebugListener','false'); insert into lams_configuration (config_key, config_value) values ('CleanupPreviewOlderThanDays','7'); insert into lams_configuration (config_key, config_value) values ('AuthoringActivitiesColour', 'true'); -insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','2.0.@datetimestamp@'); -insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.@datetimestamp@'); -insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.@datetimestamp@'); -insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','2.0.@datetimestamp@'); +insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','2.0.2.@datetimestamp@'); +insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.2.@datetimestamp@'); +insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.2.@datetimestamp@'); +insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','2.0.2.@datetimestamp@'); insert into lams_configuration (config_key, config_value) values ('ServerLanguage','en_AU'); insert into lams_configuration (config_key, config_value) values ('ServerPageDirection','LTR'); -insert into lams_configuration (config_key, config_value) values ('DictionaryDateCreated','2006-12-05'); +insert into lams_configuration (config_key, config_value) values ('DictionaryDateCreated','2007-03-19'); insert into lams_configuration (config_key, config_value) values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/'); insert into lams_configuration (config_key, config_value) values ('XmppDomain','shaun.melcoe.mq.edu.au'); insert into lams_configuration (config_key, config_value) values ('XmppConference','conference.shaun.melcoe.mq.edu.au'); Index: lams_common/db/sql/insert_windows_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_windows_config_data.sql,v diff -u -r1.12.6.2 -r1.12.6.3 --- lams_common/db/sql/insert_windows_config_data.sql 12 Mar 2007 08:19:19 -0000 1.12.6.2 +++ lams_common/db/sql/insert_windows_config_data.sql 26 Mar 2007 06:03:53 -0000 1.12.6.3 @@ -1,9 +1,9 @@ insert into lams_configuration (config_key, config_value) values ('ServerURL','http://localhost:8080/lams/'); -insert into lams_configuration (config_key, config_value) values ('Version','2.0.1'); +insert into lams_configuration (config_key, config_value) values ('Version','2.0.2'); insert into lams_configuration (config_key, config_value) values ('TempDir','C:/lams/temp'); insert into lams_configuration (config_key, config_value) values ('DumpDir','C:/lams/dump'); insert into lams_configuration (config_key, config_value) values ('EARDir','C:/jboss-4.0.2/server/default/deploy/lams.ear'); -insert into lams_configuration (config_key, config_value) values ('SMTPServer','mail.lib.mq.edu.au'); +insert into lams_configuration (config_key, config_value) values ('SMTPServer',''); insert into lams_configuration (config_key, config_value) values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au'); insert into lams_configuration (config_key, config_value) values ('ContentRepositoryPath','C:/lams/repository'); insert into lams_configuration (config_key, config_value) values ('UploadFileMaxSize','1048576'); @@ -14,13 +14,13 @@ insert into lams_configuration (config_key, config_value) values ('UseCacheDebugListener','false'); insert into lams_configuration (config_key, config_value) values ('CleanupPreviewOlderThanDays','7'); insert into lams_configuration (config_key, config_value) values ('AuthoringActivitiesColour', 'true'); -insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','2.0.1.@datetimestamp@'); -insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.1.@datetimestamp@'); -insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.1.@datetimestamp@'); -insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','2.0.1.@datetimestamp@'); +insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','2.0.2.@datetimestamp@'); +insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.2.@datetimestamp@'); +insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.2.@datetimestamp@'); +insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','2.0.2.@datetimestamp@'); insert into lams_configuration (config_key, config_value) values ('ServerLanguage','en_AU'); insert into lams_configuration (config_key, config_value) values ('ServerPageDirection','LTR'); -insert into lams_configuration (config_key, config_value) values ('DictionaryDateCreated','2007-03-08'); +insert into lams_configuration (config_key, config_value) values ('DictionaryDateCreated','2007-03-19'); insert into lams_configuration (config_key, config_value) values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/'); insert into lams_configuration (config_key, config_value) values ('XmppDomain','shaun.melcoe.mq.edu.au'); insert into lams_configuration (config_key, config_value) values ('XmppConference','conference.shaun.melcoe.mq.edu.au'); Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java,v diff -u -r1.16 -r1.16.6.1 --- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java 27 Sep 2006 04:24:06 -0000 1.16 +++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java 26 Mar 2007 06:03:41 -0000 1.16.6.1 @@ -62,6 +62,8 @@ public static final String PARAM_DIRECTORY_NAME = "directoryName"; public static final String PARAM_FILENAME = "filename"; + public static final String PARAM_LIB = "library"; + public static final String ATTR_MODE = "mode"; public static final String ATTR_USERNAME = "username"; public static final String ATTR_UPDATE_PROGRESS_BAR = "updateProgressBar"; Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java,v diff -u -r1.12 -r1.12.2.1 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java 17 Sep 2006 06:19:59 -0000 1.12 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java 26 Mar 2007 06:06:16 -0000 1.12.2.1 @@ -30,6 +30,7 @@ public static final String MONITORING_SERVICE_BEAN_NAME = "monitoringService"; public static final String CREATE_LESSON_MESSAGE_KEY = "createLessonClass"; + public static final String INIT_LESSON_MESSAGE_KEY = "initializeLesson"; public static final String PERFORM_CHOSEN_GROUPING_KEY = "performChosenGrouping"; public static final String KEY_ORGANISATION_ID = "organisationID"; public static final String KEY_LESSON_ID = "lessonID"; Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java,v diff -u -r1.61.2.1 -r1.61.2.2 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 12 Mar 2007 05:37:51 -0000 1.61.2.1 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 26 Mar 2007 06:06:16 -0000 1.61.2.2 @@ -67,13 +67,26 @@ * @return the lesson initialized. */ public Lesson initializeLesson(String lessonName, String lessonDescription,Boolean learnerExportAvailable,long learningDesignId,Integer organisationId,Integer userID); + /** + * Initialize a new lesson so as to start the learning process for a normal or preview learning session. + * It needs to notify lams which learning design it belongs to. The initialize process + * doesn't involve the setup of lesson class and organization. + * + * @param creatorUserId the user who want to create this lesson. + * @param lessonPacket The WDDX packet containing the required initialisation paramaters + * @return WDDX message packet containing the Lesson ID + * @throws Exception + */ + public String initializeLesson(Integer creatorUserId, String lessonPacket) throws Exception; + + /** * Create new lesson according to the learning design specified by the * user, but for a preview session rather than a normal learning session. * The design is not assigned to any workspace folder. */ public Lesson initializeLessonForPreview(String lessonName,String lessonDescription,long learningDesignId,Integer userID); - + /** * Create a lession according to the input lession WDDX package. The sample package is following: * Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.102.2.3 -r1.102.2.4 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 12 Mar 2007 05:37:52 -0000 1.102.2.3 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 26 Mar 2007 06:06:16 -0000 1.102.2.4 @@ -82,6 +82,7 @@ import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator; +import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.MessageService; @@ -422,6 +423,51 @@ } /** + * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#initializeLesson(java.util.Integer, java.lang.String) + */ + public String initializeLesson(Integer creatorUserId, String lessonPacket) throws Exception { + FlashMessage flashMessage = null; + + try{ + Hashtable table = (Hashtable)WDDXProcessor.deserialize(lessonPacket); + + // parse WDDX values + + String title = WDDXProcessor.convertToString("lessonName", table.get("lessonName")); + if ( title == null ) title = "lesson"; // TODO Use getMessage + + String desc = WDDXProcessor.convertToString("lessonDescription", table.get("lessonDescription")); + if ( desc == null ) desc = "description"; // TODO Use getMessage + + int copyType = WDDXProcessor.convertToInt("copyType", table.get("copyType")); + + Integer organisationId = WDDXProcessor.convertToInteger("organisationID", table.get("organisationID")); + long ldId = WDDXProcessor.convertToLong(AttributeNames.PARAM_LEARNINGDESIGN_ID, table.get(AttributeNames.PARAM_LEARNINGDESIGN_ID)); + + boolean learnerExportAvailable = WDDXProcessor.convertToBoolean("learnerExportPortfolio", table.get("learnerExportPortfolio")); + + // initialize lesson + + Lesson newLesson = null; + + if(copyType == LearningDesign.COPY_TYPE_PREVIEW) + newLesson = initializeLessonForPreview(title, desc, ldId, creatorUserId); + else + newLesson = initializeLesson(title, desc, learnerExportAvailable, ldId, organisationId, creatorUserId); + + if(newLesson != null) + flashMessage = new FlashMessage("initializeLesson",newLesson.getLessonId()); + + return flashMessage.serializeMessage(); + + } catch (Exception e) { + log.error("Exception occured trying to create a lesson class ",e); + throw new Exception(e); + } + + } + + /** * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#createLessonClassForLessonWDDX(Integer, String, java.util.Integer) */ public String createLessonClassForLessonWDDX(Integer creatorUserId, String lessonPacket) throws UserAccessDeniedException { Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v diff -u -r1.50.2.1 -r1.50.2.2 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 12 Mar 2007 05:37:53 -0000 1.50.2.1 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 26 Mar 2007 06:06:16 -0000 1.50.2.2 @@ -155,6 +155,7 @@ * the user is to go next. * @throws IOException * @throws ServletException + * @deprecated */ public ActionForward initializeLesson(ActionMapping mapping, ActionForm form, @@ -803,15 +804,12 @@ try { Integer userID = getUserId(); - long learningDesignID = WebUtil.readLongParam(request,AttributeNames.PARAM_LEARNINGDESIGN_ID); - String title = WebUtil.readStrParam(request,"title"); - String desc = WebUtil.readStrParam(request,"description"); + long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); - // initialize the lesson - Lesson previewLesson = monitoringService.initializeLessonForPreview(title,desc,learningDesignID,userID); - if ( previewLesson != null ) { - - long lessonID = previewLesson.getLessonId().longValue(); + /** InitializeLessonServlet handles the Lesson initialisation process. + * Create Lesson Class and start Lesson Preview. */ + + if(new Long(lessonID) != null) { monitoringService.createPreviewClassForLesson(userID, lessonID); monitoringService.startLesson(lessonID, getUserId()); Index: lams_tool_chat/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/build.properties,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_tool_chat/build.properties 12 Mar 2007 05:05:13 -0000 1.3.2.1 +++ lams_tool_chat/build.properties 26 Mar 2007 06:06:59 -0000 1.3.2.2 @@ -11,7 +11,7 @@ package=org/lamsfoundation/lams/tool/chat package.name=org.lamsfoundation.lams.tool.chat weblib=lib -tool.version=20070227 +tool.version=20070315 # Minimum compatible version min.server.version.number=2.0.200612051427 Index: lams_tool_chat/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/db/sql/tool_insert.sql,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_chat/db/sql/tool_insert.sql 12 Mar 2007 05:05:12 -0000 1.5.2.1 +++ lams_tool_chat/db/sql/tool_insert.sql 26 Mar 2007 06:06:38 -0000 1.5.2.2 @@ -55,7 +55,7 @@ 'tool/lachat11/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lachat11', 'org.lamsfoundation.lams.tool.chat.ApplicationResources', -'./lams-tool-lachat11.jar', +'lams-tool-lachat11.jar', '/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml', NOW(), NOW() Index: lams_tool_chat/db/sql/updatescripts/updateTo20070227.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/db/sql/updatescripts/Attic/updateTo20070227.sql,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_tool_chat/db/sql/updatescripts/updateTo20070227.sql 12 Mar 2007 05:05:13 -0000 1.3.2.1 +++ lams_tool_chat/db/sql/updatescripts/updateTo20070227.sql 26 Mar 2007 06:06:38 -0000 1.3.2.2 @@ -1,4 +1,4 @@ -- Update the Notebook tables to 20070227 -- This is for the LAMS 2.0.1 release. -UPDATE lams_tool set modified_date_time = now(), classpath_addition = './lams-tool-lachat11.jar', context_file = '/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml' where tool_signature = 'lachat11'; +UPDATE lams_tool set modified_date_time = now(), classpath_addition = 'lams-tool-lachat11.jar', context_file = '/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml' where tool_signature = 'lachat11'; Index: lams_tool_chat/web/includes/javascript/learning.js =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/includes/javascript/learning.js,v diff -u -r1.6 -r1.6.2.1 --- lams_tool_chat/web/includes/javascript/learning.js 20 Dec 2006 03:41:09 -0000 1.6 +++ lams_tool_chat/web/includes/javascript/learning.js 26 Mar 2007 06:06:51 -0000 1.6.2.1 @@ -2,7 +2,7 @@ /* ******* Constants ******* */ var GROUPCHAT_MSG = ""; var PRIVATE_MSG = "private_message"; -var PALETTE = ["#0000FF", "#006699", "#0066FF", "#6633FF", "#00CCFF", "#009900", "#00CC33", "#339900", "#008080", "#66FF66", "#CC6600", "#FF6600", "#FF9900", "#CC6633", "#FF9933", "#990000", "#A50021", "#990033", "#CC3300", "#FF6666", "#330033", "#663399", "#6633CC", "#660099", "#FF00FF", "#999900", "#808000", "#FFFF00", "#666633", "#292929", "#666666"]; +var PALETTE = ["#0000FF", "#006699", "#0066FF", "#6633FF", "#00CCFF", "#009900", "#00CC33", "#339900", "#008080", "#66FF66", "#CC6600", "#FF6600", "#FF9900", "#CC6633", "#FF9933", "#990000", "#A50021", "#990033", "#CC3300", "#FF6666", "#330033", "#663399", "#6633CC", "#660099", "#FF00FF", "#999900", "#808000", "#FF9FF2", "#666633", "#292929", "#666666"]; /* ******* Helper Functions ******* */ function getColour(nick) { var charSum = 0; Index: lams_tool_forum/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/tool_insert.sql,v diff -u -r1.22.2.1 -r1.22.2.2 --- lams_tool_forum/db/sql/tool_insert.sql 12 Mar 2007 05:05:26 -0000 1.22.2.1 +++ lams_tool_forum/db/sql/tool_insert.sql 26 Mar 2007 06:07:19 -0000 1.22.2.2 @@ -55,7 +55,7 @@ 'tool/lafrum11/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lafrum11', 'org.lamsfoundation.lams.tool.forum.ApplicationResources', -'./lams-tool-lafrum11.jar', +'lams-tool-lafrum11.jar', '/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml', NOW(), NOW()