Index: lams_tool_videorecorder/build.properties =================================================================== diff -u -rdfc0b58933316e2e56513b81463e54d72b43e224 -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/build.properties (.../build.properties) (revision dfc0b58933316e2e56513b81463e54d72b43e224) +++ lams_tool_videorecorder/build.properties (.../build.properties) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -2,6 +2,6 @@ min.server.version.number=2.3 signature=lavidr10 -tool.version=20081208 +tool.version=20160602 tool.hide=true tool.short.name=videoRecorder \ No newline at end of file Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderCondition.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/ApplicationResources.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5e63656a12c02f7476564e278b43ff4ce86ac930) +++ lams_tool_videorecorder/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -1,185 +1,3 @@ -appName = videorecorder -#language code: en -#locale code: AU - - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Feb 26 12:47:12 CST 2014 - -#=================== labels for Video Recorder =================# - -error.contentrepository =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly. -activity.helptext =Tool that allows audio and video to be recorded via a webcam -error.content.locked =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed. +appName = videorecorder tool.display.name =Video Recorder -tool.description =Video Recorder Tool -activity.title =Video Recorder -activity.description =Video Recorder Tool -pageTitle.authoring =Video Recorder Authoring -button.basic =Basic -button.advanced =Advanced -label.authoring.basic.title =Title: -label.authoring.basic.content =Content: -advanced.lockOnFinished =Lock when finished -advanced.allowRichEditor =Allow rich text editor -advanced.allowComments =Allow comments -advanced.allowRatings =Allow ratings -advanced.allowUseCamera =Allow the use of camera recording -advanced.allowUseVoice =Allow the use of microphone recording -advanced.allowLearnerVideoExport =Allow learners to export their recordings -advanced.allowLearnerVideoVisibility =Allow learners to see each others recordings -instructions.type.online =Online -instructions.type.offline =Offline -label.filename =Filename -label.type =Type -link.delete =Delete -message.updateSuccess =Changes saved -pageTitle.learning =Video Recorder -message.defineLaterSet =Please wait for the instructor to complete the contents of this activity -pageTitle.monitoring =Video Recorder Monitoring -button.summary =Summary -button.editActivity =Edit Activity -button.statistics =Statistics -titleHeading.summary =Summary -titleHeading.statistics =Statistics -titleHeading.editActivity =Edit Activity -heading.group =Group {0}: -heading.totalLearners =Number of Learners: -heading.totalLearnersInGroup =Total Number of Learners in Group: -heading.totalFinishedLearnersInGroup =Number of Finished Learners: -message.summary =There is no summary available for this tool. -label.view =View -label.notAvailable =Not Available -heading.learner =Learner -button.cancel =Cancel -button.ok =OK -button.yes =Yes -button.no =No -button.done =Done -button.save =Save -button.next =Next -label.save =Save -label.created =Created -label.lastModified =Last modified -error.missingParam =Unable to continue. {0} is missing. -error.exceedMaxFileSize =File size exceeded -error.exception.VrApplication =An internal error has occured with the Video Recorder Tool. If reporting this error, please report:
{0} -error.defineLater =Sorry, the activity is not ready yet. Please wait for the instructor to finishing defining the activity. -errors.maxfilesize =The uploaded file has exceeded the maximum file size limit of {0} bytes -error.mandatoryField ={0} field is mandatory. -error.mark.invalid.number ={0} field must be a valid number. Decimal points are not allowed. -error.mark.invalid.decimal.number ={0} field must be a valid decimal number. -authoring.msg.cancel.save =Do you want to close this window without saving? -button.try.again =Try Again -message.learner.blank.input =You have not written anything. Are you sure this is correct? -button.finish =Next Activity -button.continue =Continue -message.warnLockOnFinish =Note: After you click on "Next Activity" and you come back to this Notebook, you won't be able to continue adding notes. -message.activityLocked =The instructor has set this activity not to allow notes after you have finished it. As you are returning to this Notebook, you are able to see your notes but not allowed to add more. -titleHeading.instructions =Instructions -label.authoring.basic.instructions =Instructions: -label.on =On -label.off =Off -monitor.summary.th.advancedSettings =Advanced settings -button.conditions =Conditions -textsearch.excluded.words =has none of these unwanted words: -label.authoring.heading.conditions =Conditions -label.authoring.conditions.add.condition =Add condition -label.authoring.conditions.list.title =Conditions -label.authoring.conditions.order =Order -label.authoring.conditions.empty.condition.list =There are no conditions -label.authoring.conditions.condition.name =Name -label.authoring.edit.conditions.button =Edit conditions -label.authoring.up =Up -label.authoring.down =Down -label.authoring.edit =Edit -error.condition.name.blank =Condition name can not be blank. -error.condition.duplicated.name =Duplicated name. Please choose unique one. -error.condition =Error creating condition. -output.desc.text.search.output.definition.notebook =Entry contains certain words -text.search.output.definition.notebook.default.condition =Entry contains word "LAMS" -textsearch.heading =Entry that... -textsearch.all.words =has all these words: -textsearch.phrase =has this exact wording or phrase: -textsearch.any.words =has one or more of these words: -message.contentInUseSet =Modification of content is not allowed since one or more learners has attempted the activity. -message.alertContentEdit =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information. -videorecorder.confirm =Confirm -videorecorder.stop.recording =Stop Recording -videorecorder.start.recording =Start Recording -videorecorder.stop.camera =Stop Camera -videorecorder.view.camera =View Camera -videorecorder.author =Author -videorecorder.description =Description -videorecorder.title =Title -videorecorder.new.recording.details =New Recording Details -videorecorder.comment =Comment -videorecorder.comments =Comments -videorecorder.date =Date -videorecorder.rating =Rating -videorecorder.play =Play -videorecorder.stop =Stop -videorecorder.pause =Pause -videorecorder.resume =Resume -videorecorder.video.information =Video information -videorecorder.sort.by =Sort by -videorecorder.update =Update -videorecorder.refresh =Refresh -videorecorder.recording.controls =Recording controls -videorecorder.videos =Videos -videorecorder.add.comment =Add Comment -videorecorder.video =Video -videorecorder.export.video =Export Video -videorecorder.delete.video =Delete Video -videorecorder.enter.something.here =Enter {0} here -videorecorder.message.sure.delete =Are you sure you want to delete this recording? -videorecorder.video.player =Video Player -videorecorder.video.recorder =Video Recorder -videorecorder.web.application.not.available =The requested web application is not available -videorecorder.net.connection.not.connected =Connection to the media server could not be established -videorecorder.net.connection.closed =Connection to the media server closed -videorecorder.playing =Playing -videorecorder.ready =Ready -videorecorder.paused =Paused -videorecorder.recording =Recording -videorecorder.buffering =Buffering -videorecorder.waiting =Waiting -videorecorder.recording.complete.authoring =Recording complete and added to the list of video recordings. Click the play button to review the last added recording or the record button to record another video. -videorecorder.recording.complete.fck =Recording complete. Click the play button to review, the record button to overwrite the recording or the save button to post the current recording. -videorecorder.instructions.fck =Click the record button to start and stop recording. Once a recording is completed, you can review it by clicking the play button. When ready to add the video, click the save button. -videorecorder.instructions.author =Click the record button to start and stop recording. When prompted, enter a title and a description and click the save button. The recording is then automatically added to the list of video recordings. If the Video Recorder does not work, contact your system administrator. -videorecorder.tooltip.sort.author =Sort recordings by author -videorecorder.tooltip.sort.title =Sort recordings by title -videorecorder.tooltip.sort.date =Sort recordings by date -videorecorder.tooltip.play =Play the recording -videorecorder.tooltip.pause =Pause the recording being played -videorecorder.tooltip.resume =Resume the recording -videorecorder.tooltip.start.camera =Start viewing the camera without recording -videorecorder.tooltip.stop.camera =Stop viewing the camera -videorecorder.tooltip.start.recording =Start recording -videorecorder.tooltip.start.recording.again =Start recording again (overwrites previous recording) -videorecorder.tooltip.start.recording.next =Record another recording -videorecorder.tooltip.stop.recording =Stop recording -videorecorder.tooltip.add.comment =Add a comment -videorecorder.tooltip.add.rating =Add a rating -videorecorder.tooltip.refresh =Refresh the list of recordings -videorecorder.tooltip.save.comment =Save the comment -videorecorder.tooltip.save.recording =Save the recording -videorecorder.tooltip.cancel.comment =Cancel the comment -videorecorder.tooltip.delete.recording =Delete this recording -videorecorder.tooltip.export.recording =Export this recording -videorecorder.tooltip.click.to.ready.recording =Click to ready recording -videorecorder.tooltip.rate.recording =Rate the current recording -videorecorder.tooltip.already.rated =You have given this recording a rating of -videorecorder.disabled =Disabled -videorecorder.instructor =Instructor -output.desc.number.recordings.definition.videoRecorder =Learner's number of recordings created -output.desc.number.comments.definition.videoRecorder =Learner's number of comments made on recordings -output.desc.number.ratings.definition.videoRecorder =Learner's number of ratings given to recordings -videorecorder.error.noconfig =LAMS does not have a media server configured. Please contact your system administrator. -videorecorder.camera.not.available =No camera was detected. Please connect one and restart your browser if you want to record video. -videorecorder.mic.not.available =No microphone was detected. Please connect one and restart your browser if you want to record audio. -message.monitoring.summary.no.session =No Session Available -button.submit =Finish -message.no.reflection.available =No notebook entry was added. - - -#======= End labels: Exported 176 labels for en AU ===== +activity.title =Video Recorder \ No newline at end of file Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_de_DE.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_el_GR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_en_AU.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_es_ES.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_es_MX.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_fr_FR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_ja_JP.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_ko_KR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_mi_NZ.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_no_NO.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_pt_BR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_tr_TR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/global-forwards.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/struts-actions.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/struts-forms.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/struts-message-resources.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/struts-plugins.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/db/sql/activity_insert.sql =================================================================== diff -u -r3dbf966d900adefc34cdad501d3c392118451cd9 -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 3dbf966d900adefc34cdad501d3c392118451cd9) +++ lams_tool_videorecorder/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -1,5 +1,3 @@ --- CVS ID: $Id$ - INSERT INTO lams_learning_activity ( activity_ui_id @@ -73,4 +71,4 @@ , NULL , NULL , 'org.lamsfoundation.lams.tool.videoRecorder.ApplicationResources' -) +) \ No newline at end of file Index: lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql =================================================================== diff -u -r4d7dfe83093db060d8edeab425ce01543b38b530 -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql (.../create_lams_tool_videoRecorder.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530) +++ lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql (.../create_lams_tool_videoRecorder.sql) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -1,166 +1,3 @@ --- CVS ID: $Id$ - +-- file must not be empty and it must contain update statements (not select) SET FOREIGN_KEY_CHECKS=0; -DROP TABLE IF EXISTS tl_lavidr10_conditions; -drop table if exists tl_lavidr10_attachment; -drop table if exists tl_lavidr10_videorecorder; -drop table if exists tl_lavidr10_recording; -drop table if exists tl_lavidr10_session; -drop table if exists tl_lavidr10_user; -drop table if exists tl_lavidr10_comment; -drop table if exists tl_lavidr10_rating; - -create table tl_lavidr10_attachment ( - uid bigint not null auto_increment, - file_version_id bigint, - file_type varchar(255), - file_name varchar(255), - file_uuid bigint, - create_date datetime, - videoRecorder_uid bigint, - primary key (uid) -)ENGINE=InnoDB; - -create table tl_lavidr10_videorecorder ( - uid bigint not null auto_increment, - create_date datetime, - update_date datetime, - create_by bigint, - title varchar(255), - instructions text, - reflect_on_activity bit, - reflect_instructions text, - run_offline bit, - lock_on_finished bit, - online_instructions text, - offline_instructions text, - content_in_use bit, - define_later bit, - tool_content_id bigint, - author_recording_id bigint, - allow_use_voice bit, - allow_use_camera bit, - allow_learner_video_visibility bit, - allow_learner_video_export bit, - allow_comments bit, - allow_ratings bit, - export_offline bit, - export_all bit, - primary key (uid) -)ENGINE=InnoDB; - -create table tl_lavidr10_session ( - uid bigint not null auto_increment, - session_end_date datetime, - session_start_date datetime, - status integer, session_id bigint, - session_name varchar(250), - videoRecorder_uid bigint, - content_folder_id varchar(32), - primary key (uid) -)ENGINE=InnoDB; - -create table tl_lavidr10_recording ( - uid bigint not null auto_increment, - tool_content_id bigint, - create_date datetime, - update_date datetime, - create_by bigint, - title varchar(255), - description varchar(1027), - rating float, - filename varchar(255), - is_local bit, - is_just_sound bit, - videoRecorder_session_uid bigint, - primary key (uid) -)ENGINE=InnoDB; - -create table tl_lavidr10_user ( - uid bigint not null auto_increment, - user_id bigint, last_name varchar(255), - login_name varchar(255), - first_name varchar(255), - finishedActivity bit, - videoRecorder_session_uid bigint, - entry_uid bigint, - primary key (uid) -)ENGINE=InnoDB; - -create table tl_lavidr10_comment ( - uid bigint not null auto_increment, - comment text, - videoRecorder_recording_uid bigint, - videoRecorder_session_uid bigint, - create_by bigint, - create_date datetime, - primary key (uid) -)ENGINE=InnoDB; - -create table tl_lavidr10_rating ( - uid bigint not null auto_increment, - rating float, - videoRecorder_recording_uid bigint, - videoRecorder_session_uid bigint, - create_by bigint, - create_date datetime, - primary key (uid) -)ENGINE=InnoDB; - -alter table tl_lavidr10_attachment add index FK_NEW_75587508_12090F57FC940906 (videoRecorder_uid), add constraint FK_NEW_75587508_12090F57FC940906 foreign key (videoRecorder_uid) references tl_lavidr10_videorecorder (uid); -alter table tl_lavidr10_session add index FK_NEW_75587508_B7C198E2FC940906 (videoRecorder_uid), add constraint FK_NEW_75587508_B7C198E2FC940906 foreign key (videoRecorder_uid) references tl_lavidr10_videorecorder (uid); -alter table tl_lavidr10_user add index FK_NEW_75587508_CB8A58FFA3B0FADF (videoRecorder_session_uid), add constraint FK_NEW_75587508_CB8A58FFA3B0FADF foreign key (videoRecorder_session_uid) references tl_lavidr10_session (uid); - -INSERT INTO tl_lavidr10_videorecorder ( - title, - instructions, - online_instructions, - offline_instructions, - reflect_on_activity, - reflect_instructions, - tool_content_id, - run_offline, - lock_on_finished, - content_in_use, - define_later, - allow_use_voice, - allow_use_camera, - allow_learner_video_visibility, - allow_learner_video_export, - allow_comments, - allow_ratings, - export_offline, - export_all) -VALUES( - "VideoRecorder", - "Instructions", - "", - "", - 0, - "", - ${default_content_id}, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1 -); - -CREATE TABLE tl_lavidr10_conditions ( - condition_id BIGINT(20) NOT NULL - , content_uid BIGINT(20) - , PRIMARY KEY (condition_id) - , CONSTRAINT VideoRecorderConditionInheritance FOREIGN KEY (condition_id) - REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE - , CONSTRAINT VideoRecorderConditionToVideoRecorder FOREIGN KEY (content_uid) - REFERENCES tl_lavidr10_videorecorder(uid) ON DELETE CASCADE ON UPDATE CASCADE -)ENGINE=InnoDB; - -SET FOREIGN_KEY_CHECKS=1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_videorecorder/db/sql/db_version_insert.sql =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/db/sql/db_version_insert.sql (.../db_version_insert.sql) (revision 3d081de4a45da632ee6029251318fac795d41813) +++ lams_tool_videorecorder/db/sql/db_version_insert.sql (.../db_version_insert.sql) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -1,2 +1 @@ --- $Id$ INSERT INTO patches VALUES ('@signature@', '@tool_version@', NOW(), 'F'); Index: lams_tool_videorecorder/db/sql/drop_lams_tool_videoRecorder.sql =================================================================== diff -u -r4d7dfe83093db060d8edeab425ce01543b38b530 -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/db/sql/drop_lams_tool_videoRecorder.sql (.../drop_lams_tool_videoRecorder.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530) +++ lams_tool_videorecorder/db/sql/drop_lams_tool_videoRecorder.sql (.../drop_lams_tool_videoRecorder.sql) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -1,5 +1,3 @@ --- CVS ID: $Id$ - SET FOREIGN_KEY_CHECKS=0; DROP TABLE IF EXISTS tl_lavidr10_conditions; DROP TABLE IF EXISTS tl_lavidr10_user; Index: lams_tool_videorecorder/db/sql/library_insert.sql =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/db/sql/library_insert.sql (.../library_insert.sql) (revision 3d081de4a45da632ee6029251318fac795d41813) +++ lams_tool_videorecorder/db/sql/library_insert.sql (.../library_insert.sql) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -1,5 +1,3 @@ --- CVS ID: $Id$ - INSERT INTO lams_learning_library ( description, Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/db/sql/tool_insert.sql =================================================================== diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 5e63656a12c02f7476564e278b43ff4ce86ac930) +++ lams_tool_videorecorder/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -1,5 +1,3 @@ --- CVS ID: $Id$ - INSERT INTO lams_tool ( tool_signature, @@ -49,4 +47,4 @@ NOW(), NOW(), 1 -) +) \ No newline at end of file Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderCommentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRatingDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRecordingDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderSessionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderUserDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderCommentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRatingDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderSessionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderUserDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderCommentDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderConditionDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRatingDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRecordingDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderSessionDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderUserDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderComment.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderCondition.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRating.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderUser.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/IVideoRecorderService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderImportContentVersionFilter.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderOutputFactory.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java =================================================================== diff -u -r8be2bc782a2c7066c8c33f5605962584df7a2f9b -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java (.../VideoRecorderService.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java (.../VideoRecorderService.java) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -2,874 +2,129 @@ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA - * + * * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ /* $$Id$$ */ package org.lamsfoundation.lams.tool.videoRecorder.service; -import java.util.ArrayList; import java.util.List; -import java.util.Set; import java.util.SortedMap; -import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; -import org.lamsfoundation.lams.learning.service.ILearnerService; -import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; -import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; -import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; import org.lamsfoundation.lams.tool.ToolSessionManager; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; -import org.lamsfoundation.lams.tool.service.ILamsToolService; -import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderCommentDAO; -import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderDAO; -import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderRatingDAO; -import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderRecordingDAO; -import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderSessionDAO; -import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderUserDAO; -import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderCommentDTO; -import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRatingDTO; -import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderComment; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderCondition; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRating; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRecording; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderUser; -import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderConstants; -import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderException; import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.FileUtil; -import org.lamsfoundation.lams.util.MessageService; -/** - * An implementation of the IVideoRecorderService interface. - * - * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. - */ +public class VideoRecorderService implements ToolSessionManager, ToolContentManager { -public class VideoRecorderService implements ToolSessionManager, ToolContentManager, IVideoRecorderService { - - private static Logger logger = Logger.getLogger(VideoRecorderService.class.getName()); - - private IVideoRecorderDAO videoRecorderDAO = null; - - private IVideoRecorderSessionDAO videoRecorderSessionDAO = null; - - private IVideoRecorderRecordingDAO videoRecorderRecordingDAO = null; - - private IVideoRecorderUserDAO videoRecorderUserDAO = null; - - private IVideoRecorderRatingDAO videoRecorderRatingDAO = null; - - private IVideoRecorderCommentDAO videoRecorderCommentDAO = null; - - private ILearnerService learnerService; - - private ILamsToolService toolService; - - private IToolContentHandler videoRecorderToolContentHandler = null; - - private IExportToolContentService exportContentService; - - private ICoreNotebookService coreNotebookService; - - private VideoRecorderOutputFactory videoRecorderOutputFactory; - - private MessageService messageService; - - public VideoRecorderService() { - super(); - } - - /* ************ Methods from ToolSessionManager ************* */ @Override - public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { - if (VideoRecorderService.logger.isDebugEnabled()) { - VideoRecorderService.logger.debug("entering method createToolSession:" + " toolSessionId = " + toolSessionId - + " toolSessionName = " + toolSessionName + " toolContentId = " + toolContentId); - } - - VideoRecorderSession session = new VideoRecorderSession(); - session.setSessionId(toolSessionId); - session.setSessionName(toolSessionName); - session.setContentFolderId(FileUtil.generateUniqueContentFolderID()); - - // learner starts - // TODO need to also set other fields. - VideoRecorder videoRecorder = videoRecorderDAO.getByContentId(toolContentId); - session.setVideoRecorder(videoRecorder); - videoRecorderSessionDAO.saveOrUpdate(session); - } - - @Override - public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException { - return learnerService.completeToolSession(toolSessionId, learnerId); - } - - @Override - public ToolSessionExportOutputData exportToolSession(Long toolSessionId) - throws DataMissingException, ToolException { - // TODO Auto-generated method stub - return null; - } - - @Override - public ToolSessionExportOutputData exportToolSession(List toolSessionIds) - throws DataMissingException, ToolException { - // TODO Auto-generated method stub - return null; - } - - @Override - public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException { - videoRecorderSessionDAO.deleteBySessionID(toolSessionId); - // TODO check if cascade worked - } - - @Override - public SortedMap getToolOutput(List names, Long toolSessionId, Long learnerId) { - return getVideoRecorderOutputFactory().getToolOutput(names, this, toolSessionId, learnerId); - } - - @Override - public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { - return getVideoRecorderOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); - } - - @Override - public void forceCompleteUser(Long toolSessionId, User user) { - //no actions required - } - - /* ************ Methods from ToolContentManager ************************* */ - - @Override public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { - - if (VideoRecorderService.logger.isDebugEnabled()) { - VideoRecorderService.logger.debug("entering method copyToolContent:" + " fromContentId=" + fromContentId - + " toContentId=" + toContentId); - } - - if (toContentId == null) { - String error = "Failed to copy tool content: toContentID is null"; - throw new ToolException(error); - } - - VideoRecorder fromContent = null; - if (fromContentId != null) { - fromContent = videoRecorderDAO.getByContentId(fromContentId); - } - - List list = videoRecorderRecordingDAO.getByToolContentId(fromContentId); - - VideoRecorderRecording vrr; - if (!list.isEmpty()) { - vrr = list.get(0); - VideoRecorderRecording clonedRecording = new VideoRecorderRecording(vrr); - clonedRecording.setUid(null); - clonedRecording.setToolContentId(toContentId); - videoRecorderRecordingDAO.saveOrUpdate(clonedRecording); - } - - if (fromContent == null) { - // create the fromContent using the default tool content - fromContent = getDefaultContent(); - } - - VideoRecorder toContent = VideoRecorder.newInstance(fromContent, toContentId); - videoRecorderDAO.saveOrUpdate(toContent); } @Override public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { - VideoRecorder videoRecorder = videoRecorderDAO.getByContentId(toolContentId); - if (videoRecorder == null) { - throw new ToolException("Could not find tool with toolContentID: " + toolContentId); - } - videoRecorder.setDefineLater(false); - videoRecorderDAO.saveOrUpdate(videoRecorder); } - @SuppressWarnings("unchecked") @Override public void removeToolContent(Long toolContentId) throws ToolException { - VideoRecorder videoRecorder = videoRecorderDAO.getByContentId(toolContentId); - if (videoRecorder == null) { - VideoRecorderService.logger - .warn("Can not remove the tool content as it does not exist, ID: " + toolContentId); - return; - } - - for (VideoRecorderSession session : (Set) videoRecorder.getVideoRecorderSessions()) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, VideoRecorderConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - - videoRecorderDAO.delete(videoRecorder); } @Override - @SuppressWarnings("unchecked") public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException { - if (VideoRecorderService.logger.isDebugEnabled()) { - VideoRecorderService.logger.debug( - "Removing Video Recorder contents for user ID " + userId + " and toolContentId " + toolContentId); - } - - VideoRecorder videoRecorder = videoRecorderDAO.getByContentId(toolContentId); - if (videoRecorder == null) { - VideoRecorderService.logger - .warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content"); - return; - } - - for (VideoRecorderSession session : (Set) videoRecorder.getVideoRecorderSessions()) { - List comments = videoRecorderCommentDAO.getCommentsByUserId(userId.longValue()); - videoRecorderCommentDAO.deleteAll(comments); - - List ratings = videoRecorderRatingDAO.getRatingsByUserId(userId.longValue()); - videoRecorderRatingDAO.deleteAll(ratings); - - List recordings = videoRecorderRecordingDAO - .getBySessionAndUserId(session.getSessionId(), userId.longValue()); - videoRecorderRecordingDAO.deleteAll(recordings); - - VideoRecorderUser user = videoRecorderUserDAO.getByUserIdAndSessionId(userId.longValue(), - session.getSessionId()); - - if (user != null) { - if (user.getEntryUID() != null) { - NotebookEntry entry = coreNotebookService.getEntry(user.getEntryUID()); - videoRecorderDAO.delete(entry); - user.setEntryUID(null); - } - user.setFinishedActivity(false); - videoRecorderUserDAO.update(user); - } - } } @Override - public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { - VideoRecorder videoRecorder = videoRecorderDAO.getByContentId(toolContentId); - if (videoRecorder == null) { - videoRecorder = getDefaultContent(); - } - if (videoRecorder == null) { - throw new DataMissingException("Unable to find default content for the videoRecorder tool"); - } - - // set ResourceToolContentHandler as null to avoid copy file node in - // repository again. - videoRecorder = VideoRecorder.newInstance(videoRecorder, toolContentId); - videoRecorder.setToolContentId(null); - videoRecorder.setVideoRecorderSessions(null); - - VideoRecorderRecording authorRecording = getFirstRecordingByToolContentId(toolContentId); - if (authorRecording != null) { - authorRecording = (VideoRecorderRecording) authorRecording.clone(); - - authorRecording.setToolContentId(null); - authorRecording.setComments(null); - authorRecording.setRatings(null); - - } - - videoRecorder.setAuthorRecording(authorRecording); - try { - exportContentService.exportToolContent(toolContentId, videoRecorder, videoRecorderToolContentHandler, - rootPath); - } catch (ExportToolContentException e) { - throw new ToolException(e); - } + public void exportToolContent(Long toolContentId, String toPath) throws DataMissingException, ToolException { } @Override public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion, String toVersion) throws ToolException { - try { - // register version filter class - exportContentService.registerImportVersionFilterClass(VideoRecorderImportContentVersionFilter.class); - - Object toolPOJO = exportContentService.importToolContent(toolContentPath, videoRecorderToolContentHandler, - fromVersion, toVersion); - if (!(toolPOJO instanceof VideoRecorder)) { - throw new ImportToolContentException( - "Import VideoRecorder tool content failed. Deserialized object is " + toolPOJO); - } - VideoRecorder videoRecorder = (VideoRecorder) toolPOJO; - - VideoRecorderRecording recording = videoRecorder.getAuthorRecording(); - - // reset it to new toolContentId - videoRecorder.setToolContentId(toolContentId); - - if (recording != null) { - videoRecorder.getAuthorRecording().setToolContentId(toolContentId); - } - - videoRecorderDAO.saveOrUpdate(videoRecorder); - - if (recording != null) { - videoRecorderRecordingDAO.saveOrUpdate(recording); - } - } catch (ImportToolContentException e) { - throw new ToolException(e); - } } @Override public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType) throws ToolException { - VideoRecorder videoRecorder = getVideoRecorderDAO().getByContentId(toolContentId); - if (videoRecorder == null) { - videoRecorder = getDefaultContent(); - } - return getVideoRecorderOutputFactory().getToolOutputDefinitions(videoRecorder, definitionType); + return null; } @Override + public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { + return null; + } + + @Override public String getToolContentTitle(Long toolContentId) { - return getVideoRecorderByContentId(toolContentId).getTitle(); + return null; } @Override public boolean isContentEdited(Long toolContentId) { - return getVideoRecorderByContentId(toolContentId).isDefineLater(); + return false; } @Override public boolean isReadOnly(Long toolContentId) { - VideoRecorder videoRecorder = videoRecorderDAO.getByContentId(toolContentId); - for (VideoRecorderSession session : (Set) videoRecorder.getVideoRecorderSessions()) { - if (!videoRecorderCommentDAO.getCommentsByToolSessionId(session.getSessionId()).isEmpty() - || !videoRecorderRatingDAO.getRatingsByToolSessionId(session.getSessionId()).isEmpty() - || !videoRecorderRecordingDAO.getByToolSessionId(session.getSessionId()).isEmpty()) { - return true; - } - } - return false; } - /* ********** IVideoRecorderService Methods ********************************* */ - @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); + public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { } @Override - public NotebookEntry getEntry(Long uid) { - return coreNotebookService.getEntry(uid); + public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException { + return null; } @Override - public void updateEntry(Long uid, String entry) { - coreNotebookService.updateEntry(uid, "", entry); + public ToolSessionExportOutputData exportToolSession(Long toolSessionId) + throws DataMissingException, ToolException { + return null; } @Override - public Long getDefaultContentIdBySignature(String toolSignature) { - Long toolContentId = null; - toolContentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); - if (toolContentId == null) { - String error = "Could not retrieve default content id for this tool"; - VideoRecorderService.logger.error(error); - throw new VideoRecorderException(error); - } - return toolContentId; + public ToolSessionExportOutputData exportToolSession(List toolSessionIds) + throws DataMissingException, ToolException { + return null; } @Override - public VideoRecorder getDefaultContent() { - Long defaultContentID = getDefaultContentIdBySignature(VideoRecorderConstants.TOOL_SIGNATURE); - VideoRecorder defaultContent = getVideoRecorderByContentId(defaultContentID); - if (defaultContent == null) { - String error = "Could not retrieve default content record for this tool"; - VideoRecorderService.logger.error(error); - throw new VideoRecorderException(error); - } - if (defaultContent.getConditions().isEmpty()) { - // needed? - } - return defaultContent; + public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException { } @Override - public VideoRecorder copyDefaultContent(Long newContentID) { - - if (newContentID == null) { - String error = "Cannot copy the VideoRecorder tools default content: + " + "newContentID is null"; - VideoRecorderService.logger.error(error); - throw new VideoRecorderException(error); - } - - VideoRecorder defaultContent = getDefaultContent(); - // create new videoRecorder using the newContentID - VideoRecorder newContent = new VideoRecorder(); - newContent = VideoRecorder.newInstance(defaultContent, newContentID); - videoRecorderDAO.saveOrUpdate(newContent); - return newContent; + public SortedMap getToolOutput(List names, Long toolSessionId, Long learnerId) { + return null; } @Override - public VideoRecorder getVideoRecorderByContentId(Long toolContentID) { - VideoRecorder videoRecorder = videoRecorderDAO.getByContentId(toolContentID); - if (videoRecorder == null) { - VideoRecorderService.logger.debug("Could not find the content with toolContentID:" + toolContentID); - } - return videoRecorder; + public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { + return null; } @Override - public VideoRecorderSession getSessionBySessionId(Long toolSessionId) { - VideoRecorderSession videoRecorderSession = videoRecorderSessionDAO.getBySessionId(toolSessionId); - if (videoRecorderSession == null) { - VideoRecorderService.logger - .debug("Could not find the videoRecorder session with toolSessionID:" + toolSessionId); - } - return videoRecorderSession; + public void forceCompleteUser(Long toolSessionId, User user) { } - - @Override - public VideoRecorderUser getUserByUserIdAndSessionId(Long userId, Long toolSessionId) { - return videoRecorderUserDAO.getByUserIdAndSessionId(userId, toolSessionId); - } - - public VideoRecorderUser getUserByLoginNameAndSessionId(String loginName, Long toolSessionId) { - return videoRecorderUserDAO.getByLoginNameAndSessionId(loginName, toolSessionId); - } - - @Override - public VideoRecorderUser getUserByUID(Long uid) { - return videoRecorderUserDAO.getByUID(uid); - } - - @Override - public VideoRecorderRecording getRecordingById(Long recordingId) { - return videoRecorderRecordingDAO.getRecordingById(recordingId); - } - - @Override - public void deleteVideoRecorderRecording(VideoRecorderRecording videoRecorderRecording) { - videoRecorderRecordingDAO.delete(videoRecorderRecording); - return; - } - - @Override - public VideoRecorderRating getRatingById(Long ratingId) { - return videoRecorderRatingDAO.getRatingById(ratingId); - } - - @Override - public VideoRecorderComment getCommentById(Long commentId) { - return videoRecorderCommentDAO.getCommentById(commentId); - } - - @Override - public Set getRatingsByToolSessionId(Long toolSessionId) { - List list = videoRecorderRatingDAO.getRatingsByToolSessionId(toolSessionId); - return VideoRecorderRatingDTO.getVideoRecorderRatingDTOs(list); - } - - @Override - public List getCommentsByUserId(Long userId) { - return videoRecorderCommentDAO.getCommentsByUserId(userId); - } - - @Override - public Set getCommentsByToolSessionId(Long toolSessionId) { - List list = videoRecorderCommentDAO.getCommentsByToolSessionId(toolSessionId); - return VideoRecorderCommentDTO.getVideoRecorderCommentDTOs(list); - } - - @Override - public List getRecordingsByToolSessionId(Long toolSessionId, Long toolContentId) { - List list = videoRecorderRecordingDAO.getByToolSessionId(toolSessionId); - list.addAll(videoRecorderRecordingDAO.getByToolContentId(toolContentId)); - - return VideoRecorderRecordingDTO.getVideoRecorderRecordingDTOs(list); - } - - @Override - public List getRecordingsByToolSessionIdAndUserUid(Long toolSessionId, Long userId, - Long toolContentId) { - List list = videoRecorderRecordingDAO.getBySessionAndUserUid(toolSessionId, userId); - list.addAll(videoRecorderRecordingDAO.getByToolContentId(toolContentId)); - - return VideoRecorderRecordingDTO.getVideoRecorderRecordingDTOs(list); - } - - @Override - public List getRecordingsByToolContentId(Long toolContentId) { - List list = videoRecorderRecordingDAO.getByToolContentId(toolContentId); - return VideoRecorderRecordingDTO.getVideoRecorderRecordingDTOs(list); - } - - @Override - public VideoRecorderRecording getFirstRecordingByToolContentId(Long toolContentId) { - List list = videoRecorderRecordingDAO.getByToolContentId(toolContentId); - if (!list.isEmpty()) { - return list.get(0); - } else { - return null; - } - } - - @Override - public void saveOrUpdateVideoRecorder(VideoRecorder videoRecorder) { - videoRecorderDAO.saveOrUpdate(videoRecorder); - } - - @Override - public void saveOrUpdateVideoRecorderSession(VideoRecorderSession videoRecorderSession) { - videoRecorderSessionDAO.saveOrUpdate(videoRecorderSession); - } - - @Override - public void saveOrUpdateVideoRecorderUser(VideoRecorderUser videoRecorderUser) { - videoRecorderUserDAO.saveOrUpdate(videoRecorderUser); - } - - @Override - public void saveOrUpdateVideoRecorderRecording(VideoRecorderRecording videoRecorderRecording) { - videoRecorderRecordingDAO.saveOrUpdate(videoRecorderRecording); - } - - @Override - public void saveOrUpdateVideoRecorderComment(VideoRecorderComment videoRecorderComment) { - videoRecorderCommentDAO.saveOrUpdate(videoRecorderComment); - } - - @Override - public void saveOrUpdateVideoRecorderRating(VideoRecorderRating videoRecorderRating) { - videoRecorderRatingDAO.saveOrUpdate(videoRecorderRating); - } - - @Override - public VideoRecorderUser createVideoRecorderUser(UserDTO user, VideoRecorderSession videoRecorderSession) { - VideoRecorderUser videoRecorderUser = new VideoRecorderUser(user, videoRecorderSession); - saveOrUpdateVideoRecorderUser(videoRecorderUser); - return videoRecorderUser; - } - - // ========================================================================================= - /* ********** Used by Spring to "inject" the linked objects ************* */ - - public IVideoRecorderDAO getVideoRecorderDAO() { - return videoRecorderDAO; - } - - public void setVideoRecorderDAO(IVideoRecorderDAO videoRecorderDAO) { - this.videoRecorderDAO = videoRecorderDAO; - } - - public IToolContentHandler getVideoRecorderToolContentHandler() { - return videoRecorderToolContentHandler; - } - - public void setVideoRecorderToolContentHandler(IToolContentHandler videoRecorderToolContentHandler) { - this.videoRecorderToolContentHandler = videoRecorderToolContentHandler; - } - - public IVideoRecorderSessionDAO getVideoRecorderSessionDAO() { - return videoRecorderSessionDAO; - } - - public void setVideoRecorderSessionDAO(IVideoRecorderSessionDAO sessionDAO) { - videoRecorderSessionDAO = sessionDAO; - } - - public IVideoRecorderRecordingDAO getVideoRecorderRecordingDAO() { - return videoRecorderRecordingDAO; - } - - public void setVideoRecorderRecordingDAO(IVideoRecorderRecordingDAO videoRecorderRecordingDAO) { - this.videoRecorderRecordingDAO = videoRecorderRecordingDAO; - } - - public ILamsToolService getToolService() { - return toolService; - } - - public void setToolService(ILamsToolService toolService) { - this.toolService = toolService; - } - - public IVideoRecorderUserDAO getVideoRecorderUserDAO() { - return videoRecorderUserDAO; - } - - public void setVideoRecorderUserDAO(IVideoRecorderUserDAO userDAO) { - videoRecorderUserDAO = userDAO; - } - - public void setMessageService(MessageService messageService) { - this.messageService = messageService; - } - - public MessageService getMessageService() { - return messageService; - } - - public IVideoRecorderCommentDAO getVideoRecorderCommentDAO() { - return videoRecorderCommentDAO; - } - - public void setVideoRecorderCommentDAO(IVideoRecorderCommentDAO commentDAO) { - videoRecorderCommentDAO = commentDAO; - } - - public IVideoRecorderRatingDAO getVideoRecorderRatingDAO() { - return videoRecorderRatingDAO; - } - - public void setVideoRecorderRatingDAO(IVideoRecorderRatingDAO ratingDAO) { - videoRecorderRatingDAO = ratingDAO; - } - - public ILearnerService getLearnerService() { - return learnerService; - } - - public void setLearnerService(ILearnerService learnerService) { - this.learnerService = learnerService; - } - - public IExportToolContentService getExportContentService() { - return exportContentService; - } - - public void setExportContentService(IExportToolContentService exportContentService) { - this.exportContentService = exportContentService; - } - - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - - public VideoRecorderOutputFactory getVideoRecorderOutputFactory() { - return videoRecorderOutputFactory; - } - - public void setVideoRecorderOutputFactory(VideoRecorderOutputFactory videoRecorderOutputFactory) { - this.videoRecorderOutputFactory = videoRecorderOutputFactory; - } - - @Override - public void releaseConditionsFromCache(VideoRecorder videoRecorder) { - if (videoRecorder.getConditions() != null) { - for (VideoRecorderCondition condition : videoRecorder.getConditions()) { - getVideoRecorderDAO().releaseFromCache(condition); - } - } - } - - @Override - public void deleteCondition(VideoRecorderCondition condition) { - if ((condition != null) && (condition.getConditionId() != null)) { - videoRecorderDAO.delete(condition); - } - } - - @Override - public Long getNbRecordings(Long userID, Long sessionId) { - return videoRecorderRecordingDAO.getNbRecordings(userID, sessionId); - } - - @Override - public Long getNbComments(Long userID, Long sessionId) { - return videoRecorderCommentDAO.getNbComments(userID, sessionId); - } - - @Override - public Long getNbRatings(Long userID, Long sessionId) { - return videoRecorderRatingDAO.getNbRatings(userID, sessionId); - } - - @Override - public boolean isGroupedActivity(long toolContentID) { - return toolService.isGroupedActivity(toolContentID); - } - - /** - * @return String of xml with all needed language elements - */ - @Override - public String getLanguageXML() { - ArrayList languageCollection = new ArrayList(); - languageCollection.add(new String("button.ok")); - languageCollection.add(new String("button.save")); - languageCollection.add(new String("button.cancel")); - languageCollection.add(new String("button.yes")); - languageCollection.add(new String("button.no")); - languageCollection.add(new String("videorecorder.stop.recording")); - languageCollection.add(new String("videorecorder.start.recording")); - languageCollection.add(new String("videorecorder.stop.camera")); - languageCollection.add(new String("videorecorder.view.camera")); - languageCollection.add(new String("videorecorder.author")); - languageCollection.add(new String("videorecorder.description")); - languageCollection.add(new String("videorecorder.title")); - languageCollection.add(new String("videorecorder.new.recording.details")); - languageCollection.add(new String("videorecorder.comment")); - languageCollection.add(new String("videorecorder.date")); - languageCollection.add(new String("videorecorder.rating")); - languageCollection.add(new String("videorecorder.play")); - languageCollection.add(new String("videorecorder.stop")); - languageCollection.add(new String("videorecorder.pause")); - languageCollection.add(new String("videorecorder.resume")); - languageCollection.add(new String("videorecorder.video.information")); - languageCollection.add(new String("videorecorder.sort.by")); - languageCollection.add(new String("videorecorder.recording.controls")); - languageCollection.add(new String("videorecorder.videos")); - languageCollection.add(new String("videorecorder.add.comment")); - languageCollection.add(new String("videorecorder.video")); - languageCollection.add(new String("videorecorder.export.video")); - languageCollection.add(new String("videorecorder.delete.video")); - languageCollection.add(new String("videorecorder.enter.something.here")); - languageCollection.add(new String("videorecorder.message.sure.delete")); - languageCollection.add(new String("videorecorder.confirm")); - languageCollection.add(new String("videorecorder.update")); - languageCollection.add(new String("videorecorder.refresh")); - languageCollection.add(new String("videorecorder.web.application.not.available")); - languageCollection.add(new String("videorecorder.net.connection.not.connected")); - languageCollection.add(new String("videorecorder.net.connection.closed")); - languageCollection.add(new String("videorecorder.playing")); - languageCollection.add(new String("videorecorder.ready")); - languageCollection.add(new String("videorecorder.paused")); - languageCollection.add(new String("videorecorder.recording")); - languageCollection.add(new String("videorecorder.buffering")); - languageCollection.add(new String("videorecorder.waiting")); - languageCollection.add(new String("videorecorder.tooltip.sort.author")); - languageCollection.add(new String("videorecorder.tooltip.sort.title")); - languageCollection.add(new String("videorecorder.tooltip.sort.date")); - languageCollection.add(new String("videorecorder.tooltip.play")); - languageCollection.add(new String("videorecorder.tooltip.pause")); - languageCollection.add(new String("videorecorder.tooltip.resume")); - languageCollection.add(new String("videorecorder.tooltip.start.camera")); - languageCollection.add(new String("videorecorder.tooltip.stop.camera")); - languageCollection.add(new String("videorecorder.tooltip.add.comment")); - languageCollection.add(new String("videorecorder.tooltip.add.rating")); - languageCollection.add(new String("videorecorder.tooltip.refresh")); - languageCollection.add(new String("videorecorder.tooltip.save.recording")); - languageCollection.add(new String("videorecorder.tooltip.save.comment")); - languageCollection.add(new String("videorecorder.tooltip.cancel.comment")); - languageCollection.add(new String("videorecorder.tooltip.start.recording")); - languageCollection.add(new String("videorecorder.tooltip.stop.recording")); - languageCollection.add(new String("videorecorder.tooltip.delete.recording")); - languageCollection.add(new String("videorecorder.tooltip.export.recording")); - languageCollection.add(new String("videorecorder.tooltip.click.to.ready.recording")); - languageCollection.add(new String("videorecorder.tooltip.rate.recording")); - languageCollection.add(new String("videorecorder.tooltip.already.rated")); - languageCollection.add(new String("videorecorder.disabled")); - languageCollection.add(new String("videorecorder.camera.not.available")); - languageCollection.add(new String("videorecorder.mic.not.available")); - - String languageOutput = ""; - - for (int i = 0; i < languageCollection.size(); i++) { - languageOutput += "" - + messageService.getMessage(languageCollection.get(i)) + ""; - } - - languageOutput += ""; - - return languageOutput; - } - - @Override - public String getLanguageXMLForFCK() { - ArrayList languageCollection = new ArrayList(); - languageCollection.add(new String("button.ok")); - languageCollection.add(new String("button.save")); - languageCollection.add(new String("button.cancel")); - languageCollection.add(new String("button.yes")); - languageCollection.add(new String("button.no")); - languageCollection.add(new String("videorecorder.video.player")); - languageCollection.add(new String("videorecorder.video.recorder")); - languageCollection.add(new String("videorecorder.web.application.not.available")); - languageCollection.add(new String("videorecorder.net.connection.not.connected")); - languageCollection.add(new String("videorecorder.net.connection.closed")); - languageCollection.add(new String("videorecorder.playing")); - languageCollection.add(new String("videorecorder.ready")); - languageCollection.add(new String("videorecorder.paused")); - languageCollection.add(new String("videorecorder.recording")); - languageCollection.add(new String("videorecorder.buffering")); - languageCollection.add(new String("videorecorder.waiting")); - languageCollection.add(new String("videorecorder.description")); - languageCollection.add(new String("videorecorder.title")); - languageCollection.add(new String("videorecorder.new.recording.details")); - languageCollection.add(new String("videorecorder.recording.complete.authoring")); - languageCollection.add(new String("videorecorder.enter.something.here")); - languageCollection.add(new String("videorecorder.recording.complete.fck")); - languageCollection.add(new String("videorecorder.tooltip.play")); - languageCollection.add(new String("videorecorder.tooltip.pause")); - languageCollection.add(new String("videorecorder.tooltip.resume")); - languageCollection.add(new String("videorecorder.tooltip.save.recording")); - languageCollection.add(new String("videorecorder.tooltip.start.recording")); - languageCollection.add(new String("videorecorder.tooltip.start.recording.again")); - languageCollection.add(new String("videorecorder.tooltip.start.recording.next")); - languageCollection.add(new String("videorecorder.tooltip.stop.recording")); - languageCollection.add(new String("videorecorder.disabled")); - languageCollection.add(new String("videorecorder.camera.not.available")); - languageCollection.add(new String("videorecorder.mic.not.available")); - - String languageOutput = ""; - - for (int i = 0; i < languageCollection.size(); i++) { - languageOutput += "" - + messageService.getMessage(languageCollection.get(i)) + ""; - } - - languageOutput += ""; - - return languageOutput; - } - - @Override - public String getMessage(String key) { - return messageService.getMessage(key); - } - - @Override - public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { - return getVideoRecorderOutputFactory().getSupportedDefinitionClasses(definitionType); - } } \ No newline at end of file Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderServiceProxy.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderCommentComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderConstants.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderRecordingComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml =================================================================== diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml (.../videoRecorderApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml (.../videoRecorderApplicationContext.xml) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -1,97 +1,10 @@ - - - - - - - org.lamsfoundation.lams.tool.videoRecorder.ApplicationResources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED,-java.lang.Exception - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + \ No newline at end of file Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/AuthoringAction.java =================================================================== diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -2,333 +2,41 @@ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA - * + * * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ /* $$Id$$ */ package org.lamsfoundation.lams.tool.videoRecorder.web.actions; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.authoring.web.AuthoringConstants; -import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; -import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator; -import org.lamsfoundation.lams.tool.ToolAccessMode; -import org.lamsfoundation.lams.tool.ToolSessionManager; -import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderDTO; -import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderCondition; -import org.lamsfoundation.lams.tool.videoRecorder.service.IVideoRecorderService; -import org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderServiceProxy; -import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderConstants; -import org.lamsfoundation.lams.tool.videoRecorder.web.forms.AuthoringForm; -import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.FileValidatorUtil; -import org.lamsfoundation.lams.util.WebUtil; +import org.apache.struts.action.RedirectingActionForward; import org.lamsfoundation.lams.web.action.LamsDispatchAction; -import org.lamsfoundation.lams.web.session.SessionManager; -import org.lamsfoundation.lams.web.util.AttributeNames; -import org.lamsfoundation.lams.web.util.SessionMap; -/** - * @author - * @version - * - * @struts.action path="/authoring" name="authoringForm" parameter="dispatch" scope="request" validate="false" - * - * @struts.action-forward name="success" path="tiles:/authoring/main" - * @struts.action-forward name="message_page" path="tiles:/generic/message" - */ public class AuthoringAction extends LamsDispatchAction { - - private static Logger logger = Logger.getLogger(AuthoringAction.class); - - public IVideoRecorderService videoRecorderService; - - // Authoring SessionMap key names - private static final String KEY_TOOL_CONTENT_ID = "toolContentID"; - private static final String KEY_CONTENT_FOLDER_ID = "contentFolderID"; - private static final String KEY_MODE = "mode"; - - /** - * Default method when no dispatch parameter is specified. It is expected that the parameter - * toolContentID will be passed in. This will be used to retrieve content for this tool. - * - */ @Override protected ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - - // Extract toolContentID from parameters. - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); - - // get httpsession - HttpSession ss = SessionManager.getSession(); - - // get LAMS user - UserDTO user = (UserDTO)ss.getAttribute(AttributeNames.USER); - - String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, "mode", true); - - // set up videoRecorderService - if (videoRecorderService == null) { - videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(this.getServlet().getServletContext()); - } - - // get toolSessionManager - ToolSessionManager toolSessionManager =VideoRecorderServiceProxy.getVideoRecorderSessionManager(this.getServlet().getServletContext()); - - // retrieving VideoRecorder with given toolContentID - VideoRecorder videoRecorder = videoRecorderService.getVideoRecorderByContentId(toolContentID); - if (videoRecorder == null) { - videoRecorder = videoRecorderService.copyDefaultContent(toolContentID); - videoRecorder.setCreateDate(new Date()); - videoRecorderService.saveOrUpdateVideoRecorder(videoRecorder); - // TODO NOTE: this causes DB orphans when LD not saved. - } - - // transform to dto - VideoRecorderDTO videoRecorderDT0 = new VideoRecorderDTO(videoRecorder); - - // get recordings - List recordings = videoRecorderService.getRecordingsByToolContentId(toolContentID); - - // setup first recording - VideoRecorderRecordingDTO firstRecording = null; - - // if there are recordings - if(!recordings.isEmpty()){ - // fetch the first one - firstRecording = recordings.get(0); - } - - // add it to the request - request.setAttribute("videoRecorderRecordingDTO", firstRecording); - - if (mode != null && mode.isTeacher()) { - // Set the defineLater flag so that learners cannot use content - // while we - // are editing. This flag is released when updateContent is called. - videoRecorder.setDefineLater(true); - videoRecorderService.saveOrUpdateVideoRecorder(videoRecorder); - } - - // Set up the authForm. - AuthoringForm authForm = (AuthoringForm) form; - updateAuthForm(authForm, videoRecorder); - - // Set up sessionMap - SessionMap map = createSessionMap(videoRecorder, getAccessMode(request), contentFolderID, - toolContentID); - authForm.setSessionMapID(map.getSessionID()); - - // add the sessionMap to HTTPSession - request.getSession().setAttribute(map.getSessionID(), map); - request.setAttribute(VideoRecorderConstants.ATTR_SESSION_MAP, map); - - // add the toolContentId - request.setAttribute("toolContentId", toolContentID); - - // add the videoRecorderDTO - request.setAttribute("videoRecorderDTO", videoRecorderDT0); - - // set language xml - request.setAttribute("languageXML", videoRecorderService.getLanguageXMLForFCK()); - - return mapping.findForward("success"); + return new RedirectingActionForward("/index.html"); } - - public ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { - // TODO need error checking. - - // get authForm and session map. - AuthoringForm authForm = (AuthoringForm) form; - SessionMap map = getSessionMap(request, authForm); - - // get videoRecorder content. - VideoRecorder videoRecorder = videoRecorderService.getVideoRecorderByContentId((Long) map.get(AuthoringAction.KEY_TOOL_CONTENT_ID)); - - // update videoRecorder content using form inputs. - ToolAccessMode mode = (ToolAccessMode) map.get(AuthoringAction.KEY_MODE); - updateVideoRecorder(videoRecorder, authForm, mode); - - videoRecorderService.releaseConditionsFromCache(videoRecorder); - - Set conditions = videoRecorder.getConditions(); - if (conditions == null) { - conditions = new TreeSet(new TextSearchConditionComparator()); - } - SortedSet conditionSet = (SortedSet) map - .get(VideoRecorderConstants.ATTR_CONDITION_SET); - conditions.addAll(conditionSet); - - List deletedConditionList = (List) map - .get(VideoRecorderConstants.ATTR_DELETED_CONDITION_LIST); - if (deletedConditionList != null) { - for (VideoRecorderCondition condition : deletedConditionList) { - // remove from db, leave in repository - conditions.remove(condition); - videoRecorderService.deleteCondition(condition); - } - } - - // set conditions in case it didn't exist - videoRecorder.setConditions(conditionSet); - - // set the update date - videoRecorder.setUpdateDate(new Date()); - - // set changed attributes - updateVideoRecorder(videoRecorder, authForm, mode); - - // releasing defineLater flag so that learner can start using the tool. - videoRecorder.setDefineLater(false); - - videoRecorderService.saveOrUpdateVideoRecorder(videoRecorder); - - request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE); - - // add the sessionMapID to form - authForm.setSessionMapID(map.getSessionID()); - - request.setAttribute(VideoRecorderConstants.ATTR_SESSION_MAP, map); - - return mapping.findForward("success"); - } - - /* ========== Private Methods ********** */ - - /** - * Updates VideoRecorder content using AuthoringForm inputs. - * - * @param authForm - * @param mode - * @return - */ - private void updateVideoRecorder(VideoRecorder videoRecorder, AuthoringForm authForm, ToolAccessMode mode) { - videoRecorder.setTitle(authForm.getTitle()); - videoRecorder.setInstructions(authForm.getInstructions()); - //if (mode.isAuthor()) { // Teacher cannot modify following - videoRecorder.setLockOnFinished(authForm.isLockOnFinished()); - videoRecorder.setAllowUseVoice(authForm.isAllowUseVoice()); - videoRecorder.setAllowUseCamera(authForm.isAllowUseCamera()); - videoRecorder.setAllowLearnerVideoVisibility(authForm.isAllowLearnerVideoVisibility()); - videoRecorder.setAllowComments(authForm.isAllowComments()); - videoRecorder.setAllowRatings(authForm.isAllowRatings()); - videoRecorder.setExportAll(authForm.isExportAll()); - videoRecorder.setExportOffline(authForm.isExportOffline()); - //} - } - - /** - * Updates AuthoringForm using VideoRecorder content. - * - * @param videoRecorder - * @param authForm - * @return - */ - private void updateAuthForm(AuthoringForm authForm, VideoRecorder videoRecorder) { - authForm.setTitle(videoRecorder.getTitle()); - authForm.setInstructions(videoRecorder.getInstructions()); - authForm.setLockOnFinished(videoRecorder.isLockOnFinished()); - authForm.setAllowUseVoice(videoRecorder.isAllowUseVoice()); - authForm.setAllowUseCamera(videoRecorder.isAllowUseCamera()); - authForm.setAllowLearnerVideoVisibility(videoRecorder.isAllowLearnerVideoVisibility()); - authForm.setAllowComments(videoRecorder.isAllowComments()); - authForm.setAllowRatings(videoRecorder.isAllowComments()); - authForm.setExportAll(videoRecorder.isExportAll()); - authForm.setExportOffline(videoRecorder.isExportOffline()); - } - - /** - * Updates SessionMap using VideoRecorder content. - * - * @param videoRecorder - * @param mode - */ - private SessionMap createSessionMap(VideoRecorder videoRecorder, ToolAccessMode mode, String contentFolderID, - Long toolContentID) { - - SessionMap map = new SessionMap(); - - map.put(AuthoringAction.KEY_MODE, mode); - map.put(AuthoringAction.KEY_CONTENT_FOLDER_ID, contentFolderID); - map.put(AuthoringAction.KEY_TOOL_CONTENT_ID, toolContentID); - map.put(VideoRecorderConstants.ATTR_DELETED_CONDITION_LIST, new ArrayList()); - - SortedSet set = new TreeSet(new TextSearchConditionComparator()); - - if (videoRecorder.getConditions() != null) { - set.addAll(videoRecorder.getConditions()); - } - map.put(VideoRecorderConstants.ATTR_CONDITION_SET, set); - return map; - } - - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - - /** - * Retrieve the SessionMap from the HttpSession. - * - * @param request - * @param authForm - * @return - */ - private SessionMap getSessionMap(HttpServletRequest request, AuthoringForm authForm) { - return (SessionMap) request.getSession().getAttribute(authForm.getSessionMapID()); - } -} +} \ No newline at end of file Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/ClearSessionAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java =================================================================== diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java (.../LearningAction.java) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java (.../LearningAction.java) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -2,253 +2,57 @@ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA - * + * * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ /* $$Id$$ */ package org.lamsfoundation.lams.tool.videoRecorder.web.actions; -import java.io.IOException; -import java.util.List; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.tool.ToolAccessMode; -import org.lamsfoundation.lams.tool.ToolSession; -import org.lamsfoundation.lams.tool.ToolSessionManager; -import org.lamsfoundation.lams.tool.exception.DataMissingException; -import org.lamsfoundation.lams.tool.exception.ToolException; -import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderDTO; -import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO; -import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderUserDTO; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderUser; -import org.lamsfoundation.lams.tool.videoRecorder.service.IVideoRecorderService; -import org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderServiceProxy; -import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderConstants; -import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderException; -import org.lamsfoundation.lams.tool.videoRecorder.web.forms.LearningForm; +import org.apache.struts.action.RedirectingActionForward; +import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; -/** - * @author - * @version - * - * @struts.action path="/learning" parameter="dispatch" scope="request" - * name="learningForm" - * @struts.action-forward name="videoRecorder" path="tiles:/learning/main" - * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater" - */ public class LearningAction extends LamsDispatchAction { + @Override + public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws Exception { + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); - private static Logger log = Logger.getLogger(LearningAction.class); - - private static final boolean MODE_OPTIONAL = false; - - private IVideoRecorderService videoRecorderService; - - public ActionForward unspecified(ActionMapping mapping, ActionForm form, - HttpServletRequest request, HttpServletResponse response) - throws Exception { - - LearningForm learningForm = (LearningForm) form; - - // 'toolSessionID' and 'mode' paramters are expected to be present. - // TODO need to catch exceptions and handle errors. - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, - AttributeNames.PARAM_MODE, MODE_OPTIONAL); - - Long toolSessionID = WebUtil.readLongParam(request, - AttributeNames.PARAM_TOOL_SESSION_ID); - - // set up videoRecorderService - if (videoRecorderService == null) { - videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(this - .getServlet().getServletContext()); - } - - // Retrieve the session and content. - VideoRecorderSession videoRecorderSession = videoRecorderService - .getSessionBySessionId(toolSessionID); - if (videoRecorderSession == null) { - throw new VideoRecorderException( - "Cannot retrieve session with toolSessionID" - + toolSessionID); - } - - VideoRecorder videoRecorder = videoRecorderSession.getVideoRecorder(); - - Long toolContentID = videoRecorder.getToolContentId(); - - // check defineLater - if (videoRecorder.isDefineLater()) { - return mapping.findForward("defineLater"); - } - - VideoRecorderUser videoRecorderUser; - if (mode.equals(ToolAccessMode.TEACHER)) { - Long userID = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, false); - videoRecorderUser = videoRecorderService.getUserByUserIdAndSessionId(userID, toolSessionID); - } else { - videoRecorderUser = getCurrentUser(toolSessionID); - } - - VideoRecorderDTO videoRecorderDT0 = new VideoRecorderDTO(videoRecorder); - - VideoRecorderUserDTO videoRecorderUserDTO = new VideoRecorderUserDTO(videoRecorderUser); - - // set mode, toolSessionID and userId - request.setAttribute("mode", mode.toString()); - request.setAttribute("videoRecorderUserDTO", videoRecorderUserDTO); - request.setAttribute("userId", videoRecorderUser.getUid()); - request.setAttribute("videoRecorderDTO", videoRecorderDT0); - learningForm.setToolSessionID(toolSessionID); - request.setAttribute("toolSessionId", toolSessionID); - request.setAttribute("toolContentId", toolContentID); - - // getting the contentfolderid using the session and lesson - WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - IBaseDAO baseDAO =(IBaseDAO) ctx.getBean("baseDAO"); - ToolSession toolSession = (ToolSession)baseDAO.find(ToolSession.class, toolSessionID); - String contentFolderId = toolSession.getLesson().getLearningDesign().getContentFolderID(); - - request.setAttribute("contentFolderId", contentFolderId); - - // set language xml - request.setAttribute("languageXML", videoRecorderService.getLanguageXML()); - - // set red5 server url - String red5ServerUrl = Configuration.get(ConfigurationKeys.RED5_SERVER_URL); - request.setAttribute("red5ServerUrl", red5ServerUrl); - - // set LAMS server url - String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); - request.setAttribute("serverUrl", serverUrl); - - // Set the content in use flag. - if (!videoRecorder.isContentInUse()) { - videoRecorder.setContentInUse(new Boolean(true)); - videoRecorderService.saveOrUpdateVideoRecorder(videoRecorder); - } - - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet() - .getServletContext()); - - // get any existing videoRecorder entry - - // set readOnly flag. - if (mode.equals(ToolAccessMode.TEACHER) || (videoRecorder.isLockOnFinished() && videoRecorderUser.isFinishedActivity())) { - request.setAttribute("contentEditable", false); - } else { - request.setAttribute("contentEditable", true); - } - request.setAttribute("finishedActivity", videoRecorderUser.isFinishedActivity()); - - return mapping.findForward("videoRecorder"); - } - - private VideoRecorderUser getCurrentUser(Long toolSessionId) { - UserDTO user = (UserDTO) SessionManager.getSession().getAttribute( - AttributeNames.USER); - - // attempt to retrieve user using userId and toolSessionId - VideoRecorderUser videoRecorderUser = videoRecorderService - .getUserByUserIdAndSessionId(new Long(user.getUserID() - .intValue()), toolSessionId); - - if (videoRecorderUser == null) { - VideoRecorderSession videoRecorderSession = videoRecorderService - .getSessionBySessionId(toolSessionId); - videoRecorderUser = videoRecorderService.createVideoRecorderUser(user, - videoRecorderSession); - } - - return videoRecorderUser; - } - - public ActionForward finishActivity(ActionMapping mapping, ActionForm form, - HttpServletRequest request, HttpServletResponse response) { - - Long toolSessionID = WebUtil.readLongParam(request, "toolSessionID"); - - VideoRecorderUser videoRecorderUser = getCurrentUser(toolSessionID); - - if (videoRecorderUser != null) { - - LearningForm learningForm = (LearningForm) form; - - // TODO fix idType to use real value not 999 - - if (videoRecorderUser.getEntryUID() == null) { - videoRecorderUser.setEntryUID(videoRecorderService.createNotebookEntry( - toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, VideoRecorderConstants.TOOL_SIGNATURE, - videoRecorderUser.getUserId().intValue(), learningForm - .getEntryText())); - } else { - // update existing entry. - videoRecorderService.updateEntry(videoRecorderUser.getEntryUID(), - learningForm.getEntryText()); - } - - videoRecorderUser.setFinishedActivity(true); - videoRecorderService.saveOrUpdateVideoRecorderUser(videoRecorderUser); - } else { - log.error("finishActivity(): couldn't find VideoRecorderUser with id: " - + videoRecorderUser.getUserId() + "and toolSessionID: " - + toolSessionID); - } - - ToolSessionManager sessionMgrService = VideoRecorderServiceProxy - .getVideoRecorderSessionManager(getServlet().getServletContext()); - - String nextActivityUrl; - try { - nextActivityUrl = sessionMgrService.leaveToolSession(toolSessionID, - videoRecorderUser.getUserId()); - response.sendRedirect(nextActivityUrl); - } catch (DataMissingException e) { - throw new VideoRecorderException(e); - } catch (ToolException e) { - throw new VideoRecorderException(e); - } catch (IOException e) { - throw new VideoRecorderException(e); - } - - return null; // TODO need to return proper page. - } + WebApplicationContext wac = WebApplicationContextUtils + .getRequiredWebApplicationContext(getServlet().getServletContext()); + ILearnerService learnerService = (ILearnerService) wac.getBean("learnerService"); + String finishURL = learnerService.completeToolSession(toolSessionId, user.getUserID().longValue()); + return new RedirectingActionForward(finishURL); + } } Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/MonitoringAction.java =================================================================== diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision acc8d2acf5b6b0002e0c8129947040a779ab4077) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -2,217 +2,41 @@ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA - * + * * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ /* $$Id$$ */ package org.lamsfoundation.lams.tool.videoRecorder.web.actions; -import java.sql.Array; -import java.util.Set; -import java.util.Iterator; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.tool.ToolAccessMode; -import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderDTO; -import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderSessionDTO; -import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderUserDTO; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderUser; -import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderSession; -import org.lamsfoundation.lams.tool.videoRecorder.service.IVideoRecorderService; -import org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderServiceProxy; -import org.lamsfoundation.lams.tool.videoRecorder.web.forms.AuthoringForm; -import org.lamsfoundation.lams.tool.videoRecorder.web.forms.MonitoringForm; -import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; -import org.lamsfoundation.lams.util.WebUtil; +import org.apache.struts.action.RedirectingActionForward; import org.lamsfoundation.lams.web.action.LamsDispatchAction; -import org.lamsfoundation.lams.web.session.SessionManager; -import org.lamsfoundation.lams.web.util.AttributeNames; -import org.lamsfoundation.lams.web.util.SessionMap; -/** - * @author - * @version - * - * @struts.action path="/monitoring" parameter="method" scope="request" - * name="monitoringForm" validate="false" - * - * @struts.action-forward name="success" path="tiles:/monitoring/main" - * @struts.action-forward name="videoRecorder_display" - * path="tiles:/monitoring/videoRecorder_display" - * @struts.action-forward name="videoRecorder_openInstance" - * path="/pages/monitoring/videoRecorderOpenInstance.jsp" - * - */ public class MonitoringAction extends LamsDispatchAction { - - private static Logger log = Logger.getLogger(MonitoringAction.class); - - private static final boolean MODE_OPTIONAL = false; - - public IVideoRecorderService videoRecorderService; - - public ActionForward unspecified(ActionMapping mapping, ActionForm form, - HttpServletRequest request, HttpServletResponse response) { - - setupService(); - - // get httpsession - HttpSession ss = SessionManager.getSession(); - - // get LAMS user - UserDTO user = (UserDTO)ss.getAttribute(AttributeNames.USER); - - Long toolContentID = new Long(WebUtil.readLongParam(request, - AttributeNames.PARAM_TOOL_CONTENT_ID)); - - String contentFolderID = WebUtil.readStrParam(request, - AttributeNames.PARAM_CONTENT_FOLDER_ID); - - VideoRecorder videoRecorder = videoRecorderService - .getVideoRecorderByContentId(toolContentID); - - if (videoRecorder == null) { - // TODO error page. - } - - VideoRecorderDTO videoRecorderDT0 = new VideoRecorderDTO(videoRecorder); - - // get sessions in order to get first session - Set sessions = videoRecorder.getVideoRecorderSessions(); - //videoRecorderDT0.getSessionDTOs(); - - for (Iterator sessIter = sessions.iterator(); sessIter.hasNext();) { - VideoRecorderSession session = (VideoRecorderSession) sessIter.next(); - - VideoRecorderSessionDTO sessionDTO = new VideoRecorderSessionDTO(session); - videoRecorderDT0.getSessionDTOs().add(sessionDTO); - - } - - Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB,true); - videoRecorderDT0.setCurrentTab(currentTab); - - request.setAttribute("videoRecorderDTO", videoRecorderDT0); - request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID); - - - boolean isGroupedActivity = videoRecorderService.isGroupedActivity(toolContentID); - request.setAttribute("isGroupedActivity", isGroupedActivity); - - return mapping.findForward("success"); - } - - public ActionForward showVideoRecorder(ActionMapping mapping, ActionForm form, - HttpServletRequest request, HttpServletResponse response) { - - setupService(); - - Long uid = new Long(WebUtil.readLongParam(request, "userUID")); - - VideoRecorderUser user = videoRecorderService.getUserByUID(uid); - NotebookEntry entry = videoRecorderService.getEntry(user.getEntryUID()); - - VideoRecorderUserDTO userDTO = new VideoRecorderUserDTO(user, entry); - - request.setAttribute("userDTO", userDTO); - - return mapping.findForward("videoRecorder_display"); - } - - public ActionForward openVideoRecorderInstance(ActionMapping mapping, ActionForm form, - HttpServletRequest request, HttpServletResponse response) { - - setupService(); - - // get httpsession - HttpSession ss = SessionManager.getSession(); - - // get LAMS user - UserDTO user = (UserDTO)ss.getAttribute(AttributeNames.USER); - - Long toolContentID = new Long(WebUtil.readLongParam(request, - AttributeNames.PARAM_TOOL_CONTENT_ID)); - - String contentFolderID = WebUtil.readStrParam(request, - AttributeNames.PARAM_CONTENT_FOLDER_ID); - - Long sessionId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); - - VideoRecorder videoRecorder = videoRecorderService - .getVideoRecorderByContentId(toolContentID); - - if (videoRecorder == null) { - // TODO error page. - } - - VideoRecorderDTO videoRecorderDT0 = new VideoRecorderDTO(videoRecorder); - VideoRecorderSession session = (VideoRecorderSession) videoRecorderService.getSessionBySessionId(sessionId); - - // check Monitor user is part of the session - VideoRecorderUser videoRecorderUser = videoRecorderService.getUserByUserIdAndSessionId(new Long(user.getUserID()), sessionId); - - if(videoRecorderUser == null){ - // create new Monitoring user for Session - videoRecorderUser = videoRecorderService.createVideoRecorderUser(user, session); - } - - request.setAttribute("contentEditable", true); - request.setAttribute("mode", "author"); - - request.setAttribute("videoRecorderDTO", videoRecorderDT0); - request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId); - request.setAttribute("monitoringUid", videoRecorderUser.getUid()); - request.setAttribute("contentFolderID", contentFolderID); - - // set language xml - request.setAttribute("languageXML", videoRecorderService.getLanguageXML()); - - // set red5 server url - String red5ServerUrl = Configuration.get(ConfigurationKeys.RED5_SERVER_URL); - request.setAttribute("red5ServerUrl", red5ServerUrl); - - // set LAMS server url - String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); - request.setAttribute("serverUrl", serverUrl); - - return mapping.findForward("videoRecorder_openInstance"); - } - - /** - * set up videoRecorderService - */ - private void setupService() { - if (videoRecorderService == null) { - videoRecorderService = VideoRecorderServiceProxy.getVideoRecorderService(this - .getServlet().getServletContext()); - } - } -} + @Override + public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) { + return new RedirectingActionForward("/index.html"); + } +} \ No newline at end of file Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/VideoRecorderAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/forms/AuthoringForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/forms/LearningForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/forms/MonitoringForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/forms/VideoRecorderConditionForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/403.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/404.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/WEB-INF/applicationContext.xml =================================================================== diff -u --- lams_tool_videorecorder/web/WEB-INF/applicationContext.xml (revision 0) +++ lams_tool_videorecorder/web/WEB-INF/applicationContext.xml (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -0,0 +1,7 @@ + + + + \ No newline at end of file Index: lams_tool_videorecorder/web/WEB-INF/struts-config.xml =================================================================== diff -u --- lams_tool_videorecorder/web/WEB-INF/struts-config.xml (revision 0) +++ lams_tool_videorecorder/web/WEB-INF/struts-config.xml (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -0,0 +1,17 @@ + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/Date.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/DefineLater.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/Head.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/ImgButtonWrapper.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/Tab.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/TabBody.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/TabName.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/Tabs.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/TextSearch.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/headItems.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tiles-defs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/jstl/c.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/jstl/fmt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/jstl/fn.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/jstl/permittedTaglibs.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/jstl/scriptfree.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/jstl/x.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/lams/lams.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/struts/struts-bean-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/struts/struts-bean.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/struts/struts-html-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/struts/struts-html.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/struts/struts-logic-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/struts/struts-logic.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/struts/struts-nested.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/struts/struts-tiles-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tlds/struts/struts-tiles.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/validator-rules.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/WEB-INF/web.xml =================================================================== diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r1b8e236ea17be319274b3a8d2196ae798964b363 --- lams_tool_videorecorder/web/WEB-INF/web.xml (.../web.xml) (revision 5e63656a12c02f7476564e278b43ff4ce86ac930) +++ lams_tool_videorecorder/web/WEB-INF/web.xml (.../web.xml) (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -3,17 +3,13 @@ - + + Video Recorder + + Video Recorder tool + + - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.videoRecorder.ApplicationResources - - - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml - - locatorFactorySelector classpath:/org/lamsfoundation/lams/beanRefContext.xml @@ -28,35 +24,11 @@ org.lamsfoundation.lams.web.session.SystemSessionFilter - - hibernateFilter - - org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - SystemSessionFilter /* - - hibernateFilter - /* - - - LocaleFilter - /* - @@ -77,227 +49,19 @@ detail - 2 + 1 - - validate - true - - 1 - - - - Connector - net.fckeditor.connector.ConnectorServlet - - baseDir - /UserFiles/ - - - debug - false - - 1 - - - - - Attachment Download - Attachment Download - download - org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - videoRecorderToolContentHandler - - 3 - - - action *.do - - - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector - - - - download - /download/* - - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - - - - - - - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld - - - tags-html - /WEB-INF/tlds/struts/struts-html.tld - - - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld - - - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld - - - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld - - - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld - - - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld - - - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld - - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - - - tags-permittedTaglibs - /WEB-INF/tlds/jstl/permittedTaglibs.tld - - - tags-scriptfree - /WEB-INF/tlds/jstl/scriptfree.tld - - - - - - tags-lams - /WEB-INF/tlds/lams/lams.tld - - - - - - Secure content + Public Content /* - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - - - - Authoring content - /authoring/* - /pages/authoring/* - /authoring.do - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /pages/monitoring/* - /monitoring.do - - - MONITOR - SYSADMIN - - - - - - Student - LEARNER - - - - Authors Learning Designs - AUTHOR - - - - Member of Staff - MONITOR - - - - Group Manager - GROUP MANAGER - - - Group Administrator - GROUP ADMIN - - - LAMS System Adminstrator - SYSADMIN - - - - - FORM - LAMS - - /login.jsp - /login.jsp?failed=y - - \ No newline at end of file Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/empty.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/footer.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/header.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/learnerheader.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/message.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/messages.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/taglibs.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/error.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/images/VideoRecorder.xcf.zip =================================================================== diff -u -rba09a82060f0021dc27fdc27b1a1f853a8369046 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/images/cross.gif =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/images/down.gif =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/images/down_disabled.gif =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/images/edit.gif =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/images/soundOnly.png =================================================================== diff -u -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/images/success.gif =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/images/up.gif =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/images/up_disabled.gif =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/AC_OETags.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/VideoRecorder.html'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/includes/flash/VideoRecorder.swf =================================================================== diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/VideoRecorderFCKEditor.html'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/includes/flash/VideoRecorderFCKEditor.swf =================================================================== diff -u -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/24-heart-gold.png =================================================================== diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/24-heart-red.png =================================================================== diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/24-heart-silver.png =================================================================== diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/deleteIcon.swf =================================================================== diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/downArrow.swf =================================================================== diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/exportIcon.swf =================================================================== diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/assets/images/license.txt'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/includes/flash/assets/images/pauseIcon.swf =================================================================== diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/playArray.swf =================================================================== diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/playerVolume.png =================================================================== diff -u -r42aa5319fbd33938828764c43dd0ab1ca80e2416 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/recordIcon.swf =================================================================== diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/upArrow.swf =================================================================== diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/volume.jpg =================================================================== diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/assets/styles/main.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/history/history.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/history/history.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/history/historyFrame.html'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/includes/flash/playerProductInstall.swf =================================================================== diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/javascript/authoring.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/javascript/monitoring.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/index.html =================================================================== diff -u --- lams_tool_videorecorder/web/index.html (revision 0) +++ lams_tool_videorecorder/web/index.html (revision 1b8e236ea17be319274b3a8d2196ae798964b363) @@ -0,0 +1,5 @@ + + + This tool is not supported anymore. + + \ No newline at end of file Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/layouts/defaultLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/layouts/learningLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/layouts/tabLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/addCondition.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/advanced.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/authoring.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/basic.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/conditionList.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/conditions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/learning/defineLater.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/learning/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/learning/parts/finishButton.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/editActivity.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/monitoring.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/statistics.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/summary.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/videoRecorderDisplay.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/videoRecorderOpenInstance.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/previewImages/all preview images go here'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/previewImages/soundOnly.png =================================================================== diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -r1b8e236ea17be319274b3a8d2196ae798964b363 Binary files differ Fisheye: Tag 1b8e236ea17be319274b3a8d2196ae798964b363 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/recordings/exported recordings go here'. Fisheye: No comparison available. Pass `N' to diff?