Index: lams_admin/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/Attic/web.xml,v
diff -u -r1.25 -r1.26
--- lams_admin/web/WEB-INF/web.xml	7 Apr 2009 05:24:59 -0000	1.25
+++ lams_admin/web/WEB-INF/web.xml	3 Jul 2009 04:57:00 -0000	1.26
@@ -10,13 +10,18 @@
   	<param-value>org.lamsfoundation.lams.admin.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</param-value>
+</context-param> 
+
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
 	<param-value>classpath:/org/lamsfoundation/lams/admin/adminApplicationContext.xml</param-value>
 </context-param>
 <context-param>
    <param-name>locatorFactorySelector</param-name>
-   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/lams/ApplicationResources_ru_RU.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/conf/flashxml/lams/monitoring/ru_RU_dictionary.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/flashxml/lams/monitoring/Attic/ru_RU_dictionary.xml,v
diff -u -r1.2 -r1.3
--- lams_central/conf/flashxml/lams/monitoring/ru_RU_dictionary.xml	2 Apr 2009 05:04:57 -0000	1.2
+++ lams_central/conf/flashxml/lams/monitoring/ru_RU_dictionary.xml	3 Jul 2009 04:57:02 -0000	1.3
@@ -1 +1 @@
-<wddxPacket version="1.0"><!-- CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Apr 01 23:03:01 CST 2009 --><header/><data><struct><var name="messageKey"><string>getDictionary</string></var><var name="messageType"><number>3</number></var><var name="messageValue"><array length="194"><struct><var name="key"><string>al_no</string></var><var name="value"><string>Нет</string></var><var name="description"><string>'No' on the alert dialog</string></var></struct><struct><var name="key"><string>staff_group_name</string></var><var name="value"><string>{0} сотрудников</string></var><var name="description"><string>Group name for the class's staff group.</string></var></struct><struct><var name="key"><string>ls_win_editclass_cancel_btn</string></var><var name="value"><string>Отменить</string></var><var name="description"><string>Cancel button on Edit Class popup</string></var></struct><struct><var name="key"><string>check_avail_btn</string></var><var name="value"><string>Проверить доступность</string></var><var name="description"><string>Check Availability button label</string></var></struct><struct><var name="key"><string>ls_sequence_live_edit_btn_tooltip</string></var><var name="value"><string>Редактировать проект этого урока</string></var><var name="description"><string>Tool tip message for Live Edit button</string></var></struct><struct><var name="key"><string>ls_learnerURL_lbl</string></var><var name="value"><string>Ссылка для ученика:</string></var><var name="description"><string>Learner URL:</string></var></struct><struct><var name="key"><string>continue_btn</string></var><var name="value"><string>Продолжить</string></var><var name="description"><string>Continue button label</string></var></struct><struct><var name="key"><string>mv_search_not_found_msg</string></var><var name="value"><string>{0} не найдено.</string></var><var name="description"><string>This message appears when the search does not find any learners whose names contain the search parameter.</string></var></struct><struct><var name="key"><string>mv_search_go_btn_lbl</string></var><var name="value"><string>Перейти к</string></var><var name="description"><string>If the learner entered text into the index/search field, clicking this button will search all started learners names for the text they entered, otherwise if they entered a number and clicked go. It will show the contents of the page, whose number they entered.</string></var></struct><struct><var name="key"><string>ls_win_learners_close_btn</string></var><var name="value"><string>Закрыть</string></var><var name="description"><string>Close button on View Learners popup</string></var></struct><struct><var name="key"><string>mv_search_current_page_lbl</string></var><var name="value"><string>Страница {0} из {1}</string></var><var name="description"><string>{0} is the page we are on now and {1} is the number of pages</string></var></struct><struct><var name="key"><string>ls_manage_learners_btn_tooltip</string></var><var name="value"><string>Показать всех уччеников, крикрепленных к этому уроку</string></var><var name="description"><string>tool tip message for the view learners button in lesson tab under manage lesson section</string></var></struct><struct><var name="key"><string>ls_manage_apply_btn_tooltip</string></var><var name="value"><string>Изменить статус урока, основываясь на выборе в выпадающем меню</string></var><var name="description"><string>tool tip message for the apply button in lesson tab under manage lesson section to change the lesson status</string></var></struct><struct><var name="key"><string>ls_seq_status_system_gate</string></var><var name="value"><string>Системный затвор</string></var><var name="description"><string>A System Gate is a stop point that can be controlled by time setting or user control</string></var></struct><struct><var name="key"><string>mnu_go_todo</string></var><var name="value"><string>Список заданий</string></var><var name="description"><string>Menu bar Todo</string></var></struct><struct><var name="key"><string>mtab_todo</string></var><var name="value"><string>Список заданий</string></var><var name="description"><string>Monitor Todo tab</string></var></struct><struct><var name="key"><string>td_desc_text</string></var><var name="value"><string>Использование Списка заданий необязательно для выполнения этой последовательности. Обратите в раздел помощь за соотвествующей информацией.&lt;br&gt;&lt;br&gt; Эта функция теперь доступна в полном объеме.</string></var><var name="description"><string>Todo tab description</string></var></struct><struct><var name="key"><string>al_error_forcecomplete_invalidactivity</string></var><var name="value"><string>Вы перетащили пользователя '{0}' на его текущее или уже выполненное задание '{1}'</string></var><var name="description"><string>Error message when learner has been dropped on its previous or on its current activity</string></var></struct><struct><var name="key"><string>ccm_monitor_activityhelp</string></var><var name="value"><string>Помощь по мониторингу заданий</string></var><var name="description"><string>Label for Custom Context Monitor Activity Help</string></var></struct><struct><var name="key"><string>al_validation_schstart</string></var><var name="value"><string>Вы не выбрали дату. Выберите, пожалуйста, дату и время.</string></var><var name="description"><string>Message when no date is selected for starting a lesson by schedule.</string></var></struct><struct><var name="key"><string>al_confirm_forcecomplete_toactivity</string></var><var name="value"><string>Действительно ли вы желаете принудительно завершить задания у ученика '{0}'  вплоть до '{1}'?</string></var><var name="description"><string>Message to get confirmation from user before send data to server for force complete a learner to the activity it has been dropped</string></var></struct><struct><var name="key"><string>ls_seq_status_not_set</string></var><var name="value"><string>Еще не задан</string></var><var name="description"><string>The value of the sequence's status is not set</string></var></struct><struct><var name="key"><string>ls_sequence_live_edit_btn</string></var><var name="value"><string>Редактирование "на лету"</string></var><var name="description"><string>Live Edit button</string></var></struct><struct><var name="key"><string>about_popup_license_lbl</string></var><var name="value"><string>Это программа является free software; Вы можете распространять и/или изменять ее при условиях соответствия GNU General Public License version 2 опубликованной Free Software Foundation. {0}</string></var><var name="description"><string>Label displaying the license statement in the About dialog.</string></var></struct><struct><var name="key"><string>stream_reference_lbl</string></var><var name="value"><string>LAMS</string></var><var name="description"><string>Reference label for the application stream.</string></var></struct><struct><var name="key"><string>gpl_license_url</string></var><var name="value"><string>www.gnu.org/licenses/gpl.txt 	</string></var><var name="description"><string>URL address for GPL licence.</string></var></struct><struct><var name="key"><string>stream_url</string></var><var name="value"><string>http://{0}foundation.org</string></var><var name="description"><string>URL address for the application stream.</string></var></struct><struct><var name="key"><string>al_ok</string></var><var name="value"><string>ОК</string></var><var name="description"><string>OK on the alert dialog</string></var></struct><struct><var name="key"><string>close_mc_tooltip</string></var><var name="value"><string>Свернуть</string></var><var name="description"><string>Tooltip message for close button on Branching canvas.</string></var></struct><struct><var name="key"><string>ls_tasks_txt</string></var><var name="value"><string>Обязательные задания</string></var><var name="description"><string>Heading for Required Tasks (todo section of Lesson tab)</string></var></struct><struct><var name="key"><string>ls_manage_time_lbl</string></var><var name="value"><string>Время (Часы : Минуты)</string></var><var name="description"><string>Time fields title - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_continue_lbl</string></var><var name="value"><string>Здравствуйте, {1}, вы не закончили редактирование {0}.</string></var><var name="description"><string>Continue message label</string></var></struct><struct><var name="key"><string>al_confirm_forcecomplete_tofinish</string></var><var name="value"><string>Действительно ли вы желаете принудительно завершить урок у ученика '{0}'?</string></var><var name="description"><string>Message to get confirmation from user before sending data to server for force complete to the end of lesson</string></var></struct><struct><var name="key"><string>competences_mapped_to_act_lbl</string></var><var name="value"><string>Знания определены к {0}</string></var><var name="description"><string>Label in the Competence Mappings dialog to show all the competences mapped to an activity who's name is given by the argument</string></var></struct><struct><var name="key"><string>ls_status_cmb_remove</string></var><var name="value"><string>Удалить</string></var><var name="description"><string>Lesson status option - Remove</string></var></struct><struct><var name="key"><string>ls_status_removed_lbl</string></var><var name="value"><string>Удаленный</string></var><var name="description"><string>Current status description if deleted (removed) lesson.</string></var></struct><struct><var name="key"><string>al_yes</string></var><var name="value"><string>Да</string></var><var name="description"><string>Yes on the alert dialog</string></var></struct><struct><var name="key"><string>ls_continue_action_lbl</string></var><var name="value"><string>Нажмите {0}, чтобы продолжить. 	</string></var><var name="description"><string>Action label displayed when a user can proceed to Live Edit.</string></var></struct><struct><var name="key"><string>mv_search_default_txt</string></var><var name="value"><string>Введите поисковый запрос или номер страницы</string></var><var name="description"><string>The text that is initially displayed in the search/index text field. Search query corresponds to all or part of a learners' name and page number corresponds to a specific page of learners. The user will enter something and then click on the 'Go' button, after which the results will be displayed.</string></var></struct><struct><var name="key"><string>branch_mapping_dlg_conditions_dgd_lbl</string></var><var name="value"><string>Соотвествия</string></var><var name="description"><string>Heading label for Mapping datagrid.</string></var></struct><struct><var name="key"><string>lbl_num_sequences</string></var><var name="value"><string>{0} - Последовательностей</string></var><var name="description"><string>Number of child sequence or Optional Sequences activity shown on canvas.</string></var></struct><struct><var name="key"><string>al_activity_openContent_invalid</string></var><var name="value"><string>Извините! Перед тем как нажать пункт меню Открыть/Редактировать Задание, Вы должны выбрать задание.</string></var><var name="description"><string>alert message when user click Open/Edit Activity Content menu item in context menu before selecting any activity on the canvas</string></var></struct><struct><var name="key"><string>mv_search_error_msg</string></var><var name="value"><string>Введите, пожалуйста, поисковый запрос или номер страницы между 1 и {0}</string></var><var name="description"><string>This error message appears if the search/index field is blank when the user clicks the 'Go' button.</string></var></struct><struct><var name="key"><string>mv_search_invalid_input_msg</string></var><var name="value"><string>Номер страницы должен быть между 1 и {0}</string></var><var name="description"><string>This error message appears if the number entered by the user lies outside the range of viewable pages.</string></var></struct><struct><var name="key"><string>ls_seq_status_sched_gate</string></var><var name="value"><string>Затвор, работающий по времени</string></var><var name="description"><string>A type of Gate Activity where progress depends on time (start time and/or end time)</string></var></struct><struct><var name="key"><string>branch_mapping_dlg_branch_col_lbl</string></var><var name="value"><string>Разветвление</string></var><var name="description"><string>Column heading for showing sequence name of the mapping.</string></var></struct><struct><var name="key"><string>finish_learner_tooltip</string></var><var name="value"><string>Чтобы принудительно завершить урок у ученика, перетащите его иконку ну эту панель.</string></var><var name="description"><string>Rollover message when user moves their mouse over the end gate bar in monitor tab view</string></var></struct><struct><var name="key"><string>al_confirm_forcecomplete_to_end_of_branching_seq</string></var><var name="value"><string>Вы желаете принудительно завершить эту разветвляющуюся последовательность у ученика '{0}'?</string></var><var name="description"><string>This confirmation dialog appears after a learner icon has been dropped on the finish door within the branching view.</string></var></struct><struct><var name="key"><string>mnu_help_help</string></var><var name="value"><string>Помощь по мониторингу</string></var><var name="description"><string>Menu bar Help item</string></var></struct><struct><var name="key"><string>ls_manage_status_lbl</string></var><var name="value"><string>Изменить статус:</string></var><var name="description"><string>Status managing label - Lesson details</string></var></struct><struct><var name="key"><string>ls_manage_learners_btn</string></var><var name="value"><string>Просмотр учеников</string></var><var name="description"><string>View learners button - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_manage_learnerExpp_lbl</string></var><var name="value"><string>Разрешить ученикам экспортировать портфолио</string></var><var name="description"><string>Label for Enable export portfolio for Learner</string></var></struct><struct><var name="key"><string>ls_confirm_expp_enabled</string></var><var name="value"><string>Экспорт портфолио разрешен для учеников</string></var><var name="description"><string>Confirmation message on enabling export portfolio for learners</string></var></struct><struct><var name="key"><string>ls_confirm_expp_disabled</string></var><var name="value"><string>Экспорт портфолио запрещен для учеников</string></var><var name="description"><string>Confirmation message on disabling export portfolio for learners</string></var></struct><struct><var name="key"><string>ls_duration_lbl</string></var><var name="value"><string>Ожидаемая продолжительность:</string></var><var name="description"><string>Elapsed duration of lesson - Lesson details</string></var></struct><struct><var name="key"><string>td_desc_heading</string></var><var name="value"><string>Расширенное управление</string></var><var name="description"><string>Todo tab description heading</string></var></struct><struct><var name="key"><string>opt_activity_title</string></var><var name="value"><string>Опциональное задание</string></var><var name="description"><string>Title for Optional Activity on canvas (monitoring)</string></var></struct><struct><var name="key"><string>lbl_num_activities</string></var><var name="value"><string>{0} - Задания</string></var><var name="description"><string>Number of child activities for Complex activity shown on canvas.</string></var></struct><struct><var name="key"><string>ls_of_text</string></var><var name="value"><string>из</string></var><var name="description"><string>i.e. 1 of 10 Used for showing how many learners have started</string></var></struct><struct><var name="key"><string>ls_manage_txt</string></var><var name="value"><string>Управление уроком</string></var><var name="description"><string>Heading for Management section of Lesson Tab</string></var></struct><struct><var name="key"><string>td_goContribute_btn</string></var><var name="value"><string>Перейти к</string></var><var name="description"><string>Go button on contribute entry item</string></var></struct><struct><var name="key"><string>learner_exportPortfolio_btn</string></var><var name="value"><string>Экспорт портфолио</string></var><var name="description"><string>Label for Export Portfolio used both on learners tab to export learner data and monitor tab to export class data</string></var></struct><struct><var name="key"><string>al_send</string></var><var name="value"><string>Отправить</string></var><var name="description"><string>Send button label on the system error dialog</string></var></struct><struct><var name="key"><string>ls_status_scheduled_lbl</string></var><var name="value"><string>Запланированое</string></var><var name="description"><string>Lesson status option - Scheduled (Not Started)</string></var></struct><struct><var name="key"><string>goContribute_btn_tooltip</string></var><var name="value"><string>Завершить это задание сейчас</string></var><var name="description"><string>tool tip message for go button in required tasks list in lesson tab</string></var></struct><struct><var name="key"><string>help_btn_tooltip</string></var><var name="value"><string>Помощь</string></var><var name="description"><string>tool tip message for help button in toolbar</string></var></struct><struct><var name="key"><string>ls_manage_start_btn_tooltip</string></var><var name="value"><string>Начать урок незамедлительно</string></var><var name="description"><string>tool tip message for the start now button in lesson tab under manage lesson section when staff has not yet started the lesson while creating a lesson</string></var></struct><struct><var name="key"><string>msg_bubble_check_action_lbl</string></var><var name="value"><string>Проверка...</string></var><var name="description"><string>Label displayed when checking availability of lesson.</string></var></struct><struct><var name="key"><string>msg_bubble_failed_action_lbl</string></var><var name="value"><string>Недостуно, попробуйте еще раз.</string></var><var name="description"><string>Label displayed when check failed i.e. lesson is still locked.</string></var></struct><struct><var name="key"><string>ls_locked_msg_lbl</string></var><var name="value"><string>Извините, но {0} сейчас редактируется {1}.</string></var><var name="description"><string>Warning message on Monitor locked screen.</string></var></struct><struct><var name="key"><string>al_confirm_live_edit</string></var><var name="value"><string>Редактирование "на лету" будет открыто. Желаете продолжить?</string></var><var name="description"><string>Confirm warning (dialog) message displayed when opening Live Edit.</string></var></struct><struct><var name="key"><string>about_popup_title_lbl</string></var><var name="value"><string>О программе - {0}</string></var><var name="description"><string>Title for the About Pop-up window.</string></var></struct><struct><var name="key"><string>about_popup_version_lbl</string></var><var name="value"><string>Версия</string></var><var name="description"><string>Label displaying the version no on the About dialog.</string></var></struct><struct><var name="key"><string>about_popup_copyright_lbl</string></var><var name="value"><string>© 2002-2008 {0} Foundation.</string></var><var name="description"><string>Label displaying copyright statement in About dialog.</string></var></struct><struct><var name="key"><string>about_popup_trademark_lbl</string></var><var name="value"><string>{0} является торговой маркой {0} Foundation ( {1} ).</string></var><var name="description"><string>Label displaying the trademark statement in the About dialog.</string></var></struct><struct><var name="key"><string>branch_mapping_dlg_condition_col_lbl</string></var><var name="value"><string>Условие</string></var><var name="description"><string>Column heading for showing condition description of the mapping.</string></var></struct><struct><var name="key"><string>al_error_forcecomplete_to_different_seq</string></var><var name="value"><string>Вы не можете перетащить {0} на задание из другой ветви или последовательности.</string></var><var name="description"><string>This alert appears when either: The learner is in a branching sequence and the monitor tries to force complete them to an activity in a different branching sequence, or: the learner is in an optional sequence and the monitor tries to force complete them to an activity in a different optional sequence</string></var></struct><struct><var name="key"><string>al_error_forcecomplete_notarget</string></var><var name="value"><string>Пожалуйста, перетащите пользователя '{0}' на задание либо конец урока.</string></var><var name="description"><string>Error Message when learner has been dropped outside of an activity or end of lesson bar at the bottom on the canvas</string></var></struct><struct><var name="key"><string>ls_win_editclass_organisation_lbl</string></var><var name="value"><string>Организация</string></var><var name="description"><string>Heading for Organisation tree on Edit Class popup</string></var></struct><struct><var name="key"><string>mnu_file_start</string></var><var name="value"><string>Старт</string></var><var name="description"><string>Menu bar Start</string></var></struct><struct><var name="key"><string>mnu_help</string></var><var name="value"><string>Помощь</string></var><var name="description"><string>Menu bar Help</string></var></struct><struct><var name="key"><string>mnu_help_abt</string></var><var name="value"><string>О программе</string></var><var name="description"><string>Menu bar About</string></var></struct><struct><var name="key"><string>perm_act_lbl</string></var><var name="value"><string>Разрешение</string></var><var name="description"><string>Label for permission gate activity</string></var></struct><struct><var name="key"><string>sched_act_lbl</string></var><var name="value"><string>Расписание</string></var><var name="description"><string>Label for schedule gate activity</string></var></struct><struct><var name="key"><string>synch_act_lbl</string></var><var name="value"><string>Синхронизированный</string></var><var name="description"><string>Used as a label for the Synch Gate Activity Type</string></var></struct><struct><var name="key"><string>ws_Root</string></var><var name="value"><string>Корень</string></var><var name="description"><string>Root folder title for workspace</string></var></struct><struct><var name="key"><string>ws_dlg_cancel_button</string></var><var name="value"><string>Отменить</string></var><var name="description"><string>2</string></var></struct><struct><var name="key"><string>ws_dlg_location_button</string></var><var name="value"><string>Расположение</string></var><var name="description"><string>Workspace dialogue Location btn label</string></var></struct><struct><var name="key"><string>ws_tree_mywsp</string></var><var name="value"><string>Моя рабочая среда</string></var><var name="description"><string>The root level of the tree</string></var></struct><struct><var name="key"><string>ws_tree_orgs</string></var><var name="value"><string>Организации</string></var><var name="description"><string>Shown in the top level of the tree in the workspace</string></var></struct><struct><var name="key"><string>sys_error_msg_start</string></var><var name="value"><string>Произошла следующая системная ошибка:</string></var><var name="description"><string>Common System error message starting line</string></var></struct><struct><var name="key"><string>sys_error</string></var><var name="value"><string>Системная ошибка</string></var><var name="description"><string>System Error elert window title</string></var></struct><struct><var name="key"><string>mnu_file_schedule</string></var><var name="value"><string>Расписание</string></var><var name="description"><string>Menu bar Schedule</string></var></struct><struct><var name="key"><string>mnu_file_exit</string></var><var name="value"><string>Выход</string></var><var name="description"><string>Menu bar Exit</string></var></struct><struct><var name="key"><string>mnu_view_learners</string></var><var name="value"><string>Ученики...</string></var><var name="description"><string>Menu bar Learners</string></var></struct><struct><var name="key"><string>mnu_go</string></var><var name="value"><string>Перейти к</string></var><var name="description"><string>Menu bar Go</string></var></struct><struct><var name="key"><string>mnu_go_lesson</string></var><var name="value"><string>Урок</string></var><var name="description"><string>Menu bar  Go to Lesson Tab</string></var></struct><struct><var name="key"><string>mnu_go_schedule</string></var><var name="value"><string>Расписание</string></var><var name="description"><string>Menu bar Go to Schedule Tab</string></var></struct><struct><var name="key"><string>mnu_go_learners</string></var><var name="value"><string>Ученики</string></var><var name="description"><string>Menu bar Go to Learners Tab</string></var></struct><struct><var name="key"><string>refresh_btn</string></var><var name="value"><string>Обновить</string></var><var name="description"><string>Refresh button</string></var></struct><struct><var name="key"><string>help_btn</string></var><var name="value"><string>Помощь</string></var><var name="description"><string>Help button</string></var></struct><struct><var name="key"><string>refresh_btn_tooltip</string></var><var name="value"><string>Обновить пользовательскую информацию.</string></var><var name="description"><string>tool tip message for the refresh button</string></var></struct><struct><var name="key"><string>al_alert</string></var><var name="value"><string>Предупреждение</string></var><var name="description"><string>Generic title for Alert window</string></var></struct><struct><var name="key"><string>al_cancel</string></var><var name="value"><string>Отменить</string></var><var name="description"><string>To Confirm title for LFError</string></var></struct><struct><var name="key"><string>al_confirm</string></var><var name="value"><string>Подтвердить</string></var><var name="description"><string>To Confirm title for LFError</string></var></struct><struct><var name="key"><string>app_chk_langload</string></var><var name="value"><string>Языковые данные загружены неудачно</string></var><var name="description"><string>message for unsuccessful language loading</string></var></struct><struct><var name="key"><string>app_chk_themeload</string></var><var name="value"><string>Данные для темы загружены неудачно</string></var><var name="description"><string>message for unsuccessful theme loading</string></var></struct><struct><var name="key"><string>app_fail_continue</string></var><var name="value"><string>Программа завершит работу. Пожалуйста, свяжитесь со службой поддержки.</string></var><var name="description"><string>message if application cannot continue due to any error</string></var></struct><struct><var name="key"><string>db_datasend_confirm</string></var><var name="value"><string>Спасибо за то, что послали данные на сервер</string></var><var name="description"><string>Message when user sucessfully dumps data to the server</string></var></struct><struct><var name="key"><string>mnu_edit</string></var><var name="value"><string>Редактировать</string></var><var name="description"><string>Menu bar Edit</string></var></struct><struct><var name="key"><string>mnu_edit_copy</string></var><var name="value"><string>Копировать</string></var><var name="description"><string>Menu bar Edit &amp;gt; Copy</string></var></struct><struct><var name="key"><string>mnu_edit_cut</string></var><var name="value"><string>Вырезать</string></var><var name="description"><string>Menu bar Edit &amp;gt; Cut</string></var></struct><struct><var name="key"><string>mnu_edit_paste</string></var><var name="value"><string>Вставить</string></var><var name="description"><string>Menu bar Edit &amp;gt; Paste</string></var></struct><struct><var name="key"><string>mnu_file</string></var><var name="value"><string>Файл</string></var><var name="description"><string>Menu bar File</string></var></struct><struct><var name="key"><string>mnu_file_refresh</string></var><var name="value"><string>Обновить</string></var><var name="description"><string>Menu bar Refresh</string></var></struct><struct><var name="key"><string>mnu_file_editclass</string></var><var name="value"><string>Редактировать класс</string></var><var name="description"><string>Menu bar Edit Class</string></var></struct><struct><var name="key"><string>branch_mapping_dlg_group_col_lbl</string></var><var name="value"><string>Группа</string></var><var name="description"><string>Column heading for showing group name of the mapping.</string></var></struct><struct><var name="key"><string>mnu_go_sequence</string></var><var name="value"><string>Последовательность</string></var><var name="description"><string>Menu bar Go to Sequence Tab</string></var></struct><struct><var name="key"><string>cv_activity_helpURL_undefined</string></var><var name="value"><string>Нет справки для {0}</string></var><var name="description"><string>Alert message when a tool activity has no help url defined.</string></var></struct><struct><var name="key"><string>cv_design_unsaved_live_edit</string></var><var name="value"><string>Несохраненные изменения будут автоматически сохранены. Желаете ли вы продолжить вставку/слияние?</string></var><var name="description"><string>Confirm alert message displayed when doing an insert/merge to a modified design in Live Edit.</string></var></struct><struct><var name="key"><string>mtab_lesson</string></var><var name="value"><string>Урок</string></var><var name="description"><string>Monitor Lesson details tab</string></var></struct><struct><var name="key"><string>mtab_seq</string></var><var name="value"><string>Последовательность</string></var><var name="description"><string>Monitor Sequence tab</string></var></struct><struct><var name="key"><string>mtab_learners</string></var><var name="value"><string>Ученики</string></var><var name="description"><string>Monitor Learners tab</string></var></struct><struct><var name="key"><string>ls_status_lbl</string></var><var name="value"><string>Статус:</string></var><var name="description"><string>Status label - Lesson details</string></var></struct><struct><var name="key"><string>ls_learners_lbl</string></var><var name="value"><string>Ученики:</string></var><var name="description"><string>Learner label - Lesson details</string></var></struct><struct><var name="key"><string>ls_class_lbl</string></var><var name="value"><string>Класс:</string></var><var name="description"><string>Class label - Lesson details</string></var></struct><struct><var name="key"><string>ls_manage_class_lbl</string></var><var name="value"><string>Класс:</string></var><var name="description"><string>Class managing label - Lesson details</string></var></struct><struct><var name="key"><string>ls_manage_editclass_btn</string></var><var name="value"><string>Редактировать класс</string></var><var name="description"><string>Edit class button - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_manage_apply_btn</string></var><var name="value"><string>Применить</string></var><var name="description"><string>Status Apply button - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_manage_schedule_btn</string></var><var name="value"><string>Расписание</string></var><var name="description"><string>Schedule start button - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_manage_start_btn</string></var><var name="value"><string>Стартовать сейчас</string></var><var name="description"><string>Start immediately button - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_manage_date_lbl</string></var><var name="value"><string>Дата</string></var><var name="description"><string>Date field title - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_manage_status_cmb</string></var><var name="value"><string>Выберите статус:</string></var><var name="description"><string>Status combo top  (index) item - Lesson details (manage section)</string></var></struct><struct><var name="key"><string>ls_status_cmb_activate</string></var><var name="value"><string>Активировать</string></var><var name="description"><string>Lesson status option - Activate</string></var></struct><struct><var name="key"><string>ls_status_cmb_disable</string></var><var name="value"><string>Деактивировать</string></var><var name="description"><string>Lesson status option - Disable (suspend)</string></var></struct><struct><var name="key"><string>ls_status_cmb_enable</string></var><var name="value"><string>Активно</string></var><var name="description"><string>Lesson status option - Enable (make active/unsuspend)</string></var></struct><struct><var name="key"><string>ls_status_cmb_archive</string></var><var name="value"><string>Архив</string></var><var name="description"><string>Lesson status option - Archive</string></var></struct><struct><var name="key"><string>ls_status_active_lbl</string></var><var name="value"><string>Создано, но еще запущен</string></var><var name="description"><string>Current status description if active (enabled)</string></var></struct><struct><var name="key"><string>ls_status_disabled_lbl</string></var><var name="value"><string>Неактивно</string></var><var name="description"><string>Current status description if suspended (disabled)</string></var></struct><struct><var name="key"><string>ls_status_archived_lbl</string></var><var name="value"><string>Архивный</string></var><var name="description"><string>Current status description if archvied</string></var></struct><struct><var name="key"><string>ls_status_started_lbl</string></var><var name="value"><string>Запущенный</string></var><var name="description"><string>Current status description if started (enabled)</string></var></struct><struct><var name="key"><string>ls_win_editclass_title</string></var><var name="value"><string>Редактировать класс</string></var><var name="description"><string>Edit class window title</string></var></struct><struct><var name="key"><string>ls_win_learners_title</string></var><var name="value"><string>Просмотр учеников</string></var><var name="description"><string>View learners window title</string></var></struct><struct><var name="key"><string>mnu_view</string></var><var name="value"><string>Вид</string></var><var name="description"><string>Menu bar View</string></var></struct><struct><var name="key"><string>ls_win_editclass_save_btn</string></var><var name="value"><string>Сохранить</string></var><var name="description"><string>Save button on Edit Class popup</string></var></struct><struct><var name="key"><string>ls_win_editclass_staff_lbl</string></var><var name="value"><string>Сотрудники</string></var><var name="description"><string>Heading for Staff list on Edit Class popup</string></var></struct><struct><var name="key"><string>ls_win_editclass_learners_lbl</string></var><var name="value"><string>Ученики</string></var><var name="description"><string>Heading for Learners list on the Edit Class popup</string></var></struct><struct><var name="key"><string>ls_win_learners_heading_lbl</string></var><var name="value"><string>Ученики в классе:</string></var><var name="description"><string>Heading on View Learners window panel.</string></var></struct><struct><var name="key"><string>sys_error_msg_finish</string></var><var name="value"><string>Чтобы продолжить работу, перезапустите, пожалуйста, Редактор заданий. Желаете ли Вы сохранить информацию о произошедщей ошибке, чтобы помочь решить ее в будущем?</string></var><var name="description"><string>Common System error message finish paragraph</string></var></struct><struct><var name="key"><string>ccm_monitor_activity</string></var><var name="value"><string>Открыть мониторинг задания</string></var><var name="description"><string>Label for Custom Context Monitor Activity</string></var></struct><struct><var name="key"><string>ccm_monitor_view_condition_mappings</string></var><var name="value"><string>Посмотреть соотвествия Ветвей Условиям</string></var><var name="description"><string>Label for Custom Context View Condition Mappings</string></var></struct><struct><var name="key"><string>ccm_monitor_view_group_mappings</string></var><var name="value"><string>Посмотреть соотвествия Ветвей Группам</string></var><var name="description"><string>Label for Custom Context View Group Mappings</string></var></struct><struct><var name="key"><string>title_sequencetab_endGate</string></var><var name="value"><string>Завершили:</string></var><var name="description"><string>Title for end gate bar shown at the bottom of monitor tab where user can drop a learner to force complete to the end of lesson</string></var></struct><struct><var name="key"><string>ls_seq_status_perm_gate</string></var><var name="value"><string>Разрешение учителя</string></var><var name="description"><string>A type of Gate Activity where progress depends on permission from a Teacher</string></var></struct><struct><var name="key"><string>ls_seq_status_synch_gate</string></var><var name="value"><string>Синхронизация</string></var><var name="description"><string>A type of Gate Activity where progress depends on all Learners in the Class or Group reaching the activity</string></var></struct><struct><var name="key"><string>al_doubleclick_todoactivity</string></var><var name="value"><string>Извините, но ученик {0} еще не достиг {1} задания</string></var><var name="description"><string>alert message when user double click on the todo activity in the sequence under learner tab</string></var></struct><struct><var name="key"><string>ls_remove_confirm_msg</string></var><var name="value"><string>Вы нажали Удалить этот урок. Удаленные уроки не могут быть восстановлены. Продолжить?</string></var><var name="description"><string>remove confirm msg</string></var></struct><struct><var name="key"><string>ls_remove_warning_msg</string></var><var name="value"><string>ВНИМАНИЕ: Урок будет удален. Желаете ли вы сохранить его?</string></var><var name="description"><string>Message for the alert dialog which appears following confirmation dialog for removing a lesson.</string></var></struct><struct><var name="key"><string>mv_search_index_view_btn_lbl</string></var><var name="value"><string>Индекс страниц</string></var><var name="description"><string>When the user clicks this button, they will be returning from the search view to the index view. It will once again allow them to view all the available pages, and navigate to them directly. This button is only visible when the user is in the search view.</string></var></struct><struct><var name="key"><string>ls_seq_status_moderation</string></var><var name="value"><string>Арбитраж</string></var><var name="description"><string>Displayed when we want the Teacher to moderate an activitiy (for example a chat room)</string></var></struct><struct><var name="key"><string>ls_seq_status_define_later</string></var><var name="value"><string>Определить позже</string></var><var name="description"><string>Of an Activity: when the content for the Activity must defined in the Lesson (via Monitoring) rather than by the Author</string></var></struct><struct><var name="key"><string>ls_seq_status_choose_grouping</string></var><var name="value"><string>Распределить по группам</string></var><var name="description"><string>Allows the Teacher to add the learners to chosen groups</string></var></struct><struct><var name="key"><string>ls_seq_status_contribution</string></var><var name="value"><string>Сделать</string></var><var name="description"><string>Any 'Contributions' to be made by a monitor, such as editing text for 'Define in Monitor' tasks, marking essay/reports, releasing stop points, etc.</string></var></struct><struct><var name="key"><string>ls_seq_status_teacher_branching</string></var><var name="value"><string>Основанное на решении учителя</string></var><var name="description"><string>A type of branching where the Teacher chooses which learners to add to each branch</string></var></struct><struct><var name="key"><string>ls_manage_schedule_btn_tooltip</string></var><var name="value"><string>Запланировать старт урока на заданное время</string></var><var name="description"><string>tool tip message for the schedule button in lesson tab under manage lesson section to shedule the lesson to start of selected date and time</string></var></struct><struct><var name="key"><string>current_act_tooltip</string></var><var name="value"><string>Дважды нажмите мышью, чтобы посмотреть текущее состояние задания у пользователя</string></var><var name="description"><string>tool tip message for current activity icon</string></var></struct><struct><var name="key"><string>completed_act_tooltip</string></var><var name="value"><string>Дважды нажмите мышью, чтобы посмотреть завершенные задания у пользователя</string></var><var name="description"><string>tool tip message for completed activity icon</string></var></struct><struct><var name="key"><string>al_validation_schtime</string></var><var name="value"><string>Введите, пожалуйста, правильное время.</string></var><var name="description"><string>Alert message when user enters an invalid time for schedule start</string></var></struct><struct><var name="key"><string>learner_viewJournals_btn</string></var><var name="value"><string>Записи</string></var><var name="description"><string>Label for Journal Entries button used on Learners tab to view all journal entires for the lesson.</string></var></struct><struct><var name="key"><string>learner_viewJournals_btn_tooltip</string></var><var name="value"><string>Просмотреть все записи, сделанные пользователем</string></var><var name="description"><string>tool tip message for Journal Entries button used on Learner tab to view all journal entires for the lesson.</string></var></struct><struct><var name="key"><string>class_exportPortfolio_btn_tooltip</string></var><var name="value"><string>Экспортировать и сохранить портфолио всего класса для дальнейщих обращений к нему</string></var><var name="description"><string>tool tip message for exportportfolio button next to refresh button to export class portfolio and save in on user computer</string></var></struct><struct><var name="key"><string>learner_exportPortfolio_btn_tooltip</string></var><var name="value"><string>Экспортировать и сохранить портфолио пользователя для дальнейщих обращений к нему</string></var><var name="description"><string>tool tip message for exportportfolio button for individual learner to export portfolio for the respective learner and save to it in on user computer for future reference</string></var></struct><struct><var name="key"><string>ls_manage_editclass_btn_tooltip</string></var><var name="value"><string>Редактировать список пользователей и сотрудников, прикрепленных к этому уроку.</string></var><var name="description"><string>tool tip message for the edit class button in lesson tab under manage lesson section</string></var></struct><struct><var name="key"><string>label.grouping.general.instructions.branching</string></var><var name="value"><string>Вы не можете добавлять или удалять группы в это групповое задание, так как оно используется в Разветвлении, а добавление или удаление новых групп повлечет за собой изменение настроек соотвествий ветвей группам. Вы можете только добавлять или удалять пользователей в уже существующие группы.</string></var><var name="description"><string>Third instructions paragraph on the chosen branching screen.</string></var></struct><struct><var name="key"><string>competence_title_lbl</string></var><var name="value"><string>Заголовок</string></var><var name="description"><string>Competence Title label in Mapped Competences dialog</string></var></struct><struct><var name="key"><string>competence_desc_lbl</string></var><var name="value"><string>Описание</string></var><var name="description"><string>Competence Description label in Mapped Competences dialog</string></var></struct><struct><var name="key"><string>ls_manage_presenceEnabled_lbl</string></var><var name="value"><string>Разрешить ученикам видеть кто находится онлайн</string></var><var name="description"><string>ls_manage_presenceEnabled_lbl</string></var></struct><struct><var name="key"><string>ls_confirm_presence_enabled</string></var><var name="value"><string>С данного момента ученики могут видеть кто находится онлайн</string></var><var name="description"><string>ls_confirm_presence_enabled</string></var></struct><struct><var name="key"><string>ls_confirm_presence_disabled</string></var><var name="value"><string>С данного момента ученики не могут видеть кто находится онлайн</string></var><var name="description"><string>ls_confirm_presence_disabled</string></var></struct><struct><var name="key"><string>ls_win_learners_heading_class_lbl</string></var><var name="value"><string>Класс</string></var><var name="description"><string>Heading on View Learners window panel (learners of the class).</string></var></struct><struct><var name="key"><string>ls_win_learners_heading_activity_lbl</string></var><var name="value"><string>Задание</string></var><var name="description"><string>Heading on View Learners window panel (learners at activity).</string></var></struct><struct><var name="key"><string>learner_plus_tooltip</string></var><var name="value"><string>{0} учеников. Щелкните два раза для просмотра полного списка.</string></var><var name="description"><string>Tooltip message displayed when mouse-over the cross icon, displayed when there is a large amount of users at an activity.</string></var></struct><struct><var name="key"><string>view_time_graph_btn</string></var><var name="value"><string>Просмотр временного графика</string></var><var name="description"><string>Button to display students progress against time in a graph in the learner tab</string></var></struct><struct><var name="key"><string>view_time_graph_btn_tooltip</string></var><var name="value"><string>Просмотреть график успеваемости выбранных студентов по времени, потраченном на каждое задание</string></var><var name="description"><string>Tooltip for View Time Graph button in learner tab</string></var></struct><struct><var name="key"><string>view_time_chart_btn</string></var><var name="value"><string>Просмотр временной диаграммы</string></var><var name="description"><string>Button to display students progress against time in a chart in the learner tab</string></var></struct><struct><var name="key"><string>view_time_chart_btn_tooltip</string></var><var name="value"><string>Просмотреть диаграмму успеваемости выбранных студентов по времени, потраченном на каждое задание</string></var><var name="description"><string>Tooltip for View Time Chart button in learner tab</string></var></struct><struct><var name="key"><string>ls_manage_start_lbl</string></var><var name="value"><string>Старт:</string></var><var name="description"><string>Start managing label - Lesson details</string></var></struct><struct><var name="key"><string>view_competences_dlg</string></var><var name="value"><string>Просмотреть знания</string></var><var name="description"><string>Allows you to view all the competences within a learning design</string></var></struct><struct><var name="key"><string>view_competences_in_ld_lbl</string></var><var name="value"><string>Знания в учебных шаблонах: {0}</string></var><var name="description"><string>Label for dialog that shows all the competences in a learning design with a name specified by the argument</string></var></struct><struct><var name="key"><string>view_act_mapped_competences</string></var><var name="value"><string>Просмотреть определенные знания</string></var><var name="description"><string>Allows you to view competences mapped to a particular activity</string></var></struct><struct><var name="key"><string>mapped_competences_lbl</string></var><var name="value"><string>Определенные знания</string></var><var name="description"><string>Title for the dialog that shows all competences mapped to an activity</string></var></struct><struct><var name="key"><string>al_activity_view_competence_mappings_invalid</string></var><var name="value"><string>Пожалуйста, убедитесь, что вы выбрали задание перед просмотром знаний.</string></var><var name="description"><string>Warning that appears when no activity is selected when the user tries to view competence mappings</string></var></struct><struct><var name="key"><string>order_learners_by_completion_lbl</string></var><var name="value"><string>Упорядочить по факту завершения</string></var><var name="description"><string>Label for checkbox in index bar in the learners tab to order learners based how far they've progressed through the lesson</string></var></struct><struct><var name="key"><string>learners_group_name</string></var><var name="value"><string>{0} ученики</string></var><var name="description"><string>Group name for the class's learners group.</string></var></struct></array></var></struct></data></wddxPacket>
\ No newline at end of file
+<wddxPacket version="1.0"><!-- CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu May 21 05:59:57 CST 2009 --><header/><data><struct><var name="messageKey"><string>getDictionary</string></var><var name="messageType"><number>3</number></var><var name="messageValue"><array length="200"><struct><var name="key"><string>al_no</string></var><var name="value"><string>Нет</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>staff_group_name</string></var><var name="value"><string>{0} сотрудников</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_win_editclass_cancel_btn</string></var><var name="value"><string>Отменить</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>check_avail_btn</string></var><var name="value"><string>Проверить доступность</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_sequence_live_edit_btn_tooltip</string></var><var name="value"><string>Редактировать проект этого урока</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_learnerURL_lbl</string></var><var name="value"><string>Ссылка для ученика:</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>continue_btn</string></var><var name="value"><string>Продолжить</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mv_search_not_found_msg</string></var><var name="value"><string>{0} не найдено.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mv_search_go_btn_lbl</string></var><var name="value"><string>Перейти к</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_win_learners_close_btn</string></var><var name="value"><string>Закрыть</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mv_search_current_page_lbl</string></var><var name="value"><string>Страница {0} из {1}</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_learners_btn_tooltip</string></var><var name="value"><string>Показать всех уччеников, крикрепленных к этому уроку</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_apply_btn_tooltip</string></var><var name="value"><string>Изменить статус урока, основываясь на выборе в выпадающем меню</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_seq_status_system_gate</string></var><var name="value"><string>Системный затвор</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_go_todo</string></var><var name="value"><string>Список заданий</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mtab_todo</string></var><var name="value"><string>Список заданий</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>td_desc_text</string></var><var name="value"><string>Использование Списка заданий необязательно для выполнения этой последовательности. Обратите в раздел помощь за соотвествующей информацией.&lt;br&gt;&lt;br&gt; Эта функция теперь доступна в полном объеме.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_error_forcecomplete_invalidactivity</string></var><var name="value"><string>Вы перетащили пользователя '{0}' на его текущее или уже выполненное задание '{1}'</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ccm_monitor_activityhelp</string></var><var name="value"><string>Помощь по мониторингу заданий</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_validation_schstart</string></var><var name="value"><string>Вы не выбрали дату. Выберите, пожалуйста, дату и время.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_confirm_forcecomplete_toactivity</string></var><var name="value"><string>Действительно ли вы желаете принудительно завершить задания у ученика '{0}'  вплоть до '{1}'?</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_seq_status_not_set</string></var><var name="value"><string>Еще не задан</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_sequence_live_edit_btn</string></var><var name="value"><string>Редактирование "на лету"</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>about_popup_license_lbl</string></var><var name="value"><string>Это программа является free software; Вы можете распространять и/или изменять ее при условиях соответствия GNU General Public License version 2 опубликованной Free Software Foundation. {0}</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>stream_reference_lbl</string></var><var name="value"><string>LAMS</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>gpl_license_url</string></var><var name="value"><string>www.gnu.org/licenses/gpl.txt 	</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>stream_url</string></var><var name="value"><string>http://{0}foundation.org</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_ok</string></var><var name="value"><string>ОК</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>close_mc_tooltip</string></var><var name="value"><string>Свернуть</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_tasks_txt</string></var><var name="value"><string>Обязательные задания</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_time_lbl</string></var><var name="value"><string>Время (Часы : Минуты)</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_continue_lbl</string></var><var name="value"><string>Здравствуйте, {1}, вы не закончили редактирование {0}.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_confirm_forcecomplete_tofinish</string></var><var name="value"><string>Действительно ли вы желаете принудительно завершить урок у ученика '{0}'?</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>competences_mapped_to_act_lbl</string></var><var name="value"><string>Знания определены к {0}</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_status_cmb_remove</string></var><var name="value"><string>Удалить</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_status_removed_lbl</string></var><var name="value"><string>Удаленный</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_yes</string></var><var name="value"><string>Да</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_continue_action_lbl</string></var><var name="value"><string>Нажмите {0}, чтобы продолжить. 	</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mv_search_default_txt</string></var><var name="value"><string>Введите поисковый запрос или номер страницы</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>branch_mapping_dlg_conditions_dgd_lbl</string></var><var name="value"><string>Соотвествия</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>lbl_num_sequences</string></var><var name="value"><string>{0} - Последовательностей</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_activity_openContent_invalid</string></var><var name="value"><string>Извините! Перед тем как нажать пункт меню Открыть/Редактировать Задание, Вы должны выбрать задание.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mv_search_error_msg</string></var><var name="value"><string>Введите, пожалуйста, поисковый запрос или номер страницы между 1 и {0}</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mv_search_invalid_input_msg</string></var><var name="value"><string>Номер страницы должен быть между 1 и {0}</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_seq_status_sched_gate</string></var><var name="value"><string>Затвор, работающий по времени</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>branch_mapping_dlg_branch_col_lbl</string></var><var name="value"><string>Разветвление</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>finish_learner_tooltip</string></var><var name="value"><string>Чтобы принудительно завершить урок у ученика, перетащите его иконку ну эту панель.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_help_help</string></var><var name="value"><string>Помощь по мониторингу</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_status_lbl</string></var><var name="value"><string>Изменить статус:</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_learners_btn</string></var><var name="value"><string>Просмотр учеников</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_learnerExpp_lbl</string></var><var name="value"><string>Разрешить ученикам экспортировать портфолио</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_confirm_expp_enabled</string></var><var name="value"><string>Экспорт портфолио разрешен для учеников</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_confirm_expp_disabled</string></var><var name="value"><string>Экспорт портфолио запрещен для учеников</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_duration_lbl</string></var><var name="value"><string>Ожидаемая продолжительность:</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>td_desc_heading</string></var><var name="value"><string>Расширенное управление</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>opt_activity_title</string></var><var name="value"><string>Опциональное задание</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>lbl_num_activities</string></var><var name="value"><string>{0} - Задания</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_of_text</string></var><var name="value"><string>из</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_txt</string></var><var name="value"><string>Управление уроком</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>td_goContribute_btn</string></var><var name="value"><string>Перейти к</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>learner_exportPortfolio_btn</string></var><var name="value"><string>Экспорт портфолио</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_send</string></var><var name="value"><string>Отправить</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_status_scheduled_lbl</string></var><var name="value"><string>Запланированое</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>goContribute_btn_tooltip</string></var><var name="value"><string>Завершить это задание сейчас</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>help_btn_tooltip</string></var><var name="value"><string>Помощь</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_start_btn_tooltip</string></var><var name="value"><string>Начать урок незамедлительно</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>msg_bubble_check_action_lbl</string></var><var name="value"><string>Проверка...</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>msg_bubble_failed_action_lbl</string></var><var name="value"><string>Недостуно, попробуйте еще раз.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_locked_msg_lbl</string></var><var name="value"><string>Извините, но {0} сейчас редактируется {1}.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_confirm_live_edit</string></var><var name="value"><string>Редактирование "на лету" будет открыто. Желаете продолжить?</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>about_popup_title_lbl</string></var><var name="value"><string>О программе - {0}</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>about_popup_version_lbl</string></var><var name="value"><string>Версия</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>about_popup_copyright_lbl</string></var><var name="value"><string>© 2002-2008 {0} Foundation.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>about_popup_trademark_lbl</string></var><var name="value"><string>{0} является торговой маркой {0} Foundation ( {1} ).</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>branch_mapping_dlg_condition_col_lbl</string></var><var name="value"><string>Условие</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_error_forcecomplete_to_different_seq</string></var><var name="value"><string>Вы не можете перетащить {0} на задание из другой ветви или последовательности.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_error_forcecomplete_notarget</string></var><var name="value"><string>Пожалуйста, перетащите пользователя '{0}' на задание либо конец урока.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_win_editclass_organisation_lbl</string></var><var name="value"><string>Организация</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_file_start</string></var><var name="value"><string>Старт</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_help</string></var><var name="value"><string>Помощь</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_help_abt</string></var><var name="value"><string>О программе</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>perm_act_lbl</string></var><var name="value"><string>Разрешение</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>sched_act_lbl</string></var><var name="value"><string>Расписание</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>synch_act_lbl</string></var><var name="value"><string>Синхронизированный</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ws_Root</string></var><var name="value"><string>Корень</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ws_dlg_cancel_button</string></var><var name="value"><string>Отменить</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ws_dlg_location_button</string></var><var name="value"><string>Расположение</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ws_tree_mywsp</string></var><var name="value"><string>Моя рабочая среда</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ws_tree_orgs</string></var><var name="value"><string>Организации</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>sys_error_msg_start</string></var><var name="value"><string>Произошла следующая системная ошибка:</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>sys_error</string></var><var name="value"><string>Системная ошибка</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_file_schedule</string></var><var name="value"><string>Расписание</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_file_exit</string></var><var name="value"><string>Выход</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_view_learners</string></var><var name="value"><string>Ученики...</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_go</string></var><var name="value"><string>Перейти к</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_go_lesson</string></var><var name="value"><string>Урок</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_go_schedule</string></var><var name="value"><string>Расписание</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_go_learners</string></var><var name="value"><string>Ученики</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>refresh_btn</string></var><var name="value"><string>Обновить</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>help_btn</string></var><var name="value"><string>Помощь</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>refresh_btn_tooltip</string></var><var name="value"><string>Обновить пользовательскую информацию.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_alert</string></var><var name="value"><string>Предупреждение</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_cancel</string></var><var name="value"><string>Отменить</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_confirm</string></var><var name="value"><string>Подтвердить</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>app_chk_langload</string></var><var name="value"><string>Языковые данные загружены неудачно</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>app_chk_themeload</string></var><var name="value"><string>Данные для темы загружены неудачно</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>app_fail_continue</string></var><var name="value"><string>Программа завершит работу. Пожалуйста, свяжитесь со службой поддержки.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>db_datasend_confirm</string></var><var name="value"><string>Спасибо за то, что послали данные на сервер</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_edit</string></var><var name="value"><string>Редактировать</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_edit_copy</string></var><var name="value"><string>Копировать</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_edit_cut</string></var><var name="value"><string>Вырезать</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_edit_paste</string></var><var name="value"><string>Вставить</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_file</string></var><var name="value"><string>Файл</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_file_refresh</string></var><var name="value"><string>Обновить</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_file_editclass</string></var><var name="value"><string>Редактировать класс</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>branch_mapping_dlg_group_col_lbl</string></var><var name="value"><string>Группа</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_go_sequence</string></var><var name="value"><string>Последовательность</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>cv_activity_helpURL_undefined</string></var><var name="value"><string>Нет справки для {0}</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>cv_design_unsaved_live_edit</string></var><var name="value"><string>Несохраненные изменения будут автоматически сохранены. Желаете ли вы продолжить вставку/слияние?</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mtab_lesson</string></var><var name="value"><string>Урок</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mtab_seq</string></var><var name="value"><string>Последовательность</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mtab_learners</string></var><var name="value"><string>Ученики</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_status_lbl</string></var><var name="value"><string>Статус:</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_learners_lbl</string></var><var name="value"><string>Ученики:</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_class_lbl</string></var><var name="value"><string>Класс:</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_class_lbl</string></var><var name="value"><string>Класс:</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_editclass_btn</string></var><var name="value"><string>Редактировать класс</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_apply_btn</string></var><var name="value"><string>Применить</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_schedule_btn</string></var><var name="value"><string>Расписание</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_start_btn</string></var><var name="value"><string>Стартовать сейчас</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_date_lbl</string></var><var name="value"><string>Дата</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_status_cmb</string></var><var name="value"><string>Выберите статус:</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_status_cmb_activate</string></var><var name="value"><string>Активировать</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_status_cmb_disable</string></var><var name="value"><string>Деактивировать</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_status_cmb_enable</string></var><var name="value"><string>Активно</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_status_cmb_archive</string></var><var name="value"><string>Архив</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_status_active_lbl</string></var><var name="value"><string>Создано, но еще запущен</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_status_disabled_lbl</string></var><var name="value"><string>Неактивно</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_status_archived_lbl</string></var><var name="value"><string>Архивный</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_status_started_lbl</string></var><var name="value"><string>Запущенный</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_win_editclass_title</string></var><var name="value"><string>Редактировать класс</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_win_learners_title</string></var><var name="value"><string>Просмотр учеников</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mnu_view</string></var><var name="value"><string>Вид</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_win_editclass_save_btn</string></var><var name="value"><string>Сохранить</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_win_editclass_staff_lbl</string></var><var name="value"><string>Сотрудники</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_win_editclass_learners_lbl</string></var><var name="value"><string>Ученики</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_win_learners_heading_lbl</string></var><var name="value"><string>Ученики в классе:</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>sys_error_msg_finish</string></var><var name="value"><string>Чтобы продолжить работу, перезапустите, пожалуйста, Редактор заданий. Желаете ли Вы сохранить информацию о произошедщей ошибке, чтобы помочь решить ее в будущем?</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ccm_monitor_activity</string></var><var name="value"><string>Открыть мониторинг задания</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ccm_monitor_view_condition_mappings</string></var><var name="value"><string>Посмотреть соотвествия Ветвей Условиям</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ccm_monitor_view_group_mappings</string></var><var name="value"><string>Посмотреть соотвествия Ветвей Группам</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>title_sequencetab_endGate</string></var><var name="value"><string>Завершили:</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_seq_status_perm_gate</string></var><var name="value"><string>Разрешение учителя</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_seq_status_synch_gate</string></var><var name="value"><string>Синхронизация</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_doubleclick_todoactivity</string></var><var name="value"><string>Извините, но ученик {0} еще не достиг {1} задания</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_remove_confirm_msg</string></var><var name="value"><string>Вы нажали Удалить этот урок. Удаленные уроки не могут быть восстановлены. Продолжить?</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_remove_warning_msg</string></var><var name="value"><string>ВНИМАНИЕ: Урок будет удален. Желаете ли вы сохранить его?</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mv_search_index_view_btn_lbl</string></var><var name="value"><string>Индекс страниц</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_seq_status_moderation</string></var><var name="value"><string>Арбитраж</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_seq_status_define_later</string></var><var name="value"><string>Определить позже</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_seq_status_choose_grouping</string></var><var name="value"><string>Распределить по группам</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_seq_status_contribution</string></var><var name="value"><string>Сделать</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_seq_status_teacher_branching</string></var><var name="value"><string>Основанное на решении учителя</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_schedule_btn_tooltip</string></var><var name="value"><string>Запланировать старт урока на заданное время</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>current_act_tooltip</string></var><var name="value"><string>Дважды нажмите мышью, чтобы посмотреть текущее состояние задания у пользователя</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>completed_act_tooltip</string></var><var name="value"><string>Дважды нажмите мышью, чтобы посмотреть завершенные задания у пользователя</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_validation_schtime</string></var><var name="value"><string>Введите, пожалуйста, правильное время.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>learner_viewJournals_btn</string></var><var name="value"><string>Записи</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>learner_viewJournals_btn_tooltip</string></var><var name="value"><string>Просмотреть все записи, сделанные пользователем</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>learner_exportPortfolio_btn_tooltip</string></var><var name="value"><string>Экспортировать и сохранить портфолио пользователя для дальнейщих обращений к нему</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_editclass_btn_tooltip</string></var><var name="value"><string>Редактировать список пользователей и сотрудников, прикрепленных к этому уроку.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>label.grouping.general.instructions.branching</string></var><var name="value"><string>Вы не можете добавлять или удалять группы в это групповое задание, так как оно используется в Разветвлении, а добавление или удаление новых групп повлечет за собой изменение настроек соотвествий ветвей группам. Вы можете только добавлять или удалять пользователей в уже существующие группы.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_activity_view_competence_mappings_invalid</string></var><var name="value"><string>Пожалуйста, убедитесь, что вы выбрали задание перед просмотром знаний.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>order_learners_by_completion_lbl</string></var><var name="value"><string>Упорядочить по факту завершения</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>learners_group_name</string></var><var name="value"><string>{0} ученики</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_start_lbl</string></var><var name="value"><string>Старт:</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>view_competences_dlg</string></var><var name="value"><string>Просмотреть знания</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>view_competences_in_ld_lbl</string></var><var name="value"><string>Знания в учебных шаблонах: {0}</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>view_act_mapped_competences</string></var><var name="value"><string>Просмотреть определенные знания</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>mapped_competences_lbl</string></var><var name="value"><string>Определенные знания</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>competence_title_lbl</string></var><var name="value"><string>Заголовок</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>competence_desc_lbl</string></var><var name="value"><string>Описание</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_presenceEnabled_lbl</string></var><var name="value"><string>Разрешить ученикам видеть кто находится онлайн</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_confirm_presence_enabled</string></var><var name="value"><string>С данного момента ученики могут видеть кто находится онлайн</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_confirm_presence_disabled</string></var><var name="value"><string>С данного момента ученики не могут видеть кто находится онлайн</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_win_learners_heading_class_lbl</string></var><var name="value"><string>Класс</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_win_learners_heading_activity_lbl</string></var><var name="value"><string>Задание</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>learner_plus_tooltip</string></var><var name="value"><string>{0} учеников. Щелкните два раза для просмотра полного списка.</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>view_time_graph_btn</string></var><var name="value"><string>Просмотр временного графика</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>view_time_graph_btn_tooltip</string></var><var name="value"><string>Просмотреть график успеваемости выбранных студентов по времени, потраченном на каждое задание</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>view_time_chart_btn</string></var><var name="value"><string>Просмотр временной диаграммы</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>view_time_chart_btn_tooltip</string></var><var name="value"><string>Просмотреть диаграмму успеваемости выбранных студентов по времени, потраченном на каждое задание</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>class_exportPortfolio_btn_tooltip</string></var><var name="value"><string>Экспортировать и сохранить портфолио всего класса для дальнейщих обращений к нему</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_confirm_forcecomplete_to_end_of_branching_seq</string></var><var name="value"><string>Вы желаете принудительно завершить эту разветвляющуюся последовательность у ученика '{0}'?</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>support_act_title</string></var><var name="value"><string>Вспомогательное задание</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>al_error_forcecomplete_support_act</string></var><var name="value"><string>Невозможно принудительно завершить вспомогательные задания у ученика</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>msg_no_learners_in_lesson</string></var><var name="value"><string>Один или более учеников должны быть отмечены</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_manage_presenceImEnabled_lbl</string></var><var name="value"><string>Разрешить обмен сообщениями</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_confirm_presence_im_enabled</string></var><var name="value"><string>Обмен сообщениями включен</string></var><var name="description"><string></string></var></struct><struct><var name="key"><string>ls_confirm_presence_im_disabled</string></var><var name="value"><string>Обмен сообщениями отключен</string></var><var name="description"><string></string></var></struct></array></var></struct></data></wddxPacket>
\ No newline at end of file
Index: lams_central/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/web.xml,v
diff -u -r1.43 -r1.44
--- lams_central/web/WEB-INF/web.xml	2 Jul 2009 08:19:15 -0000	1.43
+++ lams_central/web/WEB-INF/web.xml	3 Jul 2009 04:57:02 -0000	1.44
@@ -12,9 +12,9 @@
 	This refBeanContext.xml contains definition of the shared context. It is located by this entry:
 	<context-param>
    		<param-name>locatorFactorySelector</param-name>
-   		<param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+   		<param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 	</context-param>
-	telling to look for refBeanContext.xml files in selected parts of the classpath.
+	telling to look for refBeanContext.xml files in selected part of the classpath.
 	Currently LAMS has only one refBeanContext.xml with one shared context definition.
 	Lams_central uses only beans from the shared context "context.central". That is why there is no value
 	in contextConfigLocation.
@@ -24,13 +24,20 @@
 	If there are local (private for web application; see tools and admin for example) bean definitions,
 	path to application context XML file can still be added to contextConfigLocation.
  -->
+ <!--
+ 	contextClass parameter may be removed later in the development, as it does not solve Ant-style pattern problem
+ -->
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</param-value>
+</context-param> 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
 	<param-value></param-value>
 </context-param>
 <context-param>
    <param-name>locatorFactorySelector</param-name>
-   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
@@ -235,11 +242,6 @@
 
    </servlet>
    <servlet>
-      <servlet-name>PresenceChatLoggerServlet</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.webservice.PresenceChatLoggerServlet</servlet-class>
-
-   </servlet>
-   <servlet>
       <servlet-name>updateCollapsedGroup</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.UpdateCollapsedGroupServlet</servlet-class>
 
@@ -347,7 +349,6 @@
 
 <servlet>
 	<description>Instructions Download</description>
-	<display-name>Instructions Download</display-name>
 	<servlet-name>download</servlet-name>
 	<servlet-class>
 		org.lamsfoundation.lams.contentrepository.client.ToolDownload
@@ -361,15 +362,13 @@
 
 <servlet>
 	<servlet-name>AxisServlet</servlet-name>
-	<display-name>Apache-Axis Servlet</display-name>
 	<servlet-class>
 		org.apache.axis.transport.http.AxisServlet
 	</servlet-class>
 </servlet>
 
 <servlet>
 	<servlet-name>AdminServlet</servlet-name>
-	<display-name>Axis Admin Servlet</display-name>
 	<servlet-class>
 		org.apache.axis.transport.http.AdminServlet
 	</servlet-class>
@@ -378,23 +377,20 @@
 
 <servlet>
 	<servlet-name>LoginRequest</servlet-name>
-	<display-name>LoginRequest Servlet For Integration</display-name>
 	<servlet-class>
 		org.lamsfoundation.lams.web.LoginRequestServlet
 	</servlet-class>
 </servlet>
 
 <servlet>
 	<servlet-name>LearningDesignRepository</servlet-name>
-	<display-name>LearningDesignRepository Servlet</display-name>
 	<servlet-class>
 		org.lamsfoundation.lams.webservice.xml.LearningDesignRepositoryServlet
 	</servlet-class>
 </servlet>
 
 <servlet>
 	<servlet-name>LessonManager</servlet-name>
-	<display-name>LessonManager Servlet</display-name>
 	<servlet-class>
 		org.lamsfoundation.lams.webservice.xml.LessonManagerServlet
 	</servlet-class>
@@ -467,10 +463,6 @@
       <url-pattern>/fckeditor/editor/filemanager/upload/simpleuploader</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>PresenceChatLoggerServlet</servlet-name>
-      <url-pattern>/PresenceChatLogger</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
       <servlet-name>updateCollapsedGroup</servlet-name>
       <url-pattern>/servlet/updateCollapsedGroup</url-pattern>
    </servlet-mapping>
@@ -632,6 +624,7 @@
             <url-pattern>/admin.jsp</url-pattern>
             <url-pattern>/author.jsp</url-pattern>
             <url-pattern>/authoringConfirm.jsp</url-pattern>
+            <url-pattern>/community.jsp</url-pattern>
             <url-pattern>/editprofile.jsp</url-pattern>
             <url-pattern>/findUserLessons.jsp</url-pattern>
             <url-pattern>/findUserLessonsAutocomplete.jsp</url-pattern>
Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.35 -r1.36
--- lams_central/web/WEB-INF/struts/struts-config.xml	7 May 2009 06:15:06 -0000	1.35
+++ lams_central/web/WEB-INF/struts/struts-config.xml	3 Jul 2009 04:57:02 -0000	1.36
@@ -64,6 +64,7 @@
 	<form-property name="fax" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
 	<form-property name="localeId" type="java.lang.Integer" />
+	<form-property name="timeZone" type="java.lang.Short" />
 	<form-property name="enableFlash" type="java.lang.Boolean" />
 	<form-property name="lamsCommunityToken" type="java.lang.String" />
 	<form-property name="lamsCommunityUsername" type="java.lang.String" />
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/web/pedagogical_planner/defaultActivityForm.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.11 refers to a dead (removed) revision in file `lams_central/web/pedagogical_planner/sequenceChooser.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.9 refers to a dead (removed) revision in file `lams_central/web/pedagogical_planner/templateBase.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/Attic/GradebookUserActivity.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml	9 Apr 2009 05:05:39 -0000	1.1
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml	3 Jul 2009 04:57:01 -0000	1.2
@@ -67,6 +67,15 @@
             column="feedback"
             length="65535"
         />
+        
+        <property
+            name="markedInGradebook"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="marked_in_gradebook"
+            length="1"
+        />
 
         <!--
             To add non XDoclet property mappings, create a file named
Index: lams_flash/src/central/flex/CloudWizard/src/CloudWizard.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/CloudWizard/src/CloudWizard.mxml,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_flash/src/central/flex/CloudWizard/src/assets/styles/main.css
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/CloudWizard/src/assets/styles/main.css,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flex/CloudWizard/src/assets/styles/main.css	6 Apr 2009 00:33:57 -0000	1.2
+++ lams_flash/src/central/flex/CloudWizard/src/assets/styles/main.css	3 Jul 2009 04:57:49 -0000	1.3
@@ -2,6 +2,8 @@
 Application {
 	backgroundColor: #FFFFFF;
 	themeColor: #0087e5;
+	backgroundGradientAlphas: 1.0, 1.0;
+	backgroundGradientColors: #FFFFFF, #FFFFFF;
 }
 
 Alert {
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/events/WizardEvent.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/events/WizardEvent.as,v
diff -u -r1.2 -r1.3
Binary files differ
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml,v
diff -u -r1.3 -r1.4
Binary files differ
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/validators/LessonValidator.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/validators/LessonValidator.as,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml,v
diff -u -r1.3 -r1.4
Binary files differ
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Learners.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Learners.mxml,v
diff -u -r1.3 -r1.4
Binary files differ
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml,v
diff -u -r1.6 -r1.7
Binary files differ
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml,v
diff -u -r1.3 -r1.4
Binary files differ
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/vos/WorkspaceCollection.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/vos/WorkspaceCollection.as,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_flash/src/central/flex/TimeChart/src/assets/styles/main.css
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/TimeChart/src/assets/styles/main.css,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flex/TimeChart/src/assets/styles/main.css	6 Apr 2009 00:33:57 -0000	1.2
+++ lams_flash/src/central/flex/TimeChart/src/assets/styles/main.css	3 Jul 2009 04:57:49 -0000	1.3
@@ -2,6 +2,8 @@
 Application {
 	backgroundColor: #FFFFFF;
 	themeColor: #0087e5;
+	backgroundGradientAlphas: 1.0, 1.0;
+	backgroundGradientColors: #FFFFFF, #FFFFFF;
 }
 
 Alert {
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml,v
diff -u -r1.5 -r1.6
Binary files differ
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_functions.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_functions.as,v
diff -u -r1.3 -r1.4
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml,v
diff -u -r1.9 -r1.10
--- lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml	19 May 2009 04:32:31 -0000	1.9
+++ lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml	3 Jul 2009 04:57:49 -0000	1.10
@@ -8,6 +8,7 @@
 	preinitialize="onPreinitialize(event)">	
 	<mx:Script>
 		<![CDATA[
+			import mx.events.ResizeEvent;
 			import mx.core.UIComponent;
 			import org.lamsfoundation.lams.common.util.ScreenShotterEvent;
 			//includes
@@ -126,20 +127,20 @@
 					contentEditable = true;
 					userId = 1;
 					toolSessionId = 1;
-					toolContentId = 5;
+					toolContentId = 23;
 					allowUseVoice = true;
 					allowUseCamera = true;
 					allowComments = true;
 					allowRatings = true;
 					allowLearnerVideoVisibility = true;
-					red5ServerUrl = "rtmp://videos.lamsinternational.com/";
-					serverUrl = "http://172.20.100.8:8080/lams/";
+					red5ServerUrl = "rtmp://172.20.100.22/";
+					serverUrl = "http://localhost:8080/lams/";
 					mode = AUTHOR_MODE;
 				}
 			}
 			
 			// called from applicationComplete
-			private function onApplicationComplete(event:Event):void {
+			private function onApplicationComplete(event:Event):void {				
 				// show an overlay
 				LamsAjaxOverlayManager.showOverlay(UIComponent(Application.application));
 				
@@ -175,15 +176,16 @@
 				// if the mic is to be used, set that up
 				mic = VideoDisplayUtil.setupMic();
 				
-				if(!checkCamera() || !checkMic()) {
-					if((!allowUseCamera && !allowUseVoice) || (!cam && !mic)) {
+				checkCamera();
+				checkMic();
+				
+				if((!allowUseCamera && !allowUseVoice) || (!cam && !mic)) {
 						// remove recording button
 						removeChild(getChildByName("recordingBox"));
 						
 						// stretch the video list
 						videoList.setStyle("bottom", 10);
 						videoList.invalidateList();
-					}
 				}
 				
 				// if first time using video recorder, pop flash settings
@@ -400,6 +402,10 @@
 					// enable application
 					LamsAjaxOverlayManager.hideOverlay(UIComponent(Application.application));
 					
+					//make application fullscreen
+					this.percentHeight = 100;
+					this.percentWidth = 100;
+					
 					// call server and get recordings, update datagrid with results
 					getRecordingsFromServer(sortButtonGroup.sortBy, sortButtonGroup.sortDirection);	
 				}
@@ -429,7 +435,7 @@
 			} 
         	
         	// bw detection handler
-			public function onBWDone(infoObject:Object):void {
+			public function onBWDone(infoObject:Object=null):void {
 				// print its properties
     			trace(VideoDisplayUtil.printInfoObject(infoObject, "onBWDone"));
 			}
@@ -724,7 +730,7 @@
 				
 				viewCameraButton.enabled = true;
 				viewCameraButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.camera");
-				
+					
 				getDetailsPopUp = GetRecordingDetailsPopUp(PopUpManager.createPopUp(this, GetRecordingDetailsPopUp, true));
 				PopUpManager.centerPopUp(getDetailsPopUp);
 				getDetailsPopUp.init(dictionary);
@@ -742,7 +748,7 @@
 				// change the view camera button's label
 				viewCameraButton.label = dictionary.getLabel("videorecorder.stop.camera");
 				viewCameraButton.toolTip = dictionary.getLabel("videorecorder.tooltip.stop.camera");
-				
+					
 				// set panel status label
 				videoRecorderPanel.status = dictionary.getLabel("videorecorder.waiting");
 				
@@ -756,7 +762,7 @@
 			private function onStopCamera(event:VideoDisplayEvent):void{
 				// change the view camera button's label
 				viewCameraButton.label = dictionary.getLabel("videorecorder.view.camera");
-				viewCameraButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.camera");
+				viewCameraButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.camera");	
 				
 				// set panel status label
 				videoRecorderPanel.status = dictionary.getLabel("videorecorder.waiting");
@@ -839,15 +845,15 @@
 				}
 				
 				// if videoRecordings is defined
-				if(videoRecordings){
+				if(videoRecordings != null){
 					var length:int = videoRecordings.length();
 					// get children from videoList and enable/disable
 					for(var i:int = 0; i < length; i++){
 						
 						var videoProfile:VideoProfile = VideoProfile(videoList.indexToItemRenderer(i));
 						var deleteButton:Button = videoProfile.deleteButton;
 						
-						if(deleteButton){
+						if(deleteButton != null){
 							deleteButton.enabled = enabled;
 							
 							if(enabled)
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/HTTPServices.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorderFCKEditor/src/HTTPServices.as,v
diff -u -r1.2 -r1.3
Binary files differ
Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml,v
diff -u -r1.8 -r1.9
--- lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml	19 May 2009 04:32:32 -0000	1.8
+++ lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml	3 Jul 2009 04:57:49 -0000	1.9
@@ -82,10 +82,10 @@
 				
 				// for testing purposes (when running in debug)
 				if(mode == null){
-					red5ServerUrl = new String("rtmp://172.20.100.22/");
-					serverUrl = new String("http://172.20.100.220:8080/lams/");
+					red5ServerUrl = new String("rtmp://localhost/");
+					serverUrl = new String("http://localhost:8080/lams/");
 					mode = new String("recorderModeAuthor");
-					toolContentId = 24;
+					toolContentId = 1;
 				}
 			}
 			
@@ -187,11 +187,12 @@
 						// set up mic
 						mic = VideoDisplayUtil.setupMic();
 						
-						if(!checkCamera() && !checkMic()) {
-							// don't allow recording if neither cam nor mic is enabled
-							if(!mic && !cam){
-								videoControlBar.recordButton.enabled = false;
-							}
+						checkCamera()
+						checkMic();
+						
+						// don't allow recording if neither cam nor mic is enabled
+						if(!mic && !cam){
+							videoControlBar.recordButton.enabled = false;
 						}
 						
 						if(alertCount <= 0) createConnection();
@@ -218,13 +219,14 @@
 						// set up mic
 						mic = VideoDisplayUtil.setupMic();
 						
-						if(!checkCamera() && !checkMic()) {
-							// don't allow recording if neither cam nor mic is enabled
-							if(!mic && !cam){
-								videoControlBar.recordButton.enabled = false;
-							}
-						}
+						checkCamera()
+						checkMic();
 						
+						// don't allow recording if neither cam nor mic is enabled
+						if(!mic && !cam){
+							videoControlBar.recordButton.enabled = false;
+						}
+												
 						if(alertCount <= 0) createConnection();
 
 						break;
@@ -415,7 +417,8 @@
 					// if we are in a player online instance
 					if(mode == "playerModeOnline"){
 						// extension added from fck record
-						videoDisplay.makeReady(filename, "video", false);
+						if(mic && !cam) videoDisplay.makeReady(filename, "audio", false);
+						else  videoDisplay.makeReady(filename, "video", false);
 					}
 					// if we are in fck mode
 					else if(mode == "recorderModeFCK"){
@@ -433,7 +436,8 @@
 						}
 						
 						// change the start recording button's label
-						videoDisplay.makeReady(filename, "video", offlinePlayback);
+						if(mic && !cam) videoDisplay.makeReady(filename, "audio", offlinePlayback);
+						else videoDisplay.makeReady(filename, "video", offlinePlayback);
 						
 						// update tooltip
 						videoControlBar.recordButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.recording.again");
@@ -592,7 +596,8 @@
 					Alert.show(dictionary.getLabel("videorecorder.recording.complete.fck"));
 					
 					// play the movie from the Red5 server
-					videoDisplay.makeReady(filename, "video", offlinePlayback);
+					if(mic && !cam) videoDisplay.makeReady(filename, "audio", false);
+					else videoDisplay.makeReady(filename, "video", false);
 					
 					// change the panel status
 					videoDisplayPanel.status = dictionary.getLabel("videorecorder.ready");
Index: lams_flash/src/common/flex/com/visualempathy/display/controls/datetime/DateTimePicker.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/com/visualempathy/display/controls/datetime/DateTimePicker.mxml,v
diff -u -r1.1 -r1.2
Binary files differ
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_flash/src/common/flex/lib/mate.license.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_flash/src/common/flex/lib/mate_06_2.license.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/dictionary/XMLDictionary.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/org/lamsfoundation/lams/common/dictionary/XMLDictionary.as,v
diff -u -r1.4 -r1.5
Binary files differ
Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/dictionary/XMLDictionaryRegistry.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/org/lamsfoundation/lams/common/dictionary/XMLDictionaryRegistry.as,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml,v
diff -u -r1.7 -r1.8
--- lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml	7 May 2009 06:15:48 -0000	1.7
+++ lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml	3 Jul 2009 04:57:49 -0000	1.8
@@ -464,6 +464,11 @@
 						publishHelper(takeScreenshot);
 					}
 					else{
+						if(_mic && !_cam){
+							//change the view stack
+							selectedChild = audioView;
+						}
+						
 						// just start publishing
 						publishHelper(takeScreenshot);
 					}
Index: lams_flash/src/common/flex/pl/cfml/coldfusion/as3/utils/WDDX.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/pl/cfml/coldfusion/as3/utils/WDDX.as,v
diff -u -r1.1 -r1.2
Binary files differ
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_gradebook/conf/language/lams/ApplicationResources_es_ES.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_gradebook/conf/language/lams/ApplicationResources_ru_RU.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_gradebook/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/Attic/web.xml,v
diff -u -r1.3 -r1.4
--- lams_gradebook/web/WEB-INF/web.xml	2 Jul 2009 09:54:53 -0000	1.3
+++ lams_gradebook/web/WEB-INF/web.xml	3 Jul 2009 04:58:41 -0000	1.4
@@ -9,9 +9,18 @@
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.gradebook.ApplicationResources</param-value>
 </context-param>
+
 <context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</param-value>
+</context-param> 
+<context-param> 
+	<param-name>contextConfigLocation</param-name>
+	<param-value>classpath:/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml</param-value>
+</context-param>
+<context-param>
    <param-name>locatorFactorySelector</param-name>
-   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/web-settings.xml,v
diff -u -r1.22 -r1.23
--- lams_learning/conf/xdoclet/web-settings.xml	2 Jul 2009 13:03:15 -0000	1.22
+++ lams_learning/conf/xdoclet/web-settings.xml	3 Jul 2009 04:58:41 -0000	1.23
@@ -8,6 +8,10 @@
 	<param-value>learningMessageSource</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</param-value>
+</context-param> 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
 	<param-value></param-value>
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java,v
diff -u -r1.43 -r1.44
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	15 Jan 2009 07:54:29 -0000	1.43
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	3 Jul 2009 04:58:41 -0000	1.44
@@ -21,12 +21,11 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 package org.lamsfoundation.lams.learning.web.action;
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.List;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -38,7 +37,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceProxy;
-import org.lamsfoundation.lams.learning.web.bean.ActivityURL;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.learningdesign.Activity;
@@ -57,624 +55,646 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-
-/** 
+/**
  * 
- * <p>The action servlet that interacts with learner to start a lams learner
- * module, join a user to the lesson and allows a user to exit a lesson.</p>
+ * <p>
+ * The action servlet that interacts with learner to start a lams learner module, join a user to the lesson and allows a
+ * user to exit a lesson.
+ * </p>
  * 
- * <p>It is also responsible for the interaction between lams server and 
- * flash. Flash will call method implemented in this class to get progress
- * data or trigger a lams server calculation here</p>
+ * <p>
+ * It is also responsible for the interaction between lams server and flash. Flash will call method implemented in this
+ * class to get progress data or trigger a lams server calculation here
+ * </p>
  * 
- * <b>Note:</b>It needs to extend the <code>LamsDispatchAction</code> which has
- * been customized to accomodate struts features to solve duplicate 
- * submission problem.
+ * <b>Note:</b>It needs to extend the <code>LamsDispatchAction</code> which has been customized to accomodate struts
+ * features to solve duplicate submission problem.
  * 
  * @author Jacky Fang
  * @since 3/03/2005
  * @version 1.1
  * 
  * ----------------XDoclet Tags--------------------
  * 
- * @struts:action path="/learner" 
- *                parameter="method" 
- *                validate="false"
- * @struts:action-forward name="displayActivity" path="/DisplayActivity.do" 
- * @struts:action-forward name="displayProgress" path="/progress.jsp" 
- * ----------------XDoclet Tags--------------------
+ * @struts:action path="/learner" parameter="method" validate="false"
+ * @struts:action-forward name="displayActivity" path="/DisplayActivity.do"
+ * @struts:action-forward name="displayProgress" path="/progress.jsp" ----------------XDoclet Tags--------------------
  * 
  */
-public class LearnerAction extends LamsDispatchAction 
-{
-    //---------------------------------------------------------------------
+public class LearnerAction extends LamsDispatchAction {
+    // ---------------------------------------------------------------------
     // Instance variables
-    //---------------------------------------------------------------------
-	private static Logger log = Logger.getLogger(LearnerAction.class);
-	
-    //---------------------------------------------------------------------
+    // ---------------------------------------------------------------------
+    private static Logger log = Logger.getLogger(LearnerAction.class);
+
+    // ---------------------------------------------------------------------
     // Class level constants - Struts forward
-    //---------------------------------------------------------------------
- 	
-	private static IAuditService auditService;
-	
-	private ActionForward redirectToURL(ActionMapping mapping, HttpServletResponse response, String url) throws IOException, ServletException {
-		if ( url != null ) {
-			  String fullURL = WebUtil.convertToFullURL(url);
-			  response.sendRedirect(response.encodeRedirectURL(fullURL));
-		} else {
-			  throw new ServletException("Tried to redirect to url but url is null");
-		}
-		return null;
-	 }
+    // ---------------------------------------------------------------------
 
-	  /** Handle an exception - either thrown by the service or by the web layer. Allows the exception
-	 * to be logged properly and ensure that an actual message goes back to Flash.
-	 * 
-	 * @param e
-	 * @param methodKey
-	 * @param learnerService
-	 * @return
-	 */
-	protected FlashMessage handleException(Exception e, String methodKey, ICoreLearnerService learnerService) {
-		log.error("Exception thrown "+methodKey,e);
-		String[] msg = new String[1];
-		msg[0] = e.getMessage();
-		
-		getAuditService().log(LearnerAction.class.getName()+":"+methodKey, e.toString());		
-		
-		return new FlashMessage(methodKey,
-				learnerService.getMessageService().getMessage("error.system.learner", msg),
-				FlashMessage.CRITICAL_ERROR);
+    private static IAuditService auditService;
+
+    private ActionForward redirectToURL(ActionMapping mapping, HttpServletResponse response, String url)
+	    throws IOException, ServletException {
+	if (url != null) {
+	    String fullURL = WebUtil.convertToFullURL(url);
+	    response.sendRedirect(response.encodeRedirectURL(fullURL));
+	} else {
+	    throw new ServletException("Tried to redirect to url but url is null");
 	}
+	return null;
+    }
 
     /**
-     * <p>The structs dispatch action that joins a learner into a lesson. This 
-     * call is used for a user to start a lesson.</p>
+     * Handle an exception - either thrown by the service or by the web layer. Allows the exception to be logged
+     * properly and ensure that an actual message goes back to Flash.
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
+     * @param e
+     * @param methodKey
+     * @param learnerService
+     * @return
+     */
+    protected FlashMessage handleException(Exception e, String methodKey, ICoreLearnerService learnerService) {
+	LearnerAction.log.error("Exception thrown " + methodKey, e);
+	String[] msg = new String[1];
+	msg[0] = e.getMessage();
+
+	getAuditService().log(LearnerAction.class.getName() + ":" + methodKey, e.toString());
+
+	return new FlashMessage(methodKey, learnerService.getMessageService().getMessage("error.system.learner", msg),
+		FlashMessage.CRITICAL_ERROR);
+    }
+
+    /**
+     * <p>
+     * The structs dispatch action that joins a learner into a lesson. This call is used for a user to start a lesson.
+     * </p>
      * 
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
      * 
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
+     * 
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward joinLesson(ActionMapping mapping,
-                                    ActionForm form,
-                                    HttpServletRequest request,
-                                    HttpServletResponse response) throws IOException,
-                                                                          ServletException
-    {
-        //initialize service object
-        ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
-        Integer learner = null;
-    	try {
-	
-	        //get user and lesson based on request.
-	        learner = LearningWebUtil.getUserId();
-	        long lessonID = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-	
-	        
-	        if(log.isDebugEnabled())
-	            log.debug("The learner ["+learner+"] is joining the lesson ["+lessonID+"]");
-	
-	        //join user to the lesson on the server
-	        LearnerProgress learnerProgress = learnerService.joinLesson(learner,lessonID);
-	        
-	        if(log.isDebugEnabled())
-	            log.debug("The learner ["+learner+"] joined lesson. The"
-	                      +"progress data is:"+learnerProgress.toString());
-	        
-			LearningWebUtil.putLearnerProgressInRequest(request,learnerProgress);
-			
-			ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
-			String url = "learning/" +  activityMapping.getDisplayActivityAction(lessonID);
-			
-			redirectToURL(mapping, response, url);
-	
-    	} catch (Exception e ) {
-           log.error("An error occurred while learner "+learner+" attempting to join the lesson.",e);
-    		return mapping.findForward(ActivityMapping.ERROR);
-    	}
-    	
-        return null;
+    public ActionForward joinLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	// initialize service object
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+	Integer learner = null;
+	try {
+
+	    // get user and lesson based on request.
+	    learner = LearningWebUtil.getUserId();
+	    long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+
+	    if (LearnerAction.log.isDebugEnabled()) {
+		LearnerAction.log.debug("The learner [" + learner + "] is joining the lesson [" + lessonID + "]");
+	    }
+
+	    // join user to the lesson on the server
+	    LearnerProgress learnerProgress = learnerService.joinLesson(learner, lessonID);
+
+	    if (LearnerAction.log.isDebugEnabled()) {
+		LearnerAction.log.debug("The learner [" + learner + "] joined lesson. The" + "progress data is:"
+			+ learnerProgress.toString());
+	    }
+
+	    LearningWebUtil.putLearnerProgressInRequest(request, learnerProgress);
+
+	    ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet()
+		    .getServletContext());
+	    String url = "learning/" + activityMapping.getDisplayActivityAction(lessonID);
+
+	    redirectToURL(mapping, response, url);
+
+	} catch (Exception e) {
+	    LearnerAction.log
+		    .error("An error occurred while learner " + learner + " attempting to join the lesson.", e);
+	    return mapping.findForward(ActivityMapping.ERROR);
+	}
+
+	return null;
     }
-    
+
     /**
-     * <p>The structs dispatch action that joins a learner into a lesson. This
-     * call is used for a user to resume a lesson. </p>
+     * <p>
+     * The structs dispatch action that joins a learner into a lesson. This call is used for a user to resume a lesson.
+     * </p>
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
      * 
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * 
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward resumeLesson(ActionMapping mapping,
-                                    ActionForm form,
-                                    HttpServletRequest request,
-                                    HttpServletResponse response) throws IOException,
-                                                                          ServletException
-    {
-        //initialize service object
-        ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+    public ActionForward resumeLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	// initialize service object
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
 
-        FlashMessage message = null;
-    	try {
-	
-	        //get user and lesson based on request.
-	        Integer learner = LearningWebUtil.getUserId();
-	        long lessonID = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-	
-	        
-	        if(log.isDebugEnabled())
-	            log.debug("The learner ["+learner+"] is joining the lesson ["+lessonID+"]");
-	
-	        //join user to the lesson on the server
-	        LearnerProgress learnerProgress = learnerService.joinLesson(learner,lessonID);
-	        
-	        if(log.isDebugEnabled())
-	            log.debug("The learner ["+learner+"] joined lesson. The"
-	                      +"porgress data is:"+learnerProgress.toString());
-	        
-			LearningWebUtil.putLearnerProgressInRequest(request,learnerProgress);
-	
-	        //serialize a acknowledgement flash message with the path of display next
-	        //activity
-	        
-			ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
-			message = new FlashMessage("joinLesson", activityMapping.getDisplayActivityAction(null));
-	
-    	} catch (Exception e ) {
-    		message = handleException(e, "joinLesson", learnerService);
-    	}
-    	
-        String wddxPacket = WDDXProcessor.serialize(message);
-        if(log.isDebugEnabled())
-            log.debug("Sending Lesson joined acknowledge message to flash:"+wddxPacket);
-        
-        //we hand over the control to flash. 
-        response.getWriter().print(wddxPacket);
-        return null;
+	FlashMessage message = null;
+	try {
+
+	    // get user and lesson based on request.
+	    Integer learner = LearningWebUtil.getUserId();
+	    long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+
+	    if (LearnerAction.log.isDebugEnabled()) {
+		LearnerAction.log.debug("The learner [" + learner + "] is joining the lesson [" + lessonID + "]");
+	    }
+
+	    // join user to the lesson on the server
+	    LearnerProgress learnerProgress = learnerService.joinLesson(learner, lessonID);
+
+	    if (LearnerAction.log.isDebugEnabled()) {
+		LearnerAction.log.debug("The learner [" + learner + "] joined lesson. The" + "porgress data is:"
+			+ learnerProgress.toString());
+	    }
+
+	    LearningWebUtil.putLearnerProgressInRequest(request, learnerProgress);
+
+	    // serialize a acknowledgement flash message with the path of display next
+	    // activity
+
+	    ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet()
+		    .getServletContext());
+	    message = new FlashMessage("joinLesson", activityMapping.getDisplayActivityAction(null));
+
+	} catch (Exception e) {
+	    message = handleException(e, "joinLesson", learnerService);
+	}
+
+	String wddxPacket = WDDXProcessor.serialize(message);
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Sending Lesson joined acknowledge message to flash:" + wddxPacket);
+	}
+
+	// we hand over the control to flash.
+	response.getWriter().print(wddxPacket);
+	return null;
     }
 
     /**
-     * <p>Exit the current lesson that is running in the leaner window. It 
-     * expects lesson id passed as parameter from flash component.
+     * <p>
+     * Exit the current lesson that is running in the leaner window. It expects lesson id passed as parameter from flash
+     * component.
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
      * 
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * 
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward exitLesson(ActionMapping mapping,
-                                    ActionForm form,
-                                    HttpServletRequest request,
-                                    HttpServletResponse response) throws IOException,
-                                                                          ServletException
-    {
-        //initialize service object
-        ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+    public ActionForward exitLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	// initialize service object
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
 
-        FlashMessage message = null;
-    	try {
-    		// get user and lesson based on request.
-	        Integer learner = LearningWebUtil.getUserId();
-    		Long lessonID = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-    		
-	        if(log.isDebugEnabled())
-	            log.debug("Exiting lesson, lesson id is: "+lessonID);
-	        
-	        learnerService.exitLesson(learner, lessonID);
-	        
-	        //send acknowledgment to flash as it is triggered by flash
-	        message = new FlashMessage("exitLesson", true);
+	FlashMessage message = null;
+	try {
+	    // get user and lesson based on request.
+	    Integer learner = LearningWebUtil.getUserId();
+	    Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 
-    	} catch (Exception e ) {
-    		message = handleException(e, "exitLesson", learnerService);
-    	}
-    	
-        String wddxPacket = WDDXProcessor.serialize(message);
-        if(log.isDebugEnabled())
-            log.debug("Sending Exit Lesson acknowledge message to flash:"+wddxPacket);
-        response.getWriter().print(wddxPacket);
-        return null;
+	    if (LearnerAction.log.isDebugEnabled()) {
+		LearnerAction.log.debug("Exiting lesson, lesson id is: " + lessonID);
+	    }
+
+	    learnerService.exitLesson(learner, lessonID);
+
+	    // send acknowledgment to flash as it is triggered by flash
+	    message = new FlashMessage("exitLesson", true);
+
+	} catch (Exception e) {
+	    message = handleException(e, "exitLesson", learnerService);
+	}
+
+	String wddxPacket = WDDXProcessor.serialize(message);
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Sending Exit Lesson acknowledge message to flash:" + wddxPacket);
+	}
+	response.getWriter().print(wddxPacket);
+	return null;
     }
-    
+
     /**
-     * Gets the basic lesson details (name, descripton, etc) for a lesson. Contains a LessonDTO.
-     * Takes a single parameter lessonID
+     * Gets the basic lesson details (name, descripton, etc) for a lesson. Contains a LessonDTO. Takes a single
+     * parameter lessonID
      */
-    public ActionForward getLesson(ActionMapping mapping,
-                                    ActionForm form,
-                                    HttpServletRequest request,
-                                    HttpServletResponse response) throws IOException,
-                                                                          ServletException
-    {
+    public ActionForward getLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
 
-        //initialize service object
-        ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+	// initialize service object
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
 
-        FlashMessage message = null;
-    	try {
+	FlashMessage message = null;
+	try {
 
-    		Long lessonID = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
+	    Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 
-            if(log.isDebugEnabled())
-                log.debug("get lesson..."+lessonID);
+	    if (LearnerAction.log.isDebugEnabled()) {
+		LearnerAction.log.debug("get lesson..." + lessonID);
+	    }
 
-            LessonDTO dto = learnerService.getLessonData(lessonID);
-	        
-	        //send acknowledgment to flash as it is triggerred by flash
-	        message = new FlashMessage("getLesson",dto);
+	    LessonDTO dto = learnerService.getLessonData(lessonID);
 
-    	} catch (Exception e ) {
-    		message = handleException(e, "getLesson", learnerService);
-    	}
-    	
-        String wddxPacket = WDDXProcessor.serialize(message);
-        if(log.isDebugEnabled())
-            log.debug("Sending getLesson data message to flash:"+wddxPacket);
-        response.getWriter().print(wddxPacket);
-        return null;
+	    // send acknowledgment to flash as it is triggerred by flash
+	    message = new FlashMessage("getLesson", dto);
+
+	} catch (Exception e) {
+	    message = handleException(e, "getLesson", learnerService);
+	}
+
+	String wddxPacket = WDDXProcessor.serialize(message);
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Sending getLesson data message to flash:" + wddxPacket);
+	}
+	response.getWriter().print(wddxPacket);
+	return null;
     }
-    
+
     /**
-     * <p>The struts dispatch action to retrieve the progress data from the 
-     * server and tailor it into the object struture that expected by flash.
-     * A wddx packet with object data struture is sent back in the end of this 
-     * call. It is used to construct or restore the flash learner progress
-     * bar</p>
+     * <p>
+     * The struts dispatch action to retrieve the progress data from the server and tailor it into the object struture
+     * that expected by flash. A wddx packet with object data struture is sent back in the end of this call. It is used
+     * to construct or restore the flash learner progress bar
+     * </p>
      * 
-     * <p>Gets the most recent copy from the database - not the cached version.
-     * That way if the cached version has problems, at least we start off right!
+     * <p>
+     * Gets the most recent copy from the database - not the cached version. That way if the cached version has
+     * problems, at least we start off right!
      * </p>
      * 
-     * <p>As this process is expensive, the server is only expecting this call
-     * whenever is necessary. For example, starting, resuming and restoring
-     * a new lesson. And it should not happen every time that learner is
-     * progressing to next activity.</p>
+     * <p>
+     * As this process is expensive, the server is only expecting this call whenever is necessary. For example,
+     * starting, resuming and restoring a new lesson. And it should not happen every time that learner is progressing to
+     * next activity.
+     * </p>
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
      * 
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward getFlashProgressData(ActionMapping mapping,
-                                              ActionForm form,
-                                              HttpServletRequest request,
-                                              HttpServletResponse response) throws IOException,
-                                                                          ServletException
-    {
-        if(log.isDebugEnabled())
-            log.debug("Getting Flash progress data...");
-        
-        FlashMessage message = null;
-    	try {
-	
-	        //SessionBean sessionBean = LearningWebUtil.getSessionBean(request,getServlet().getServletContext());
-    		
-	        Integer learnerId = LearningWebUtil.getUserId();
-	        ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
-	        
-		    Long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID );
-		    LearnerProgressDTO learnerProgress = learnerService.getProgressDTOByLessonId(lessonId, learnerId);
-	        
-	        message = new FlashMessage("getFlashProgressData",learnerProgress);
+    public ActionForward getFlashProgressData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Getting Flash progress data...");
+	}
 
-    	} catch (Exception e ) {
-    		message = handleException(e, "getFlashProgressData", LearnerServiceProxy.getLearnerService(getServlet().getServletContext()));
-    	}
-    	
-        String wddxPacket = WDDXProcessor.serialize(message);
-        if(log.isDebugEnabled())
-            log.debug("Sending learner progress data to flash:"+wddxPacket);
-        response.getWriter().print(wddxPacket);
+	FlashMessage message = null;
+	try {
 
-        //don't need to return a action forward because it sent the wddx packet
-        //back already.
-        return null;
+	    // SessionBean sessionBean = LearningWebUtil.getSessionBean(request,getServlet().getServletContext());
+
+	    Integer learnerId = LearningWebUtil.getUserId();
+	    ICoreLearnerService learnerService = LearnerServiceProxy
+		    .getLearnerService(getServlet().getServletContext());
+
+	    Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+	    LearnerProgressDTO learnerProgress = learnerService.getProgressDTOByLessonId(lessonId, learnerId);
+
+	    message = new FlashMessage("getFlashProgressData", learnerProgress);
+
+	} catch (Exception e) {
+	    message = handleException(e, "getFlashProgressData", LearnerServiceProxy.getLearnerService(getServlet()
+		    .getServletContext()));
+	}
+
+	String wddxPacket = WDDXProcessor.serialize(message);
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Sending learner progress data to flash:" + wddxPacket);
+	}
+	response.getWriter().print(wddxPacket);
+
+	// don't need to return a action forward because it sent the wddx packet
+	// back already.
+	return null;
     }
-   
+
     /**
-     * <p>The struts dispatch action to view the activity. This will be called 
-     * by flash progress bar to check up the activity component. The lams side 
-     * will calculate the url and send a flash message back to the 
-     * flash component.</p>
+     * <p>
+     * The struts dispatch action to view the activity. This will be called by flash progress bar to check up the
+     * activity component. The lams side will calculate the url and send a flash message back to the flash component.
+     * </p>
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
      * 
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward getLearnerActivityURL(ActionMapping mapping,
-                                               ActionForm form,
-                                               HttpServletRequest request,
-                                               HttpServletResponse response) throws IOException,
-                                                                          	ServletException
-    {
-        if(log.isDebugEnabled())
-            log.debug("Getting url for learner activity...");
+    public ActionForward getLearnerActivityURL(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Getting url for learner activity...");
+	}
 
-        FlashMessage message = null;
-    	try {
+	FlashMessage message = null;
+	try {
 
-    		// get the activity id and calculate the url for this activity.
-	        long activityId = WebUtil.readLongParam(request,AttributeNames.PARAM_ACTIVITY_ID);
-	        String url = getLearnerActivityURL(request, activityId); 
-	        
-	        //send data back to flash.
-	        ProgressActivityDTO activityDTO = new ProgressActivityDTO(new Long(activityId),url);
-	        message = new FlashMessage("getLearnerActivityURL",activityDTO);
+	    // get the activity id and calculate the url for this activity.
+	    long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
+	    String url = getLearnerActivityURL(request, activityId);
 
-    	} catch (Exception e ) {
-    		message = handleException(e, "getLearnerActivityURL", LearnerServiceProxy.getLearnerService(getServlet().getServletContext()));
-    	}
-    	
-        String wddxPacket = WDDXProcessor.serialize(message);
-        if(log.isDebugEnabled())
-            log.debug("Sending learner activity url data to flash:"+wddxPacket);
-        
-        response.getWriter().print(wddxPacket);
-        return null;
+	    // send data back to flash.
+	    ProgressActivityDTO activityDTO = new ProgressActivityDTO(new Long(activityId), url);
+	    message = new FlashMessage("getLearnerActivityURL", activityDTO);
+
+	} catch (Exception e) {
+	    message = handleException(e, "getLearnerActivityURL", LearnerServiceProxy.getLearnerService(getServlet()
+		    .getServletContext()));
+	}
+
+	String wddxPacket = WDDXProcessor.serialize(message);
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Sending learner activity url data to flash:" + wddxPacket);
+	}
+
+	response.getWriter().print(wddxPacket);
+	return null;
     }
 
-	/**
-	 * @param request
-	 * @param activityId
-	 * @return
-	 */
-	private String getLearnerActivityURL(HttpServletRequest request, long activityId) {
-		//initialize service object
-		ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
-		ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+    /**
+     * @param request
+     * @param activityId
+     * @return
+     */
+    private String getLearnerActivityURL(HttpServletRequest request, long activityId) {
+	// initialize service object
+	ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
 
-		//getting requested object according to coming parameters
-		Integer learnerId = LearningWebUtil.getUserId();
-		User learner = (User)LearnerServiceProxy.getUserManagementService(getServlet().getServletContext()).findById(User.class,learnerId);
+	// getting requested object according to coming parameters
+	Integer learnerId = LearningWebUtil.getUserId();
+	User learner = (User) LearnerServiceProxy.getUserManagementService(getServlet().getServletContext()).findById(
+		User.class, learnerId);
 
-		Activity requestedActivity = learnerService.getActivity(new Long(activityId));
-		Lesson lesson = learnerService.getLessonByActivity(requestedActivity);
-		String url = activityMapping.calculateActivityURLForProgressView(lesson,learner,requestedActivity);
-		return url;
-	}
-    
+	Activity requestedActivity = learnerService.getActivity(new Long(activityId));
+	Lesson lesson = learnerService.getLessonByActivity(requestedActivity);
+	String url = activityMapping.calculateActivityURLForProgressView(lesson, learner, requestedActivity);
+	return url;
+    }
+
     /**
-     * Gets the same url as getLearnerActivityURL() but forwards directly to the url, rather than 
-     * returning the url in a Flash packet.
+     * Gets the same url as getLearnerActivityURL() but forwards directly to the url, rather than returning the url in a
+     * Flash packet.
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward displayProgress(ActionMapping mapping,
-                                               ActionForm form,
-                                               HttpServletRequest request,
-                                               HttpServletResponse response) throws IOException,
-                                                                          	ServletException
-    {
-		Integer learnerId = LearningWebUtil.getUserId();
-	    Long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID );
-	    
-        ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
-        Object[] ret = learnerService.getStructuredActivityURLs(learnerId, lessonId);;
-        request.setAttribute("progressList", (List<ActivityURL>)ret[0]);
-        request.setAttribute("currentActivityID", ret[1]);
-        
-        return mapping.findForward("displayProgress");
+    public ActionForward displayProgress(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	Integer learnerId = LearningWebUtil.getUserId();
+	Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+	Object[] ret = learnerService.getStructuredActivityURLs(learnerId, lessonId);
+	;
+	request.setAttribute("progressList", ret[0]);
+	request.setAttribute("currentActivityID", ret[1]);
+
+	return mapping.findForward("displayProgress");
     }
-	
+
     /**
      * Forces a move to a destination Activity in the learning sequence, returning a WDDX packet
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward forceMove(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                                 ServletException {
-    	FlashMessage flashMessage = null;
-		ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
-		ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
-    	Long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-    	
-    	try {
-    		String url;
-    		Activity targetActivity = forceMoveShared(request, learnerService, lessonId);
-    		
-    		if(!targetActivity.isFloating()) url = activityMapping.getDisplayActivityAction(null);
-    		else url = activityMapping.getActivityURL(targetActivity);
-    		
-    		//TODO: update for moving to Floating Activity in Flash Learner
-    		flashMessage = new FlashMessage("forceMove", activityMapping.getDisplayActivityAction(null));
-        } catch (Exception e) {
-        	flashMessage = handleException(e, "forceMove", learnerService);
-        }
+    public ActionForward forceMove(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	FlashMessage flashMessage = null;
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+	ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
+	Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 
-        PrintWriter writer = response.getWriter();
-        writer.println(flashMessage.serializeMessage());
-        return null;
-    	
+	try {
+	    String url;
+	    Activity targetActivity = forceMoveShared(request, learnerService, lessonId);
+
+	    if (!targetActivity.isFloating()) {
+		url = activityMapping.getDisplayActivityAction(null);
+	    } else {
+		url = activityMapping.getActivityURL(targetActivity);
+	    }
+
+	    // TODO: update for moving to Floating Activity in Flash Learner
+	    flashMessage = new FlashMessage("forceMove", activityMapping.getDisplayActivityAction(null));
+	} catch (Exception e) {
+	    flashMessage = handleException(e, "forceMove", learnerService);
+	}
+
+	PrintWriter writer = response.getWriter();
+	writer.println(flashMessage.serializeMessage());
+	return null;
+
     }
 
     /**
-     * Forces a move to a destination Activity in the learning sequence, redirecting to the new
-     * page rather than returning a WDDX packet.
+     * Forces a move to a destination Activity in the learning sequence, redirecting to the new page rather than
+     * returning a WDDX packet.
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward forceMoveRedirect(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                                 ServletException {
-		ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
-		ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
-    	Long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-    	
-    	try {
-    		String url;
-    		Activity targetActivity = forceMoveShared(request, learnerService,lessonId); 
-    		
-    		if(!targetActivity.isFloating()) url = "/learning" + activityMapping.getDisplayActivityAction(lessonId);
-    		else url = activityMapping.getActivityURL(targetActivity);
-    		
-    		return redirectToURL(mapping, response, url);
-        } catch (Exception e) {
-        	log.error("Exception throw doing force move",e);
-        	throw new ServletException(e);
-        }
+    public ActionForward forceMoveRedirect(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
+	ActivityMapping activityMapping = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
+	Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+
+	try {
+	    String url;
+	    Activity targetActivity = forceMoveShared(request, learnerService, lessonId);
+
+	    if (!targetActivity.isFloating()) {
+		url = "/learning" + activityMapping.getDisplayActivityAction(lessonId);
+	    } else {
+		url = activityMapping.getActivityURL(targetActivity);
+	    }
+
+	    return redirectToURL(mapping, response, url);
+	} catch (Exception e) {
+	    LearnerAction.log.error("Exception throw doing force move", e);
+	    throw new ServletException(e);
+	}
     }
 
     /**
-	 * @param request
-	 * @return targetActivity 	The activity we are moving to. 
-	 */
-	private Activity forceMoveShared(HttpServletRequest request, ICoreLearnerService learnerService, Long lessonId) {
+     * @param request
+     * @return targetActivity The activity we are moving to.
+     */
+    private Activity forceMoveShared(HttpServletRequest request, ICoreLearnerService learnerService, Long lessonId) {
 
-		//getting requested object according to coming parameters
-		Integer learnerId = LearningWebUtil.getUserId();
+	// getting requested object according to coming parameters
+	Integer learnerId = LearningWebUtil.getUserId();
 
-		//get parameters
-    	Long fromActivityId = null;
-    	Long toActivityId = null;
-    	
-    	String fromActId = request.getParameter(AttributeNames.PARAM_CURRENT_ACTIVITY_ID);
-    	String toActId = request.getParameter(AttributeNames.PARAM_DEST_ACTIVITY_ID);
-    	if(fromActId != null)
-    		try{
-    			fromActivityId = new Long(Long.parseLong(fromActId));
-    		}catch(Exception e){
-    			fromActivityId = null;
-    		}
-    	
-    	if(toActId != null)
-        	try{
-        		toActivityId = new Long(Long.parseLong(toActId));
-        	}catch(Exception e){
-        		toActivityId = null;
-        	}
-    		
-        
-    	Activity fromActivity = null;
-    	Activity toActivity = null;
-    	
-    	if(fromActivityId != null)
-    		fromActivity = learnerService.getActivity(fromActivityId);
-    	
-    	if(toActivityId != null)
-    		toActivity = learnerService.getActivity(toActivityId);
-    	
-    	learnerService.moveToActivity(learnerId, lessonId, fromActivity, toActivity);
-    	
-		if ( log.isDebugEnabled() ) {
-			log.debug("Force move for learner "+learnerId+" lesson "+lessonId+". ");
-		}
-		
-		return toActivity;
+	// get parameters
+	Long fromActivityId = null;
+	Long toActivityId = null;
+
+	String fromActId = request.getParameter(AttributeNames.PARAM_CURRENT_ACTIVITY_ID);
+	String toActId = request.getParameter(AttributeNames.PARAM_DEST_ACTIVITY_ID);
+	if (fromActId != null) {
+	    try {
+		fromActivityId = new Long(Long.parseLong(fromActId));
+	    } catch (Exception e) {
+		fromActivityId = null;
+	    }
 	}
-    
-	/**
-	 * Get AuditService bean.
-	 * @return
-	 */
-	private IAuditService getAuditService(){
-		if(auditService==null){
-			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-			auditService = (IAuditService) ctx.getBean("auditService");
-		}
-		return auditService;
+
+	if (toActId != null) {
+	    try {
+		toActivityId = new Long(Long.parseLong(toActId));
+	    } catch (Exception e) {
+		toActivityId = null;
+	    }
 	}
-	
+
+	Activity fromActivity = null;
+	Activity toActivity = null;
+
+	if (fromActivityId != null) {
+	    fromActivity = learnerService.getActivity(fromActivityId);
+	}
+
+	if (toActivityId != null) {
+	    toActivity = learnerService.getActivity(toActivityId);
+	}
+
+	learnerService.moveToActivity(learnerId, lessonId, fromActivity, toActivity);
+
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Force move for learner " + learnerId + " lesson " + lessonId + ". ");
+	}
+
+	return toActivity;
+    }
+
     /**
-     * Gets the same url as getLearnerActivityURL() but forwards directly to the url, rather than 
-     * returning the url in a Flash packet.
+     * Get AuditService bean.
      * 
-     * @param mapping An ActionMapping class that will be used by the Action class to tell
-     * the ActionServlet where to send the end-user.
-     * @param form The ActionForm class that will contain any data submitted
-     * by the end-user via a form.
-     * @param request A standard Servlet HttpServletRequest class.
-     * @param response A standard Servlet HttpServletResponse class.
-     * @return An ActionForward class that will be returned to the ActionServlet indicating where
-     *         the user is to go next.
+     * @return
+     */
+    private IAuditService getAuditService() {
+	if (LearnerAction.auditService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
+		    .getServletContext());
+	    LearnerAction.auditService = (IAuditService) ctx.getBean("auditService");
+	}
+	return LearnerAction.auditService;
+    }
+
+    /**
+     * Gets the same url as getLearnerActivityURL() but forwards directly to the url, rather than returning the url in a
+     * Flash packet.
+     * 
+     * @param mapping
+     *                An ActionMapping class that will be used by the Action class to tell the ActionServlet where to
+     *                send the end-user.
+     * @param form
+     *                The ActionForm class that will contain any data submitted by the end-user via a form.
+     * @param request
+     *                A standard Servlet HttpServletRequest class.
+     * @param response
+     *                A standard Servlet HttpServletResponse class.
+     * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go
+     *         next.
      * @throws IOException
      * @throws ServletException
      */
-    public ActionForward forwardToLearnerActivityURL(ActionMapping mapping,
-                                               ActionForm form,
-                                               HttpServletRequest request,
-                                               HttpServletResponse response) throws IOException,
-                                                                          	ServletException
-    {
-        long activityId = WebUtil.readLongParam(request,AttributeNames.PARAM_ACTIVITY_ID);
-        if(log.isDebugEnabled())
-            log.debug("Forwarding to the url for learner activity..."+activityId);
-        
-        String url = getLearnerActivityURL(request, activityId);
-       	return redirectToURL(mapping, response, url);
+    public ActionForward forwardToLearnerActivityURL(ActionMapping mapping, ActionForm form,
+	    HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+	long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
+	if (LearnerAction.log.isDebugEnabled()) {
+	    LearnerAction.log.debug("Forwarding to the url for learner activity..." + activityId);
+	}
+
+	String url = getLearnerActivityURL(request, activityId);
+	return redirectToURL(mapping, response, url);
     }
 
-    
 }
\ No newline at end of file
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/web.xml,v
diff -u -r1.37 -r1.38
--- lams_learning/web/WEB-INF/web.xml	17 Apr 2009 07:06:08 -0000	1.37
+++ lams_learning/web/WEB-INF/web.xml	3 Jul 2009 04:58:41 -0000	1.38
@@ -11,13 +11,17 @@
 	<param-value>learningMessageSource</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</param-value>
+</context-param> 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
 	<param-value></param-value>
 </context-param>
 <context-param>
    <param-name>locatorFactorySelector</param-name>
-   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Index: lams_monitoring/web/TimeChart.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/TimeChart.swf,v
diff -u -r1.6 -r1.7
Binary files differ
Index: lams_monitoring/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/Attic/web.xml,v
diff -u -r1.32 -r1.33
--- lams_monitoring/web/WEB-INF/web.xml	2 Jul 2009 08:19:11 -0000	1.32
+++ lams_monitoring/web/WEB-INF/web.xml	3 Jul 2009 04:58:41 -0000	1.33
@@ -11,13 +11,17 @@
 	<param-value>monitoringMessageSource</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</param-value>
+</context-param> 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
 	<param-value></param-value>
 </context-param>
 <context-param>
    <param-name>locatorFactorySelector</param-name>
-   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20080929_updateFrom21.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20081118_updateFrom22.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/.classpath,v
diff -u -r1.6 -r1.7
--- lams_tool_notebook/.classpath	3 Jul 2009 01:17:30 -0000	1.6
+++ lams_tool_notebook/.classpath	3 Jul 2009 05:02:24 -0000	1.7
@@ -26,4 +26,4 @@
 	<classpathentry kind="var" path="JBOSS_HOME/lib/jboss-logging-spi.jar"/>
 	<classpathentry kind="var" path="JBOSS_HOME/lib/javassist.jar"/>
 	<classpathentry kind="output" path="build/classes/java"/>
-</classpath>
+<classpathentry kind="var" path="JBOSS_HOME/common/lib/log4j.jar"/></classpath>
Fisheye: Tag 1.11 refers to a dead (removed) revision in file `lams_www/web/news.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_www/web/images/about.logo.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_www/web/images/Attic/about.logo.swf,v
diff -u
Binary files differ
Index: lams_www/web/images/dolly.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_www/web/images/Attic/dolly.swf,v
diff -u
Binary files differ
Index: lams_www/web/images/preloader.logo.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_www/web/images/Attic/preloader.logo.swf,v
diff -u
Binary files differ