Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/Activity.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/AuthenticationMethod.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/AuthenticationMethodType.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/conf/hibernate/mappings/BasicToolVO.hbm.xml
===================================================================
diff -u
--- lams_tool_laqa/conf/hibernate/mappings/BasicToolVO.hbm.xml (revision 0)
+++ lams_tool_laqa/conf/hibernate/mappings/BasicToolVO.hbm.xml (revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
@@ -0,0 +1,303 @@
+
+
+
+
+
+
+
+
+ @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"
+
+
+
+
+
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/Group.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/Grouping.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/LearnerProgress.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/LearningDesign.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/LearningLibrary.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/Lesson.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/License.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/Organisation.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/OrganisationType.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/Role.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/Tool.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/ToolContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/ToolSession.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/Transition.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/User.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/UserOrganisation.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/UserOrganisationRole.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/Workspace.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/WorkspaceFolder.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/WorkspaceFolderContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
diff -u -rcb356577eaf17e3d797b1bae07f50014a849e86f -r7473d498dd9a1beb27a3f29d9364eca13e9b8165
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision cb356577eaf17e3d797b1bae07f50014a849e86f)
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
@@ -87,7 +87,13 @@
NOW());
+-- test data for content questions table
+INSERT INTO tl_laqa11_que_content (qa_que_content_id,
+ question,
+ display_order,
+ qa_content_id) VALUES (1,'What is the capital of Russia?',1,${default_content_id});
+
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/db/sql/original-insert_tool_qa_data.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Activity.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/AuthenticationMethod.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/AuthenticationMethodType.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/BasicToolVO.hbm.xml
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/BasicToolVO.hbm.xml (revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/BasicToolVO.hbm.xml (revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
@@ -0,0 +1,303 @@
+
+
+
+
+
+
+
+
+ @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"
+
+
+
+
+
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Group.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Grouping.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/LearnerProgress.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/LearningDesign.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/LearningLibrary.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Lesson.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/License.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Organisation.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/OrganisationType.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -rcb356577eaf17e3d797b1bae07f50014a849e86f -r7473d498dd9a1beb27a3f29d9364eca13e9b8165
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision cb356577eaf17e3d797b1bae07f50014a849e86f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
@@ -20,8 +20,8 @@
*/
public static final String MY_SIGNATURE ="laqa11";
- public static final long DEFAULT_CONTENT_ID =10;
- public static final long DEFAULT_QUE_CONTENT_ID =20;
+ public static final long DEFAULT_CONTENT_ID =0;
+ public static final long DEFAULT_QUE_CONTENT_ID =1;
/**
* temporarily refers to an existing content id for an incoming tool session id, won't need it in deployment environment
@@ -133,6 +133,7 @@
public static final String USER_EXCEPTION_ONLYCONTENT_ANDNOSESSIONS ="userExceptionOnlyContentAndNoSessions";
public static final String USER_EXCEPTION_USERID_EXISTING ="userExceptionUserIdExisting";
public static final String USER_EXCEPTION_MONITORINGTAB_CONTENTID_REQUIRED ="userExceptionMonitoringTabContentIdRequired";
+ public static final String USER_EXCEPTION_DEAFULTCONTENT_NOTSETUP ="userExceptionDefaultContentNotSetup";
/**
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r7473d498dd9a1beb27a3f29d9364eca13e9b8165
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
@@ -61,6 +61,7 @@
error.authoringUser.notAvailable =Tool Activity Error! Can't continue. Tool Activity expects a user id.
The expected format is either : TOOLURL?userId=A&toolContentId=B or TOOLURL?userId=A
error.userId.notNumeric =Tool Activity Error! Can't continue. The user id passed to the Tool Activity must be numerical.
error.userId.existing =Tool Activity Error! Can't continue. The user id passed to the Tool Activity refers to a student that has already used the activity.
Each learner activity should be associated with a unique userId.
+error.defaultContent.notSetup =Tool Activity Error! Can't continue. The default content for the tool has not been setup properly.
#Monitoring mode resources
button.startLesson =Start Lesson
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Role.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Tool.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/ToolContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/ToolSession.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Transition.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/User.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/UserOrganisation.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/UserOrganisationRole.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Workspace.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/WorkspaceFolder.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/WorkspaceFolderContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -rcb356577eaf17e3d797b1bae07f50014a849e86f -r7473d498dd9a1beb27a3f29d9364eca13e9b8165
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision cb356577eaf17e3d797b1bae07f50014a849e86f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
@@ -40,29 +40,7 @@
/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
+ /WEB-INF/BasicToolVO.hbm.xml
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
===================================================================
diff -u -rcb356577eaf17e3d797b1bae07f50014a849e86f -r7473d498dd9a1beb27a3f29d9364eca13e9b8165
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision cb356577eaf17e3d797b1bae07f50014a849e86f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
@@ -20,7 +20,7 @@
*/
package org.lamsfoundation.lams.tool.qa.service;
-import org.lamsfoundation.lams.tool.Tool;
+import org.lamsfoundation.lams.tool.BasicToolVO;
import org.lamsfoundation.lams.tool.qa.QaContent;
import org.lamsfoundation.lams.tool.qa.QaQueContent;
import org.lamsfoundation.lams.tool.qa.QaQueUsr;
@@ -179,7 +179,7 @@
*/
public String leaveToolSession(Long toolSessionId, User learner);
- public Tool getToolBySignature(String toolSignature);
+ public BasicToolVO getToolBySignature(String toolSignature);
public long getToolDefaultContentIdBySignature(String toolSignature);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -rcb356577eaf17e3d797b1bae07f50014a849e86f -r7473d498dd9a1beb27a3f29d9364eca13e9b8165
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision cb356577eaf17e3d797b1bae07f50014a849e86f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
@@ -26,7 +26,7 @@
import org.apache.log4j.Logger;
import org.lamsfoundation.lams.lesson.Lesson;
-import org.lamsfoundation.lams.tool.Tool;
+import org.lamsfoundation.lams.tool.BasicToolVO;
import org.lamsfoundation.lams.tool.ToolContentManager;
import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
import org.lamsfoundation.lams.tool.ToolSessionManager;
@@ -1068,17 +1068,18 @@
throw new UnsupportedOperationException("not yet implemented");
}
- public Tool getToolBySignature(String toolSignature)
+ public BasicToolVO getToolBySignature(String toolSignature) throws QaApplicationException
{
logger.debug(logger + " " + this.getClass().getName() + "attempt retrieving tool with signature : " + toolSignature);
- Tool tool=toolService.getToolBySignature(toolSignature);
+ BasicToolVO tool=toolService.getToolBySignature(toolSignature);
logger.debug(logger + " " + this.getClass().getName() + " " + "retrieved tool: " + tool);
return tool;
}
- public long getToolDefaultContentIdBySignature(String toolSignature)
+ public long getToolDefaultContentIdBySignature(String toolSignature) throws QaApplicationException
{
- long contentId=toolService.getToolDefaultContentIdBySignature(toolSignature);
+ long contentId=0;
+ contentId=toolService.getToolDefaultContentIdBySignature(toolSignature);
logger.debug(logger + " " + this.getClass().getName() + " " + "tool default contentId : " + contentId);
return contentId;
}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
diff -u -rcb356577eaf17e3d797b1bae07f50014a849e86f -r7473d498dd9a1beb27a3f29d9364eca13e9b8165
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision cb356577eaf17e3d797b1bae07f50014a849e86f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
@@ -35,7 +35,7 @@
* TODO: change DEVELOPMENT_FLAG to false once the container creates and passes users to the tool
* Assumption: Session attribute ATTR_USERDATA will be passed to the tool to hold User object
*
- * DEFAULT_CONTENT_ID is hardcoded for the moment, it will probably go.
+ *
* DEFAULT_QUE_CONTENT_ID is hardcoded for the moment, it will probably go.
*
* We won't need to create a mock user once the usernames are defined properly in the container and passed to the tool
@@ -76,10 +76,29 @@
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);
+ try
+ {
+ 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);
+ if (contentId == 0)
+ {
+ logger.debug(logger + " " + this.getClass().getName() + "default content id has not been setup");
+ persistError(request,"error.defaultContent.notSetup");
+ request.setAttribute(USER_EXCEPTION_DEAFULTCONTENT_NOTSETUP, new Boolean(true));
+ return (mapping.findForward(LOAD_QUESTIONS));
+ }
+ }
+ catch(QaApplicationException e)
+ {
+ logger.debug(logger + " " + this.getClass().getName() + "error getting the default content id: " + e.getMessage());
+ persistError(request,"error.defaultContent.notSetup");
+ request.setAttribute(USER_EXCEPTION_DEAFULTCONTENT_NOTSETUP, new Boolean(true));
+ return (mapping.findForward(LOAD_QUESTIONS));
+ }
+
+
/**
* mark the http session as an authoring activity
*/
@@ -114,7 +133,6 @@
{
persistError(request,"error.userId.notNumeric");
request.setAttribute(USER_EXCEPTION_USERID_NOTNUMERIC, new Boolean(true));
- logger.debug(logger + " " + this.getClass().getName() + "forwarding to: " + LOAD_QUESTIONS);
return (mapping.findForward(LOAD_QUESTIONS));
}
}
@@ -124,7 +142,6 @@
logger.debug(logger + " " + this.getClass().getName() + "error: The tool expects userId");
persistError(request,"error.authoringUser.notAvailable");
request.setAttribute(USER_EXCEPTION_USERID_NOTAVAILABLE, new Boolean(true));
- logger.debug(logger + " " + this.getClass().getName() + "forwarding to: " + MONITORING_ERROR);
return (mapping.findForward(LOAD_QUESTIONS));
}
@@ -204,8 +221,10 @@
/**
* get default content from db, user never created any content before
*/
- logger.debug(logger + " " + this.getClass().getName() + " " + "getting default content with id:" + DEFAULT_CONTENT_ID);
- QaContent defaultQaContent = qaService.retrieveQa(DEFAULT_CONTENT_ID);
+ long contentId=qaService.getToolDefaultContentIdBySignature(MY_SIGNATURE);
+ logger.debug(logger + " " + this.getClass().getName() + " " + "getting default content with id:" + contentId);
+
+ QaContent defaultQaContent = qaService.retrieveQa(contentId);
logger.debug(logger + " " + this.getClass().getName() + " " + defaultQaContent);
/**
@@ -216,7 +235,7 @@
if (defaultQaContent == null)
{
- logger.debug(logger + " " + this.getClass().getName() + "Exception occured: " + " No DEFAULT_CONTENT_ID");
+ logger.debug(logger + " " + this.getClass().getName() + "Exception occured: " + " No default content");
request.setAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOT_AVAILABLE, new Boolean(true));
persistError(request,"error.defaultContent.notAvailable");
return (mapping.findForward(LOAD_QUESTIONS));
@@ -237,7 +256,7 @@
if (defaultQaQueContent == null)
{
- logger.debug(logger + " " + this.getClass().getName() + "Exception occured: " + " No DEFAULT_CONTENT_ID");
+ logger.debug(logger + " " + this.getClass().getName() + "Exception occured: " + " No default content");
request.setAttribute(USER_EXCEPTION_DEFAULTQUESTIONCONTENT_NOT_AVAILABLE, new Boolean(true));
persistError(request,"error.defaultQuestionContent.notAvailable");
return (mapping.findForward(LOAD_QUESTIONS));
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java
===================================================================
diff -u -rcb356577eaf17e3d797b1bae07f50014a849e86f -r7473d498dd9a1beb27a3f29d9364eca13e9b8165
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java (.../TestQaContent.java) (revision cb356577eaf17e3d797b1bae07f50014a849e86f)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java (.../TestQaContent.java) (revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
@@ -9,7 +9,7 @@
package org.lamsfoundation.lams.tool.qa;
-import org.lamsfoundation.lams.tool.Tool;
+import org.lamsfoundation.lams.tool.BasicToolVO;
/*
@@ -163,7 +163,7 @@
public void testCoreToolClass()
{
- Tool tool=toolDAO.getToolBySignature("laqa11");
+ BasicToolVO tool=toolDAO.getToolBySignature("laqa11");
System.out.println(this.getClass().getName() + "the tool is : " + tool);
}
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/Activity.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/AuthenticationMethod.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/AuthenticationMethodType.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/web/WEB-INF/BasicToolVO.hbm.xml
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/BasicToolVO.hbm.xml (revision 0)
+++ lams_tool_laqa/web/WEB-INF/BasicToolVO.hbm.xml (revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
@@ -0,0 +1,303 @@
+
+
+
+
+
+
+
+
+ @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"
+
+
+
+
+
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/Group.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/Grouping.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/LearnerProgress.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/LearningDesign.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/LearningLibrary.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/Lesson.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/License.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/Organisation.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/OrganisationType.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/Role.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/Tool.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/ToolContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/ToolSession.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/Transition.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/User.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/UserOrganisation.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/UserOrganisationRole.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/Workspace.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/WorkspaceFolder.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7473d498dd9a1beb27a3f29d9364eca13e9b8165 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/WorkspaceFolderContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/web/questionsContent.jsp
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r7473d498dd9a1beb27a3f29d9364eca13e9b8165
--- lams_tool_laqa/web/questionsContent.jsp (.../questionsContent.jsp) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/web/questionsContent.jsp (.../questionsContent.jsp) (revision 7473d498dd9a1beb27a3f29d9364eca13e9b8165)
@@ -8,6 +8,7 @@
requestScope.userExceptionDefaultContentNotAvailable == 'true' ||
requestScope.userExceptionUserIdNotAvailable == 'true' ||
requestScope.userExceptionUserIdNotNumeric == 'true' ||
+ requestScope.userExceptionDefaultContentNotSetup == 'true' ||
requestScope.userExceptionDefaultQuestionContentNotAvailable == 'true'}">