Index: lams_central/web/lams_preloader.swf =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/lams_preloader.swf,v diff -u -r1.24 -r1.25 Binary files differ Index: lams_flash/src/central/flash/main_addseq.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/main_addseq.as,v diff -u -r1.3 -r1.4 --- lams_flash/src/central/flash/main_addseq.as 13 Nov 2008 05:19:38 -0000 1.3 +++ lams_flash/src/central/flash/main_addseq.as 17 Nov 2008 04:12:32 -0000 1.4 @@ -11,6 +11,11 @@ Debugger.log('serverURL is not defined, using defualt:'+_root.serverURL ,Debugger.CRITICAL,'main','ROOT'); } +if(StringUtils.isEmpty(presenceServerUrl)){ + _root.presenceServerUrl = "172.20.100.18"; + Debugger.log('presenceServerUrl is not defined, using defualt:'+_root.presenceServerUrl ,Debugger.CRITICAL,'main','ROOT'); +} + if(StringUtils.isEmpty(userID)){ _root.userID = 4; Debugger.log('userID is not defined, using defualt:'+_root.userID ,Debugger.CRITICAL,'main','ROOT'); Index: lams_flash/src/central/flash/preloader.fla =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/preloader.fla,v diff -u -r1.8 -r1.9 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as,v diff -u -r1.5 -r1.6 --- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as 13 Nov 2008 05:19:37 -0000 1.5 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as 17 Nov 2008 04:12:32 -0000 1.6 @@ -285,6 +285,13 @@ public function startLesson(isScheduled:Boolean, lessonID:Number, datetime:String){ var callback:Function = Proxy.create(this, onStartLesson); + if (wizardModel.resultDTO.enablePresence) { + Debugger.log("presence enabled, creating xmpp room", Debugger.MED, "startLesson", "Wizard"); + //var callback:Function = Proxy.create(this, onCreateXmppRoom); + var roomName:String = String(lessonID) + "@conference." + _root.presenceServerUrl; + Application.getInstance().getComms().getRequest('Presence.do?method=createXmppRoom&xmppRoomName=' + roomName, null, false); + } + if (isScheduled) { Debugger.log("calling start lesson scheduled", Debugger.MED, "startLesson", "Wizard"); Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=startOnScheduleLesson&lessonStartDate=' + datetime + '&lessonID=' + lessonID + '&userID=' + _root.userID, callback); @@ -328,11 +335,20 @@ } } + /* TODO: factorize this... had to hack it up quick for 2.2 (problem is that values are being passed from function to function instead of being stored + * so scheduling and starting multiple lessons becomes a pain */ public function startMultipleLessons():Void { var callback:Function = Proxy.create(this, onStartMultipleLessons); var lessonIDs:Array = wizardModel.lessonIDs; var startedLessonsCount:Number = wizardModel.startedLessonsCount; + if (wizardModel.resultDTO.enablePresence) { + Debugger.log("presence enabled, creating xmpp room", Debugger.MED, "startMultipleLessons", "Wizard"); + //var callback:Function = Proxy.create(this, onCreateXmppRoom); + var roomName:String = String(lessonIDs[startedLessonsCount]) + "@conference." + _root.presenceServerUrl; + Application.getInstance().getComms().getRequest('Presence.do?method=createXmppRoom&xmppRoomName=' + roomName, null, false); + } + Debugger.log("calling start lesson non-scheduled", Debugger.MED, "startMultipleLessons", "Wizard"); Debugger.log("monitoring/monitoring.do?method=startLesson&lessonID=" + lessonIDs[startedLessonsCount] + '&userID=' + _root.userID, Debugger.MED, "startMultipleLessons", "Wizard"); Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=startLesson&lessonID=' + lessonIDs[startedLessonsCount] + '&userID=' + _root.userID, callback); @@ -359,6 +375,13 @@ var startedLessonsCount:Number = wizardModel.startedLessonsCount; var scheduleDateTime:String = wizardModel.resultDTO.scheduleDateTime + if (wizardModel.resultDTO.enablePresence) { + Debugger.log("presence enabled, creating xmpp room", Debugger.MED, "startMultipleScheduledLessons", "Wizard"); + //var callback:Function = Proxy.create(this, onCreateXmppRoom); + var roomName:String = String(lessonIDs[startedLessonsCount]) + "@conference." + _root.presenceServerUrl; + Application.getInstance().getComms().getRequest('Presence.do?method=createXmppRoom&xmppRoomName=' + roomName, null, false); + } + Debugger.log("calling start lesson scheduled", Debugger.MED, "startMultipleScheduledLessons", "Wizard"); Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=startOnScheduleLesson&lessonStartDate=' + scheduleDateTime + '&lessonID=' + lessonIDs[startedLessonsCount] + '&userID=' + _root.userID, callback); } @@ -377,7 +400,7 @@ } } } - + /** * * @usage Index: lams_monitoring/web/addLesson.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/addLesson.jsp,v diff -u -r1.15 -r1.16 --- lams_monitoring/web/addLesson.jsp 13 Nov 2008 05:18:18 -0000 1.15 +++ lams_monitoring/web/addLesson.jsp 17 Nov 2008 04:12:33 -0000 1.16 @@ -85,10 +85,11 @@ String serverLanguage = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); String languageDate = Configuration.get(ConfigurationKeys.DICTIONARY_DATE_CREATED); String allowEditOnFly = Configuration.get(ConfigurationKeys.ALLOW_EDIT_ON_FLY); +String jabberServer = Configuration.get(ConfigurationKeys.XMPP_DOMAIN); %> <%-- courseID and classID are passed in as request parameters by addLesson.jsp in lams_central. --%> - ?loadFile=monitoring/lams_wizard.swf&loadLibrary=monitoring/lams_wizard_library.swf&userID=&serverURL=&build=<%=clientVersion%>&lang=&country=&langDate=<%=languageDate%>&theme=&courseID=&classID=&editOnFly=<%=allowEditOnFly%> + ?loadFile=monitoring/lams_wizard.swf&loadLibrary=monitoring/lams_wizard_library.swf&userID=&serverURL=&presenceServerUrl=<%=jabberServer%>&build=<%=clientVersion%>&lang=&country=&langDate=<%=languageDate%>&theme=&courseID=&classID=&editOnFly=<%=allowEditOnFly%> ../lams_preloader.swf ../lams_preloader Index: lams_monitoring/web/lams_wizard.swf =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_wizard.swf,v diff -u -r1.67 -r1.68 Binary files differ Index: lams_monitoring/web/lams_wizard_library.swf =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_wizard_library.swf,v diff -u -r1.45 -r1.46 Binary files differ