Index: lams_tool_laqa/.classpath =================================================================== diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/.classpath (.../.classpath) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf) +++ lams_tool_laqa/.classpath (.../.classpath) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -4,6 +4,7 @@ - + + Index: lams_tool_laqa/JUnit/junit-3.7/lib/junit-3.7.jar =================================================================== diff -u Binary files differ Index: lams_tool_laqa/build.properties =================================================================== diff -u -rf1e14548cbdc97c2000d1f697271b093018575f3 -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/build.properties (.../build.properties) (revision f1e14548cbdc97c2000d1f697271b093018575f3) +++ lams_tool_laqa/build.properties (.../build.properties) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -2,7 +2,7 @@ #name of this project name=lams_tool_questionAnswer -product=lams-tool-laqa11 +product=lams-tool-questionAnswer # Directory where third party jars reside. sharedlib=../lams_build/lib @@ -20,7 +20,9 @@ #web application properties sessiontimeout=120 -signature=laqa11 +#signature=laqa11 +signature=questionAnswer + # the URL used to access LAMS toolContext=/lams/tool/laqa11 Index: lams_tool_laqa/build.xml =================================================================== diff -u -rf1e14548cbdc97c2000d1f697271b093018575f3 -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/build.xml (.../build.xml) (revision f1e14548cbdc97c2000d1f697271b093018575f3) +++ lams_tool_laqa/build.xml (.../build.xml) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -292,6 +292,22 @@ + + + + + + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/Activity.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/Activity.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/Activity.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,262 @@ + + + + + + + + @hibernate.class table="lams_learning_activity" + true + + + @hibernate.id generator-class="identity" type="java.lang.Long" column="activity_id" + + + + + + + + @hibernate.property column="activity_ui_id" length="11" + + + + @hibernate.property column="description" length="65535" + + + + @hibernate.property column="title" length="255" + + + + @hibernate.property column="help_text" length="65535" + + + + @hibernate.property column="xcoord" length="11" + + + + @hibernate.property column="ycoord" length="11" + + + + @hibernate.property column="order_id" length="11" + + + + @hibernate.property column="define_later_flag" length="4" not-null="true" + + + + @hibernate.property column="create_date_time" length="19" not-null="true" + + + + @hibernate.property column="offline_instructions" length="65535" + + + + @hibernate.property column="online_instructions" length="65535" + + + + + @hibernate.property column="run_offline_flag" length="4" not-null="true" + + + + @hibernate.property column="parent_ui_id" length="11" + + + @hibernate.property column="grouping_ui_id" length="11" + + + + @hibernate.property column="learning_activity_type_id" length="11" + + + + @hibernate.property column="activity_category_id" length="11" + + + + @hibernate.property column="library_activity_ui_image" length="255" + + + + + + + + + + + + + @hibernate.column name="learning_library_id" + + + + + + + + @hibernate.column name="parent_activity_id" + + + + + + + @hibernate.column name="libraryActivity" + + + + + + + @hibernate.column name="learning_design_id" + + + + + + + @hibernate.column name="grouping_id" + + + + + + + @hibernate.class + public abstract + + + @hibernate.class + + + + + @hibernate.set lazy="false" inverse="true" cascade="none" + @hibernate.collection-key column="tool_session_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.ToolSession" + + + + + + + + + + + + + @hibernate.class + + + @hibernate.property column="create_grouping_ui_id" length="11" + + + + + + + + + + @hibernate.class + + + + + + + + + @hibernate.class + + + @hibernate.property column="gate_start_time_offset" length="20" + true + + + + @hibernate.property column="gate_end_time_offset" length="20" + true + + + + @hibernate.property column="gate_start_date_time" length="19" + true + + + + @hibernate.property column="gate_end_date_time" length="19" + true + + + + + @hibernate.class + + + @hibernate.class + + + + + + @hibernate.class + public abstract + + + + @hibernate.set lazy="false" inverse="true" cascade="none" + @hibernate.collection-key column="parent_activity_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.Activity" + + + + + + + @hibernate.class + + + @hibernate.property column="max_number_of_options" length="5" + true + + + + @hibernate.property column="min_number_of_options" length="5" + true + + + + @hibernate.property column="options_instructions" length="65535" + + + + + @hibernate.class + + + @hibernate.class + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/AuthenticationMethod.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/AuthenticationMethod.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/AuthenticationMethod.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,101 @@ + + + + + + + + + @hibernate.class + table="lams_authentication_method" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="authentication_method_id" + + + + true + + + + + + @hibernate.property + column="authentication_method_name" + unique="true" + length="64" + not-null="true" + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="authentication_method_type_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="authentication_method_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.User" + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/AuthenticationMethodType.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/AuthenticationMethodType.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/AuthenticationMethodType.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,86 @@ + + + + + + + + + @hibernate.class + table="lams_authentication_method_type" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="authentication_method_type_id" + + + + true + + + + + + @hibernate.property + column="description" + length="64" + not-null="true" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="authentication_method_type_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.AuthenticationMethod" + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/Group.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/Group.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/Group.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,117 @@ + + + + + + + + + @hibernate.class + table="lams_group" + + true + + + + @hibernate.id + generator-class="identity" + type="java.lang.Long" + column="group_id" + + + + + + + + + @hibernate.property + column="order_id" + length="6" + not-null="true" + + + + + + + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="group_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.tool.ToolSession" + + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="grouping_id" + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/Grouping.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/Grouping.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/Grouping.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + @hibernate.property column="grouping_ui_id" length="11" + + + + + + + + + + + @hibernate.set lazy="true" inverse="true" cascade="none" + @hibernate.collection-key column="grouping_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.Group" + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/LearnerProgress.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/LearnerProgress.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/LearnerProgress.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/LearningDesign.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/LearningDesign.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/LearningDesign.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,217 @@ + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + @hibernate.property + column="valid_design_flag" + length="4" + not-null="true" + + + + + + + + + + + + + + + + + + + + @hibernate.property + column="version" + length="56" + + + + + @hibernate.property column ="duration" + + + @hibernate.property column ="license_text" + + + + @hibernate.property column ="lesson_org_id" + + + @hibernate.property column ="lesson_org_name" + + + @hibernate.property column ="lesson_id" + + + @hibernate.property column ="lesson_name" + + + @hibernate.property column ="lesson_start_date_time" + + + @hibernate.property column ="last_modified_date_time" + + + + + + + @hibernate.column name="license_id" + + + + + + + @hibernate.column name="first_activity_id" + + + + + + + + @hibernate.column name="parent_learning_design_id" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/LearningLibrary.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/LearningLibrary.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/LearningLibrary.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,80 @@ + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/Lesson.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/Lesson.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/Lesson.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,106 @@ + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT DISTINCT {lesson.*} + FROM lams_lesson {lesson}, + lams_grouping, + lams_group, + lams_user_group + WHERE ({lesson}.class_grouping_id = lams_grouping.grouping_id) + AND (lams_grouping.grouping_id = lams_group.grouping_id) + AND (lams_group.group_id = lams_user_group.group_id) + AND ({lesson}.lesson_state_id IN (3,4,5)) + AND (lams_user_group.user_id = :userId) + + + + + SELECT DISTINCT {learner.*} + FROM lams_user {learner}, + lams_learner_progress + WHERE ({learner}.user_id = lams_learner_progress.user_id) + AND (lams_learner_progress.lesson_id = :lessonId) + + Index: lams_tool_laqa/conf/hibernate/mappings/License.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/License.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/License.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,21 @@ + + + + + + + + true + + + + + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/Organisation.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/Organisation.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/Organisation.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,226 @@ + + + + + + + + + @hibernate.class + table="lams_organisation" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="organisation_id" + + + + true + + + + + + @hibernate.property + column="name" + length="250" + + + + + @hibernate.property + column="description" + length="250" + + + + + @hibernate.property + column="create_date" + length="19" + not-null="true" + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="workspace_id" + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="organisation_type_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="all-delete-orphan" + + @hibernate.collection-key + column="organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisation" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="parent_organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Organisation" + + + + + + + + + + @hibernate.many-to-one + @hibernate.column name="parent_organisation_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="base_organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.User" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.lesson.Lesson" + + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/OrganisationType.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/OrganisationType.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/OrganisationType.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,103 @@ + + + + + + + + + @hibernate.class + table="lams_organisation_type" + proxy="org.lamsfoundation.lams.usermanagement.OrganisationType" + + true + + + + @hibernate.id + generator-class="increment" + type="java.lang.Integer" + column="organisation_type_id" + + + + true + + + + + + @hibernate.property + column="name" + unique="true" + length="64" + not-null="true" + + + + + @hibernate.property + column="description" + length="255" + not-null="true" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="organisation_type_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Organisation" + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/Role.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/Role.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/Role.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,98 @@ + + + + + + + + + @hibernate.class + table="lams_role" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="role_id" + + + + + + + + true + + @hibernate.property + column="name" + length="64" + not-null="true" + + + + + @hibernate.property + column="description" + length="65535" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="delete-orphan" + + @hibernate.collection-key + column="role_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisationRole" + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/Tool.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/Tool.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/Tool.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,334 @@ + + + + + + + + + @hibernate.class + table="lams_tool" + + true + + + + @hibernate.id + generator-class="identity" + type="java.lang.Long" + column="tool_id" + + + + + + + + + @hibernate.property + column="learner_url" + length="65535" + not-null="true" + + + + + @hibernate.property + column="grouping_support_type_id" + length="3" + not-null="true" + + + + + @hibernate.property + column="author_url" + length="65535" + + + + + @hibernate.property + column="supports_define_later_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="supports_moderation_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="supports_run_offline_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="supports_contribute_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="valid_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="define_later_url" + length="65535" + + + + + @hibernate.property + column="default_tool_content_id" + length="20" + not-null="false" + + + + + @hibernate.property + column="tool_signature" + length="64" + not-null="true" + + + + + @hibernate.property + column="tool_display_name" + length="255" + not-null="true" + + + + + @hibernate.property + column="description" + length="65535" + + + + + + @hibernate.property column="create_date_time" + length="19" not-null="true" + + + + + + @hibernate.property + column="class_name" + length="65535" + not-null="true" + + + + + @hibernate.property + column="export_portfolio_url" + length="65535" + not-null="true" + + + + + + @hibernate.property + column="monitor_url" + length="65535" + not-null="true" + + + + + + @hibernate.property + column="moderation_url" + length="65535" + not-null="true" + + + + + + @hibernate.property + column="contribute_url" + length="65535" + not-null="true" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="tool_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.learningdesign.Activity" + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/ToolContent.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/ToolContent.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/ToolContent.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,76 @@ + + + + + + + + + @hibernate.class + table="lams_tool_content" + + true + + + + @hibernate.id + generator-class="identity" + type="java.lang.Long" + column="tool_content_id" + + + + + + + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="tool_content_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.learningdesign.Activity" + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/ToolSession.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/ToolSession.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/ToolSession.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,75 @@ + + + + + + + + + @hibernate.class table="lams_tool_session" + + true + + + + @hibernate.id generator-class="identity" + type="java.lang.Long" column="tool_session_id" + + + + + + + + + + + + + + + + + + + @hibernate.property column="create_date_time" + length="19" not-null="true" + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/Transition.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/Transition.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/Transition.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,122 @@ + + + + + + + + + @hibernate.class + table="lams_learning_transition" + + true + + + + @hibernate.id + generator-class="identity" + type="java.lang.Long" + column="transition_id" + + + + + + + + @hibernate.property column="transition_ui_id" length="11" + + + @hibernate.property column="to_ui_id" length="11" + + + @hibernate.property column="from_ui_id" length="11" + + + + + @hibernate.property + column="description" + length="65535" + + + + + @hibernate.property + column="title" + length="255" + + + + + @hibernate.property + column="create_date_time" + length="19" + not-null="true" + + + + + + + + @hibernate.many-to-one unique="true" + @hibernate.column name="to_activity_id" + + + + + + + @hibernate.many-to-one unique="true" + @hibernate.column name="from_activity_id" + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="learning_design_id" + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/User.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/User.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/User.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,399 @@ + + + + + + + + + @hibernate.class + table="lams_user" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="user_id" + + + + + + + + true + + @hibernate.property + column="login" + unique="true" + length="20" + not-null="true" + + + + + @hibernate.property + column="password" + length="50" + not-null="true" + + + + + @hibernate.property + column="title" + length="32" + + + + + @hibernate.property + column="first_name" + length="64" + + + + + @hibernate.property + column="last_name" + length="128" + + + + + @hibernate.property + column="address_line_1" + length="64" + + + + + @hibernate.property + column="address_line_2" + length="64" + + + + + @hibernate.property + column="address_line_3" + length="64" + + + + + @hibernate.property + column="city" + length="64" + + + + + @hibernate.property + column="state" + length="64" + + + + + @hibernate.property + column="country" + length="64" + + + + + @hibernate.property + column="day_phone" + length="64" + + + + + @hibernate.property + column="evening_phone" + length="64" + + + + + @hibernate.property + column="mobile_phone" + length="64" + + + + + @hibernate.property + column="fax" + length="64" + + + + + @hibernate.property + column="email" + length="128" + + + + + @hibernate.property + column="disabled_flag" + length="1" + not-null="true" + + + + + @hibernate.property + column="create_date" + length="19" + not-null="true" + + + + + + + + + @hibernate.many-to-one + @hibernate.column name="workspace_id" + + + + + + + @hibernate.set + lazy="false" + inverse="true" + cascade="all-delete-orphan" + + @hibernate.collection-key + column="user_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisation" + + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="authentication_method_id" + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="base_organisation_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="user_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.lesson.LearnerProgress" + + + + + + + + + + + @hibernate.set lazy="true" inverse="true" cascade="none" + @hibernate.collection-key column="user_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="user_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.lesson.Lesson" + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/UserOrganisation.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/UserOrganisation.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/UserOrganisation.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,99 @@ + + + + + + + + + @hibernate.class + table="lams_user_organisation" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="user_organisation_id" + + + + + + + + + + + + true + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="user_id" + + + + + + + @hibernate.set + lazy="false" + inverse="true" + cascade="all-delete-orphan" + + @hibernate.collection-key + column="user_organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisationRole" + + + + + + + + + true + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="organisation_id" + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/UserOrganisationRole.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/UserOrganisationRole.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/UserOrganisationRole.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,73 @@ + + + + + + + + + @hibernate.class + table="lams_user_organisation_role" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="user_organisation_role_id" + + + + + + + + + + + + true + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="user_organisation_id" + + + + + + true + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="role_id" + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/Workspace.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/Workspace.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/Workspace.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,115 @@ + + + + + + + + + @hibernate.class + table="lams_workspace" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="workspace_id" + + + + true + + + + + @hibernate.property column="name" length="65535" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="workspace_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.User" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="workspace_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Organisation" + + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="root_folder_id" + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/WorkspaceFolder.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/WorkspaceFolder.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/WorkspaceFolder.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,166 @@ + + + + + + + + + @hibernate.class + table="lams_workspace_folder" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="workspace_folder_id" + + + + + + + + + @hibernate.property + column="name" + length="64" + not-null="true" + + + + + @hibernate.property column="user_id" length="11" + + + @hibernate.property column="lams_workspace_folder_type_id" length="11" + + + @hibernate.property column="create_date_time" length="19" not-null="true" + + + @hibernate.property column="last_modified_date_time" length="19" not-null="true" + + + + + @hibernate.property + column="workspace_id" + length="11" + not-null="true" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="root_folder_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Workspace" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="parent_folder_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.WorkspaceFolder" + + + + + + + + + + @hibernate.many-to-one + @hibernate.column name="parent_folder_id" + + + + + + + @hibernate.set lazy="false" inverse="true" cascade="none" + @hibernate.collection-key column="user_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign" + + + + + + + + + + + + + Index: lams_tool_laqa/conf/hibernate/mappings/WorkspaceFolderContent.hbm.xml =================================================================== diff -u --- lams_tool_laqa/conf/hibernate/mappings/WorkspaceFolderContent.hbm.xml (revision 0) +++ lams_tool_laqa/conf/hibernate/mappings/WorkspaceFolderContent.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,59 @@ + + + + + + true + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql =================================================================== diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf) +++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -1,3 +1,10 @@ +DROP TABLE IF EXISTS lams.tl_laqa11_usr_resp; +DROP TABLE IF EXISTS lams.tl_laqa11_que_usr; +DROP TABLE IF EXISTS lams.tl_laqa11_que_content; +DROP TABLE IF EXISTS lams.tl_laqa11_session; +DROP TABLE IF EXISTS lams.tl_laqa11_content; + + CREATE TABLE lams.tl_laqa11_content ( qa_content_id BIGINT(20) NOT NULL , title VARCHAR(100) DEFAULT 'Questions and Answers' @@ -70,3 +77,17 @@ REFERENCES lams.tl_laqa11_que_usr (que_usr_id) )TYPE=InnoDB; + + +-- test data for content table +INSERT INTO tl_laqa11_content (qa_content_id, + creation_date + ) +VALUES (${default_content_id}, + NOW()); + + + + + + Index: lams_tool_laqa/db/sql/insert_tool_qa_data.sql =================================================================== diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/db/sql/insert_tool_qa_data.sql (.../insert_tool_qa_data.sql) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf) +++ lams_tool_laqa/db/sql/insert_tool_qa_data.sql (.../insert_tool_qa_data.sql) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -13,7 +13,7 @@ INSERT INTO tl_laqa11_que_content (qa_que_content_id, question, display_order, - qa_content_id) VALUES (20,'What is the capital of Uruguay?',1,10); + qa_content_id) VALUES (20,'What is the name of this activity?',1,10); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Activity.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Activity.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Activity.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,262 @@ + + + + + + + + @hibernate.class table="lams_learning_activity" + true + + + @hibernate.id generator-class="identity" type="java.lang.Long" column="activity_id" + + + + + + + + @hibernate.property column="activity_ui_id" length="11" + + + + @hibernate.property column="description" length="65535" + + + + @hibernate.property column="title" length="255" + + + + @hibernate.property column="help_text" length="65535" + + + + @hibernate.property column="xcoord" length="11" + + + + @hibernate.property column="ycoord" length="11" + + + + @hibernate.property column="order_id" length="11" + + + + @hibernate.property column="define_later_flag" length="4" not-null="true" + + + + @hibernate.property column="create_date_time" length="19" not-null="true" + + + + @hibernate.property column="offline_instructions" length="65535" + + + + @hibernate.property column="online_instructions" length="65535" + + + + + @hibernate.property column="run_offline_flag" length="4" not-null="true" + + + + @hibernate.property column="parent_ui_id" length="11" + + + @hibernate.property column="grouping_ui_id" length="11" + + + + @hibernate.property column="learning_activity_type_id" length="11" + + + + @hibernate.property column="activity_category_id" length="11" + + + + @hibernate.property column="library_activity_ui_image" length="255" + + + + + + + + + + + + + @hibernate.column name="learning_library_id" + + + + + + + + @hibernate.column name="parent_activity_id" + + + + + + + @hibernate.column name="libraryActivity" + + + + + + + @hibernate.column name="learning_design_id" + + + + + + + @hibernate.column name="grouping_id" + + + + + + + @hibernate.class + public abstract + + + @hibernate.class + + + + + @hibernate.set lazy="false" inverse="true" cascade="none" + @hibernate.collection-key column="tool_session_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.ToolSession" + + + + + + + + + + + + + @hibernate.class + + + @hibernate.property column="create_grouping_ui_id" length="11" + + + + + + + + + + @hibernate.class + + + + + + + + + @hibernate.class + + + @hibernate.property column="gate_start_time_offset" length="20" + true + + + + @hibernate.property column="gate_end_time_offset" length="20" + true + + + + @hibernate.property column="gate_start_date_time" length="19" + true + + + + @hibernate.property column="gate_end_date_time" length="19" + true + + + + + @hibernate.class + + + @hibernate.class + + + + + + @hibernate.class + public abstract + + + + @hibernate.set lazy="false" inverse="true" cascade="none" + @hibernate.collection-key column="parent_activity_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.Activity" + + + + + + + @hibernate.class + + + @hibernate.property column="max_number_of_options" length="5" + true + + + + @hibernate.property column="min_number_of_options" length="5" + true + + + + @hibernate.property column="options_instructions" length="65535" + + + + + @hibernate.class + + + @hibernate.class + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/AuthenticationMethod.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/AuthenticationMethod.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/AuthenticationMethod.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,101 @@ + + + + + + + + + @hibernate.class + table="lams_authentication_method" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="authentication_method_id" + + + + true + + + + + + @hibernate.property + column="authentication_method_name" + unique="true" + length="64" + not-null="true" + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="authentication_method_type_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="authentication_method_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.User" + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/AuthenticationMethodType.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/AuthenticationMethodType.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/AuthenticationMethodType.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,86 @@ + + + + + + + + + @hibernate.class + table="lams_authentication_method_type" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="authentication_method_type_id" + + + + true + + + + + + @hibernate.property + column="description" + length="64" + not-null="true" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="authentication_method_type_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.AuthenticationMethod" + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Group.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Group.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Group.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,117 @@ + + + + + + + + + @hibernate.class + table="lams_group" + + true + + + + @hibernate.id + generator-class="identity" + type="java.lang.Long" + column="group_id" + + + + + + + + + @hibernate.property + column="order_id" + length="6" + not-null="true" + + + + + + + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="group_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.tool.ToolSession" + + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="grouping_id" + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Grouping.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Grouping.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Grouping.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + @hibernate.property column="grouping_ui_id" length="11" + + + + + + + + + + + @hibernate.set lazy="true" inverse="true" cascade="none" + @hibernate.collection-key column="grouping_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.Group" + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/LearnerProgress.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/LearnerProgress.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/LearnerProgress.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/LearningDesign.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/LearningDesign.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/LearningDesign.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,217 @@ + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + @hibernate.property + column="valid_design_flag" + length="4" + not-null="true" + + + + + + + + + + + + + + + + + + + + @hibernate.property + column="version" + length="56" + + + + + @hibernate.property column ="duration" + + + @hibernate.property column ="license_text" + + + + @hibernate.property column ="lesson_org_id" + + + @hibernate.property column ="lesson_org_name" + + + @hibernate.property column ="lesson_id" + + + @hibernate.property column ="lesson_name" + + + @hibernate.property column ="lesson_start_date_time" + + + @hibernate.property column ="last_modified_date_time" + + + + + + + @hibernate.column name="license_id" + + + + + + + @hibernate.column name="first_activity_id" + + + + + + + + @hibernate.column name="parent_learning_design_id" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/LearningLibrary.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/LearningLibrary.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/LearningLibrary.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,80 @@ + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Lesson.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Lesson.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Lesson.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,106 @@ + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT DISTINCT {lesson.*} + FROM lams_lesson {lesson}, + lams_grouping, + lams_group, + lams_user_group + WHERE ({lesson}.class_grouping_id = lams_grouping.grouping_id) + AND (lams_grouping.grouping_id = lams_group.grouping_id) + AND (lams_group.group_id = lams_user_group.group_id) + AND ({lesson}.lesson_state_id IN (3,4,5)) + AND (lams_user_group.user_id = :userId) + + + + + SELECT DISTINCT {learner.*} + FROM lams_user {learner}, + lams_learner_progress + WHERE ({learner}.user_id = lams_learner_progress.user_id) + AND (lams_learner_progress.lesson_id = :lessonId) + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/License.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/License.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/License.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,21 @@ + + + + + + + + true + + + + + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Organisation.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Organisation.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Organisation.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,226 @@ + + + + + + + + + @hibernate.class + table="lams_organisation" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="organisation_id" + + + + true + + + + + + @hibernate.property + column="name" + length="250" + + + + + @hibernate.property + column="description" + length="250" + + + + + @hibernate.property + column="create_date" + length="19" + not-null="true" + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="workspace_id" + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="organisation_type_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="all-delete-orphan" + + @hibernate.collection-key + column="organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisation" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="parent_organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Organisation" + + + + + + + + + + @hibernate.many-to-one + @hibernate.column name="parent_organisation_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="base_organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.User" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.lesson.Lesson" + + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/OrganisationType.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/OrganisationType.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/OrganisationType.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,103 @@ + + + + + + + + + @hibernate.class + table="lams_organisation_type" + proxy="org.lamsfoundation.lams.usermanagement.OrganisationType" + + true + + + + @hibernate.id + generator-class="increment" + type="java.lang.Integer" + column="organisation_type_id" + + + + true + + + + + + @hibernate.property + column="name" + unique="true" + length="64" + not-null="true" + + + + + @hibernate.property + column="description" + length="255" + not-null="true" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="organisation_type_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Organisation" + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -18,6 +18,8 @@ * Currently we are hardcoding the default content id. * This will be replaced when the deploy logic automatically assigns a default content id in the deploy script. */ + + public static final String MY_SIGNATURE ="laqa11"; public static final long DEFAULT_CONTENT_ID =10; public static final long DEFAULT_QUE_CONTENT_ID =20; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Role.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Role.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Role.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,98 @@ + + + + + + + + + @hibernate.class + table="lams_role" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="role_id" + + + + + + + + true + + @hibernate.property + column="name" + length="64" + not-null="true" + + + + + @hibernate.property + column="description" + length="65535" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="delete-orphan" + + @hibernate.collection-key + column="role_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisationRole" + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Tool.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Tool.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Tool.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,336 @@ + + + + + + + + + @hibernate.class + table="lams_tool" + + true + + + + @hibernate.id + generator-class="identity" + type="java.lang.Long" + column="tool_id" + + + + + + + + + @hibernate.property + column="learner_url" + length="65535" + not-null="true" + + + + + @hibernate.property + column="grouping_support_type_id" + length="3" + not-null="true" + + + + + @hibernate.property + column="author_url" + length="65535" + + + + + @hibernate.property + column="supports_define_later_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="supports_moderation_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="supports_run_offline_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="supports_contribute_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="valid_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="define_later_url" + length="65535" + + + + + @hibernate.property + column="default_tool_content_id" + length="20" + not-null="false" + + + + + @hibernate.property + column="tool_signature" + length="64" + not-null="true" + + + + + @hibernate.property + column="tool_display_name" + length="255" + not-null="true" + + + + + @hibernate.property + column="description" + length="65535" + + + + + + + + @hibernate.property + column="class_name" + length="65535" + not-null="true" + + + + + @hibernate.property + column="export_portfolio_url" + length="65535" + not-null="true" + + + + + + @hibernate.property + column="monitor_url" + length="65535" + not-null="true" + + + + + + @hibernate.property + column="moderation_url" + length="65535" + not-null="true" + + + + + + @hibernate.property + column="contribute_url" + length="65535" + not-null="true" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="tool_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.learningdesign.Activity" + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/ToolContent.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/ToolContent.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/ToolContent.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,76 @@ + + + + + + + + + @hibernate.class + table="lams_tool_content" + + true + + + + @hibernate.id + generator-class="identity" + type="java.lang.Long" + column="tool_content_id" + + + + + + + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="tool_content_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.learningdesign.Activity" + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/ToolSession.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/ToolSession.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/ToolSession.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,75 @@ + + + + + + + + + @hibernate.class table="lams_tool_session" + + true + + + + @hibernate.id generator-class="identity" + type="java.lang.Long" column="tool_session_id" + + + + + + + + + + + + + + + + + + + @hibernate.property column="create_date_time" + length="19" not-null="true" + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Transition.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Transition.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Transition.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,122 @@ + + + + + + + + + @hibernate.class + table="lams_learning_transition" + + true + + + + @hibernate.id + generator-class="identity" + type="java.lang.Long" + column="transition_id" + + + + + + + + @hibernate.property column="transition_ui_id" length="11" + + + @hibernate.property column="to_ui_id" length="11" + + + @hibernate.property column="from_ui_id" length="11" + + + + + @hibernate.property + column="description" + length="65535" + + + + + @hibernate.property + column="title" + length="255" + + + + + @hibernate.property + column="create_date_time" + length="19" + not-null="true" + + + + + + + + @hibernate.many-to-one unique="true" + @hibernate.column name="to_activity_id" + + + + + + + @hibernate.many-to-one unique="true" + @hibernate.column name="from_activity_id" + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="learning_design_id" + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/User.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/User.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/User.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,399 @@ + + + + + + + + + @hibernate.class + table="lams_user" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="user_id" + + + + + + + + true + + @hibernate.property + column="login" + unique="true" + length="20" + not-null="true" + + + + + @hibernate.property + column="password" + length="50" + not-null="true" + + + + + @hibernate.property + column="title" + length="32" + + + + + @hibernate.property + column="first_name" + length="64" + + + + + @hibernate.property + column="last_name" + length="128" + + + + + @hibernate.property + column="address_line_1" + length="64" + + + + + @hibernate.property + column="address_line_2" + length="64" + + + + + @hibernate.property + column="address_line_3" + length="64" + + + + + @hibernate.property + column="city" + length="64" + + + + + @hibernate.property + column="state" + length="64" + + + + + @hibernate.property + column="country" + length="64" + + + + + @hibernate.property + column="day_phone" + length="64" + + + + + @hibernate.property + column="evening_phone" + length="64" + + + + + @hibernate.property + column="mobile_phone" + length="64" + + + + + @hibernate.property + column="fax" + length="64" + + + + + @hibernate.property + column="email" + length="128" + + + + + @hibernate.property + column="disabled_flag" + length="1" + not-null="true" + + + + + @hibernate.property + column="create_date" + length="19" + not-null="true" + + + + + + + + + @hibernate.many-to-one + @hibernate.column name="workspace_id" + + + + + + + @hibernate.set + lazy="false" + inverse="true" + cascade="all-delete-orphan" + + @hibernate.collection-key + column="user_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisation" + + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="authentication_method_id" + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="base_organisation_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="user_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.lesson.LearnerProgress" + + + + + + + + + + + @hibernate.set lazy="true" inverse="true" cascade="none" + @hibernate.collection-key column="user_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="user_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.lesson.Lesson" + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/UserOrganisation.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/UserOrganisation.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/UserOrganisation.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,99 @@ + + + + + + + + + @hibernate.class + table="lams_user_organisation" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="user_organisation_id" + + + + + + + + + + + + true + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="user_id" + + + + + + + @hibernate.set + lazy="false" + inverse="true" + cascade="all-delete-orphan" + + @hibernate.collection-key + column="user_organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisationRole" + + + + + + + + + true + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="organisation_id" + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/UserOrganisationRole.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/UserOrganisationRole.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/UserOrganisationRole.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,73 @@ + + + + + + + + + @hibernate.class + table="lams_user_organisation_role" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="user_organisation_role_id" + + + + + + + + + + + + true + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="user_organisation_id" + + + + + + true + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="role_id" + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Workspace.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Workspace.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Workspace.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,115 @@ + + + + + + + + + @hibernate.class + table="lams_workspace" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="workspace_id" + + + + true + + + + + @hibernate.property column="name" length="65535" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="workspace_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.User" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="workspace_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Organisation" + + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="root_folder_id" + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/WorkspaceFolder.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/WorkspaceFolder.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/WorkspaceFolder.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,166 @@ + + + + + + + + + @hibernate.class + table="lams_workspace_folder" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="workspace_folder_id" + + + + + + + + + @hibernate.property + column="name" + length="64" + not-null="true" + + + + + @hibernate.property column="user_id" length="11" + + + @hibernate.property column="lams_workspace_folder_type_id" length="11" + + + @hibernate.property column="create_date_time" length="19" not-null="true" + + + @hibernate.property column="last_modified_date_time" length="19" not-null="true" + + + + + @hibernate.property + column="workspace_id" + length="11" + not-null="true" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="root_folder_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Workspace" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="parent_folder_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.WorkspaceFolder" + + + + + + + + + + @hibernate.many-to-one + @hibernate.column name="parent_folder_id" + + + + + + + @hibernate.set lazy="false" inverse="true" cascade="none" + @hibernate.collection-key column="user_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign" + + + + + + + + + + + + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/WorkspaceFolderContent.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/WorkspaceFolderContent.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/WorkspaceFolderContent.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,59 @@ + + + + + + true + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml =================================================================== diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -39,6 +39,30 @@ /WEB-INF/QaQueContent.hbm.xml /WEB-INF/QaQueUsr.hbm.xml /WEB-INF/QaUsrResp.hbm.xml + + /WEB-INF/Tool.hbm.xml + /WEB-INF/Activity.hbm.xml + /WEB-INF/ToolSession.hbm.xml + /WEB-INF/Lesson.hbm.xml + /WEB-INF/User.hbm.xml + /WEB-INF/Transition.hbm.xml + /WEB-INF/Group.hbm.xml + /WEB-INF/Grouping.hbm.xml + /WEB-INF/LearnerProgress.hbm.xml + /WEB-INF/LearningDesign.hbm.xml + /WEB-INF/LearningLibrary.hbm.xml + /WEB-INF/License.hbm.xml + /WEB-INF/AuthenticationMethod.hbm.xml + /WEB-INF/AuthenticationMethodType.hbm.xml + /WEB-INF/Organisation.hbm.xml + /WEB-INF/Role.hbm.xml + /WEB-INF/ToolContent.hbm.xml + /WEB-INF/UserOrganisation.hbm.xml + /WEB-INF/OrganisationType.hbm.xml + /WEB-INF/UserOrganisationRole.hbm.xml + /WEB-INF/Workspace.hbm.xml + /WEB-INF/WorkspaceFolder.hbm.xml + /WEB-INF/WorkspaceFolderContent.hbm.xml @@ -64,6 +88,11 @@ + + + + + @@ -106,7 +135,14 @@ + + + + + - + PROPAGATION_REQUIRED,-QaApplicationException @@ -160,7 +196,8 @@ - + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -20,6 +20,7 @@ */ package org.lamsfoundation.lams.tool.qa.service; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaQueUsr; @@ -178,6 +179,10 @@ */ public String leaveToolSession(Long toolSessionId, User learner); + public Tool getToolBySignature(String toolSignature); + + public long getToolDefaultContentIdBySignature(String toolSignature); + public int countSessionUser(QaSession qaSession); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -26,6 +26,7 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.lesson.Lesson; +import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; import org.lamsfoundation.lams.tool.ToolSessionManager; @@ -47,7 +48,6 @@ import org.springframework.dao.DataAccessException; - /** * The POJO implementation of Survey service. All business logics of survey tool * are implemented in this class. It translate the request from presentation @@ -80,7 +80,7 @@ private IUserManagementService userManagementService; private ILamsToolService toolService; - + static Logger logger = Logger.getLogger(QaMonitoringAction.class.getName()); @@ -1067,6 +1067,22 @@ // TODO Auto-generated method stub throw new UnsupportedOperationException("not yet implemented"); } + + public Tool getToolBySignature(String toolSignature) + { + logger.debug(logger + " " + this.getClass().getName() + "attempt retrieving tool with signature : " + toolSignature); + Tool tool=toolService.getToolBySignature(toolSignature); + logger.debug(logger + " " + this.getClass().getName() + " " + "retrieved tool: " + tool); + return tool; + } + + public long getToolDefaultContentIdBySignature(String toolSignature) + { + long contentId=toolService.getToolDefaultContentIdBySignature(toolSignature); + logger.debug(logger + " " + this.getClass().getName() + " " + "tool default contentId : " + contentId); + return contentId; + } + /** * @return Returns the qaDAO. Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -12,7 +12,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.lamsfoundation.lams.usermanagement.User; import org.apache.log4j.Logger; import org.apache.struts.Globals; @@ -30,6 +29,7 @@ import org.lamsfoundation.lams.tool.qa.QaUtils; import org.lamsfoundation.lams.tool.qa.service.IQaService; import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy; +import org.lamsfoundation.lams.usermanagement.User; /** * TODO: change DEVELOPMENT_FLAG to false once the container creates and passes users to the tool @@ -76,6 +76,10 @@ request.getSession().setAttribute(TOOL_SERVICE, qaService); } + logger.debug(logger + " " + this.getClass().getName() + "attempte retrieving tool with signatute : " + MY_SIGNATURE); + long contentId=qaService.getToolDefaultContentIdBySignature(MY_SIGNATURE ); + logger.debug(logger + " " + this.getClass().getName() + "retrieved tool default contentId: " + contentId); + /** * mark the http session as an authoring activity */ Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/User.hbm.xml =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/User.hbm.xml (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/User.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,399 @@ + + + + + + + + + @hibernate.class + table="lams_user" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="user_id" + + + + + + + + true + + @hibernate.property + column="login" + unique="true" + length="20" + not-null="true" + + + + + @hibernate.property + column="password" + length="50" + not-null="true" + + + + + @hibernate.property + column="title" + length="32" + + + + + @hibernate.property + column="first_name" + length="64" + + + + + @hibernate.property + column="last_name" + length="128" + + + + + @hibernate.property + column="address_line_1" + length="64" + + + + + @hibernate.property + column="address_line_2" + length="64" + + + + + @hibernate.property + column="address_line_3" + length="64" + + + + + @hibernate.property + column="city" + length="64" + + + + + @hibernate.property + column="state" + length="64" + + + + + @hibernate.property + column="country" + length="64" + + + + + @hibernate.property + column="day_phone" + length="64" + + + + + @hibernate.property + column="evening_phone" + length="64" + + + + + @hibernate.property + column="mobile_phone" + length="64" + + + + + @hibernate.property + column="fax" + length="64" + + + + + @hibernate.property + column="email" + length="128" + + + + + @hibernate.property + column="disabled_flag" + length="1" + not-null="true" + + + + + @hibernate.property + column="create_date" + length="19" + not-null="true" + + + + + + + + + @hibernate.many-to-one + @hibernate.column name="workspace_id" + + + + + + + @hibernate.set + lazy="false" + inverse="true" + cascade="all-delete-orphan" + + @hibernate.collection-key + column="user_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisation" + + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="authentication_method_id" + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="base_organisation_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="user_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.lesson.LearnerProgress" + + + + + + + + + + + @hibernate.set lazy="true" inverse="true" cascade="none" + @hibernate.collection-key column="user_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="user_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.lesson.Lesson" + + + + + + + + + Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml =================================================================== diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -41,11 +41,31 @@ column="instructions" length="255" /> - + + + + + + + + + - + + + + + + + - - - - - - - - - - + + + - - - - - Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml =================================================================== diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml (.../QaSession.hbm.xml) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml (.../QaSession.hbm.xml) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -22,7 +22,7 @@ + + + - - + + - Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml =================================================================== diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -rcb356577eaf17e3d797b1bae07f50014a849e86f --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml (.../QaUsrResp.hbm.xml) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml (.../QaUsrResp.hbm.xml) (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -24,14 +24,46 @@ length="65535" > + + + + + + + + + + + + + + + + + + + + + + + + + /WEB-INF/dbConnection.properties + + + + + + + + ${jdbc.driverClassName} + ${jdbc.url} + ${jdbc.username} + ${jdbc.password} + + + + + + + + + /WEB-INF/QaContent.hbm.xml + /WEB-INF/QaSession.hbm.xml + /WEB-INF/QaQueContent.hbm.xml + /WEB-INF/QaQueUsr.hbm.xml + /WEB-INF/QaUsrResp.hbm.xml + + + + + ${hibernate.dialect} + ${hibernate.show_sql} + ${hibernate.c3p0.minPoolSize} + ${hibernate.c3p0.maxPoolSize} + ${hibernate.c3p0.timeout} + ${hibernate.c3p0.max_statement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PROPAGATION_REQUIRED,-QaApplicationException + PROPAGATION_REQUIRED,-QaApplicationException + PROPAGATION_REQUIRED, -QaApplicationException + PROPAGATION_REQUIRED,-QaApplicationException + PROPAGATION_REQUIRED,readOnly,-QacpApplicationException + PROPAGATION_REQUIRED,-QaApplicationException + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PROPAGATION_REQUIRED,-QaApplicationException + + + + + + + + + Fisheye: Tag cb356577eaf17e3d797b1bae07f50014a849e86f refers to a dead (removed) revision in file `lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/qaCompactApplicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/Activity.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/Activity.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/Activity.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,262 @@ + + + + + + + + @hibernate.class table="lams_learning_activity" + true + + + @hibernate.id generator-class="identity" type="java.lang.Long" column="activity_id" + + + + + + + + @hibernate.property column="activity_ui_id" length="11" + + + + @hibernate.property column="description" length="65535" + + + + @hibernate.property column="title" length="255" + + + + @hibernate.property column="help_text" length="65535" + + + + @hibernate.property column="xcoord" length="11" + + + + @hibernate.property column="ycoord" length="11" + + + + @hibernate.property column="order_id" length="11" + + + + @hibernate.property column="define_later_flag" length="4" not-null="true" + + + + @hibernate.property column="create_date_time" length="19" not-null="true" + + + + @hibernate.property column="offline_instructions" length="65535" + + + + @hibernate.property column="online_instructions" length="65535" + + + + + @hibernate.property column="run_offline_flag" length="4" not-null="true" + + + + @hibernate.property column="parent_ui_id" length="11" + + + @hibernate.property column="grouping_ui_id" length="11" + + + + @hibernate.property column="learning_activity_type_id" length="11" + + + + @hibernate.property column="activity_category_id" length="11" + + + + @hibernate.property column="library_activity_ui_image" length="255" + + + + + + + + + + + + + @hibernate.column name="learning_library_id" + + + + + + + + @hibernate.column name="parent_activity_id" + + + + + + + @hibernate.column name="libraryActivity" + + + + + + + @hibernate.column name="learning_design_id" + + + + + + + @hibernate.column name="grouping_id" + + + + + + + @hibernate.class + public abstract + + + @hibernate.class + + + + + @hibernate.set lazy="false" inverse="true" cascade="none" + @hibernate.collection-key column="tool_session_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.ToolSession" + + + + + + + + + + + + + @hibernate.class + + + @hibernate.property column="create_grouping_ui_id" length="11" + + + + + + + + + + @hibernate.class + + + + + + + + + @hibernate.class + + + @hibernate.property column="gate_start_time_offset" length="20" + true + + + + @hibernate.property column="gate_end_time_offset" length="20" + true + + + + @hibernate.property column="gate_start_date_time" length="19" + true + + + + @hibernate.property column="gate_end_date_time" length="19" + true + + + + + @hibernate.class + + + @hibernate.class + + + + + + @hibernate.class + public abstract + + + + @hibernate.set lazy="false" inverse="true" cascade="none" + @hibernate.collection-key column="parent_activity_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.Activity" + + + + + + + @hibernate.class + + + @hibernate.property column="max_number_of_options" length="5" + true + + + + @hibernate.property column="min_number_of_options" length="5" + true + + + + @hibernate.property column="options_instructions" length="65535" + + + + + @hibernate.class + + + @hibernate.class + + + + + + + Index: lams_tool_laqa/web/WEB-INF/AuthenticationMethod.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/AuthenticationMethod.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/AuthenticationMethod.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,101 @@ + + + + + + + + + @hibernate.class + table="lams_authentication_method" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="authentication_method_id" + + + + true + + + + + + @hibernate.property + column="authentication_method_name" + unique="true" + length="64" + not-null="true" + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="authentication_method_type_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="authentication_method_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.User" + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/AuthenticationMethodType.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/AuthenticationMethodType.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/AuthenticationMethodType.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,86 @@ + + + + + + + + + @hibernate.class + table="lams_authentication_method_type" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="authentication_method_type_id" + + + + true + + + + + + @hibernate.property + column="description" + length="64" + not-null="true" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="authentication_method_type_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.AuthenticationMethod" + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/Group.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/Group.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/Group.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,117 @@ + + + + + + + + + @hibernate.class + table="lams_group" + + true + + + + @hibernate.id + generator-class="identity" + type="java.lang.Long" + column="group_id" + + + + + + + + + @hibernate.property + column="order_id" + length="6" + not-null="true" + + + + + + + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="group_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.tool.ToolSession" + + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="grouping_id" + + + + + + Index: lams_tool_laqa/web/WEB-INF/Grouping.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/Grouping.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/Grouping.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + @hibernate.property column="grouping_ui_id" length="11" + + + + + + + + + + + @hibernate.set lazy="true" inverse="true" cascade="none" + @hibernate.collection-key column="grouping_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.Group" + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/LearnerProgress.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/LearnerProgress.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/LearnerProgress.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/LearningDesign.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/LearningDesign.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/LearningDesign.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,217 @@ + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + @hibernate.property + column="valid_design_flag" + length="4" + not-null="true" + + + + + + + + + + + + + + + + + + + + @hibernate.property + column="version" + length="56" + + + + + @hibernate.property column ="duration" + + + @hibernate.property column ="license_text" + + + + @hibernate.property column ="lesson_org_id" + + + @hibernate.property column ="lesson_org_name" + + + @hibernate.property column ="lesson_id" + + + @hibernate.property column ="lesson_name" + + + @hibernate.property column ="lesson_start_date_time" + + + @hibernate.property column ="last_modified_date_time" + + + + + + + @hibernate.column name="license_id" + + + + + + + @hibernate.column name="first_activity_id" + + + + + + + + @hibernate.column name="parent_learning_design_id" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/LearningLibrary.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/LearningLibrary.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/LearningLibrary.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,80 @@ + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/Lesson.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/Lesson.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/Lesson.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,106 @@ + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT DISTINCT {lesson.*} + FROM lams_lesson {lesson}, + lams_grouping, + lams_group, + lams_user_group + WHERE ({lesson}.class_grouping_id = lams_grouping.grouping_id) + AND (lams_grouping.grouping_id = lams_group.grouping_id) + AND (lams_group.group_id = lams_user_group.group_id) + AND ({lesson}.lesson_state_id IN (3,4,5)) + AND (lams_user_group.user_id = :userId) + + + + + SELECT DISTINCT {learner.*} + FROM lams_user {learner}, + lams_learner_progress + WHERE ({learner}.user_id = lams_learner_progress.user_id) + AND (lams_learner_progress.lesson_id = :lessonId) + + Index: lams_tool_laqa/web/WEB-INF/License.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/License.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/License.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,21 @@ + + + + + + + + true + + + + + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/Organisation.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/Organisation.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/Organisation.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,226 @@ + + + + + + + + + @hibernate.class + table="lams_organisation" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="organisation_id" + + + + true + + + + + + @hibernate.property + column="name" + length="250" + + + + + @hibernate.property + column="description" + length="250" + + + + + @hibernate.property + column="create_date" + length="19" + not-null="true" + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="workspace_id" + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="organisation_type_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="all-delete-orphan" + + @hibernate.collection-key + column="organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisation" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="parent_organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Organisation" + + + + + + + + + + @hibernate.many-to-one + @hibernate.column name="parent_organisation_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="base_organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.User" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.lesson.Lesson" + + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/OrganisationType.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/OrganisationType.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/OrganisationType.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,103 @@ + + + + + + + + + @hibernate.class + table="lams_organisation_type" + proxy="org.lamsfoundation.lams.usermanagement.OrganisationType" + + true + + + + @hibernate.id + generator-class="increment" + type="java.lang.Integer" + column="organisation_type_id" + + + + true + + + + + + @hibernate.property + column="name" + unique="true" + length="64" + not-null="true" + + + + + @hibernate.property + column="description" + length="255" + not-null="true" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="organisation_type_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Organisation" + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/Role.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/Role.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/Role.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,98 @@ + + + + + + + + + @hibernate.class + table="lams_role" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="role_id" + + + + + + + + true + + @hibernate.property + column="name" + length="64" + not-null="true" + + + + + @hibernate.property + column="description" + length="65535" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="delete-orphan" + + @hibernate.collection-key + column="role_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisationRole" + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/Tool.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/Tool.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/Tool.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,336 @@ + + + + + + + + + @hibernate.class + table="lams_tool" + + true + + + + @hibernate.id + generator-class="identity" + type="java.lang.Long" + column="tool_id" + + + + + + + + + @hibernate.property + column="learner_url" + length="65535" + not-null="true" + + + + + @hibernate.property + column="grouping_support_type_id" + length="3" + not-null="true" + + + + + @hibernate.property + column="author_url" + length="65535" + + + + + @hibernate.property + column="supports_define_later_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="supports_moderation_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="supports_run_offline_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="supports_contribute_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="valid_flag" + length="1" + not-null="true" + + + + + + @hibernate.property + column="define_later_url" + length="65535" + + + + + @hibernate.property + column="default_tool_content_id" + length="20" + not-null="false" + + + + + @hibernate.property + column="tool_signature" + length="64" + not-null="true" + + + + + @hibernate.property + column="tool_display_name" + length="255" + not-null="true" + + + + + @hibernate.property + column="description" + length="65535" + + + + + + + + @hibernate.property + column="class_name" + length="65535" + not-null="true" + + + + + @hibernate.property + column="export_portfolio_url" + length="65535" + not-null="true" + + + + + + @hibernate.property + column="monitor_url" + length="65535" + not-null="true" + + + + + + @hibernate.property + column="moderation_url" + length="65535" + not-null="true" + + + + + + @hibernate.property + column="contribute_url" + length="65535" + not-null="true" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="tool_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.learningdesign.Activity" + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/ToolContent.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/ToolContent.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/ToolContent.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,76 @@ + + + + + + + + + @hibernate.class + table="lams_tool_content" + + true + + + + @hibernate.id + generator-class="identity" + type="java.lang.Long" + column="tool_content_id" + + + + + + + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="tool_content_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.learningdesign.Activity" + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/ToolSession.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/ToolSession.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/ToolSession.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,75 @@ + + + + + + + + + @hibernate.class table="lams_tool_session" + + true + + + + @hibernate.id generator-class="identity" + type="java.lang.Long" column="tool_session_id" + + + + + + + + + + + + + + + + + + + @hibernate.property column="create_date_time" + length="19" not-null="true" + + + + + + + + + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/Transition.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/Transition.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/Transition.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,122 @@ + + + + + + + + + @hibernate.class + table="lams_learning_transition" + + true + + + + @hibernate.id + generator-class="identity" + type="java.lang.Long" + column="transition_id" + + + + + + + + @hibernate.property column="transition_ui_id" length="11" + + + @hibernate.property column="to_ui_id" length="11" + + + @hibernate.property column="from_ui_id" length="11" + + + + + @hibernate.property + column="description" + length="65535" + + + + + @hibernate.property + column="title" + length="255" + + + + + @hibernate.property + column="create_date_time" + length="19" + not-null="true" + + + + + + + + @hibernate.many-to-one unique="true" + @hibernate.column name="to_activity_id" + + + + + + + @hibernate.many-to-one unique="true" + @hibernate.column name="from_activity_id" + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="learning_design_id" + + + + + + Index: lams_tool_laqa/web/WEB-INF/User.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/User.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/User.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,399 @@ + + + + + + + + + @hibernate.class + table="lams_user" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="user_id" + + + + + + + + true + + @hibernate.property + column="login" + unique="true" + length="20" + not-null="true" + + + + + @hibernate.property + column="password" + length="50" + not-null="true" + + + + + @hibernate.property + column="title" + length="32" + + + + + @hibernate.property + column="first_name" + length="64" + + + + + @hibernate.property + column="last_name" + length="128" + + + + + @hibernate.property + column="address_line_1" + length="64" + + + + + @hibernate.property + column="address_line_2" + length="64" + + + + + @hibernate.property + column="address_line_3" + length="64" + + + + + @hibernate.property + column="city" + length="64" + + + + + @hibernate.property + column="state" + length="64" + + + + + @hibernate.property + column="country" + length="64" + + + + + @hibernate.property + column="day_phone" + length="64" + + + + + @hibernate.property + column="evening_phone" + length="64" + + + + + @hibernate.property + column="mobile_phone" + length="64" + + + + + @hibernate.property + column="fax" + length="64" + + + + + @hibernate.property + column="email" + length="128" + + + + + @hibernate.property + column="disabled_flag" + length="1" + not-null="true" + + + + + @hibernate.property + column="create_date" + length="19" + not-null="true" + + + + + + + + + @hibernate.many-to-one + @hibernate.column name="workspace_id" + + + + + + + @hibernate.set + lazy="false" + inverse="true" + cascade="all-delete-orphan" + + @hibernate.collection-key + column="user_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisation" + + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="authentication_method_id" + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="base_organisation_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="user_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.lesson.LearnerProgress" + + + + + + + + + + + @hibernate.set lazy="true" inverse="true" cascade="none" + @hibernate.collection-key column="user_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="user_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.lesson.Lesson" + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/UserOrganisation.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/UserOrganisation.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/UserOrganisation.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,99 @@ + + + + + + + + + @hibernate.class + table="lams_user_organisation" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="user_organisation_id" + + + + + + + + + + + + true + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="user_id" + + + + + + + @hibernate.set + lazy="false" + inverse="true" + cascade="all-delete-orphan" + + @hibernate.collection-key + column="user_organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisationRole" + + + + + + + + + true + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="organisation_id" + + + + + + Index: lams_tool_laqa/web/WEB-INF/UserOrganisationRole.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/UserOrganisationRole.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/UserOrganisationRole.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,73 @@ + + + + + + + + + @hibernate.class + table="lams_user_organisation_role" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="user_organisation_role_id" + + + + + + + + + + + + true + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="user_organisation_id" + + + + + + true + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="role_id" + + + + + + Index: lams_tool_laqa/web/WEB-INF/Workspace.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/Workspace.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/Workspace.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,115 @@ + + + + + + + + + @hibernate.class + table="lams_workspace" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="workspace_id" + + + + true + + + + + @hibernate.property column="name" length="65535" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="workspace_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.User" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="workspace_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Organisation" + + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="root_folder_id" + + + + + + Index: lams_tool_laqa/web/WEB-INF/WorkspaceFolder.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/WorkspaceFolder.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/WorkspaceFolder.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,166 @@ + + + + + + + + + @hibernate.class + table="lams_workspace_folder" + + true + + + + @hibernate.id + generator-class="native" + type="java.lang.Integer" + column="workspace_folder_id" + + + + + + + + + @hibernate.property + column="name" + length="64" + not-null="true" + + + + + @hibernate.property column="user_id" length="11" + + + @hibernate.property column="lams_workspace_folder_type_id" length="11" + + + @hibernate.property column="create_date_time" length="19" not-null="true" + + + @hibernate.property column="last_modified_date_time" length="19" not-null="true" + + + + + @hibernate.property + column="workspace_id" + length="11" + not-null="true" + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="root_folder_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Workspace" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="parent_folder_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.WorkspaceFolder" + + + + + + + + + + @hibernate.many-to-one + @hibernate.column name="parent_folder_id" + + + + + + + @hibernate.set lazy="false" inverse="true" cascade="none" + @hibernate.collection-key column="user_id" + @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign" + + + + + + + + + + + + + Index: lams_tool_laqa/web/WEB-INF/WorkspaceFolderContent.hbm.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/WorkspaceFolderContent.hbm.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/WorkspaceFolderContent.hbm.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,59 @@ + + + + + + true + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_tool_laqa/web/WEB-INF/qaApplicationContext.xml =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/qaApplicationContext.xml (revision 0) +++ lams_tool_laqa/web/WEB-INF/qaApplicationContext.xml (revision cb356577eaf17e3d797b1bae07f50014a849e86f) @@ -0,0 +1,177 @@ + + + + + + + + + + + + + /WEB-INF/dbConnection.properties + + + + + + + + ${jdbc.driverClassName} + ${jdbc.url} + ${jdbc.username} + ${jdbc.password} + + + + + + + + + /WEB-INF/QaContent.hbm.xml + /WEB-INF/QaSession.hbm.xml + /WEB-INF/QaQueContent.hbm.xml + /WEB-INF/QaQueUsr.hbm.xml + /WEB-INF/QaUsrResp.hbm.xml + + + + + ${hibernate.dialect} + ${hibernate.show_sql} + ${hibernate.c3p0.minPoolSize} + ${hibernate.c3p0.maxPoolSize} + ${hibernate.c3p0.timeout} + ${hibernate.c3p0.max_statement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PROPAGATION_REQUIRED,-QaApplicationException + PROPAGATION_REQUIRED,-QaApplicationException + PROPAGATION_REQUIRED, -QaApplicationException + PROPAGATION_REQUIRED,-QaApplicationException + PROPAGATION_REQUIRED,readOnly,-QacpApplicationException + PROPAGATION_REQUIRED,-QaApplicationException + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PROPAGATION_REQUIRED,-QaApplicationException + + + + + + + + +