Index: lams_build/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/build.xml,v diff -u -r1.79.2.2 -r1.79.2.2.2.1 --- lams_build/build.xml 14 May 2009 01:16:31 -0000 1.79.2.2 +++ lams_build/build.xml 29 Oct 2009 00:32:25 -0000 1.79.2.2.2.1 @@ -478,23 +478,31 @@ Deploying Library Activities + + + + + + + + Index: lams_build/buildcombinedtasks.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/Attic/buildcombinedtasks.xml,v diff -u -r1.3 -r1.3.12.1 --- lams_build/buildcombinedtasks.xml 19 Feb 2007 23:20:00 -0000 1.3 +++ lams_build/buildcombinedtasks.xml 29 Oct 2009 00:32:25 -0000 1.3.12.1 @@ -8,94 +8,90 @@ usage: this message deploy-package-library: build and deploy a parallel activity library - + - Building package: Configuration ${package.cfg} + Building package: Configuration ${package.cfg} Building package: Assembly Activity ${assembly.activity} - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + + - - - - - + + + + + + + + - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copying language files + + + + + + + + + + + + + + Index: lams_build/common.properties =================================================================== RCS file: /usr/local/cvsroot/lams_build/common.properties,v diff -u -r1.34.6.1 -r1.34.6.1.4.1 --- lams_build/common.properties 16 Apr 2009 08:14:17 -0000 1.34.6.1 +++ lams_build/common.properties 29 Oct 2009 00:32:25 -0000 1.34.6.1.4.1 @@ -26,7 +26,7 @@ #conf.application=rams # which o/s related property file do you want? valid values "windows" or "unix" -osPropertiesName=windows +osPropertiesName=unix #Tool information name=lams_tool_${signature} @@ -43,7 +43,7 @@ tag.web.dir=../lams_central/web/WEB-INF #database access -db.name=${conf.application} +db.name=lams23 db.driver=com.mysql.jdbc.Driver db.url=jdbc:mysql://localhost/${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true db.encoding=utf8 Index: lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql,v diff -u -r1.1 -r1.1.16.1 --- lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql 28 Sep 2006 01:41:21 -0000 1.1 +++ lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql 29 Oct 2009 00:32:25 -0000 1.1.16.1 @@ -4,12 +4,13 @@ learning_design_id,learning_library_id,create_date_time,run_offline_flag, max_number_of_options,min_number_of_options,tool_id,tool_content_id, gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image, -grouping_support_type_id, apply_grouping_flag,activity_category_id) +grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file) values (null,null,'Combined Chat and Scribe','Prepare Group Report',null,null,null, 'Learners to prepare group report, discussing report in chat', 6,null,null,0, null,${learning_library_id},now(),0, null,null,null,null, null,null,null,'images/icon_groupreporting.swf', -2,0,5); \ No newline at end of file +2,0,5, +'org.lamsfoundation.lams.library.chatscribe.ApplicationResources'); \ No newline at end of file Index: lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql,v diff -u -r1.2 -r1.2.16.1 --- lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql 20 Oct 2006 07:32:03 -0000 1.2 +++ lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql 29 Oct 2009 00:32:25 -0000 1.2.16.1 @@ -4,12 +4,13 @@ learning_design_id,learning_library_id,create_date_time,run_offline_flag, max_number_of_options,min_number_of_options,tool_id,tool_content_id, gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image, -grouping_support_type_id, apply_grouping_flag,activity_category_id) +grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file) values (null,null,'Combined Chat and Scribe','Prepare Group Report',null,null,null, 'Learners to prepare group report, discussing report in chat', 6,null,null,0, null,${learning_library_id},now(),0, null,null,null,null, null,null,null,'images/icon_forum_and_scribe.swf', -2,0,5); \ No newline at end of file +2,0,5, +'org.lamsfoundation.lams.library.forumscribe.ApplicationResources'); \ No newline at end of file Index: lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql,v diff -u -r1.2 -r1.2.16.1 --- lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql 18 Sep 2006 05:17:38 -0000 1.2 +++ lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql 29 Oct 2009 00:32:25 -0000 1.2.16.1 @@ -4,12 +4,13 @@ learning_design_id,learning_library_id,create_date_time,run_offline_flag, max_number_of_options,min_number_of_options,tool_id,tool_content_id, gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image, -grouping_support_type_id, apply_grouping_flag,activity_category_id) +grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file) values (null,null,'Combined Share Resources and Forum','Discuss Shared Resources',null,null,null, 'Learners to discuss items they have viewed via Share Resources.', 6,null,null,0, null,${learning_library_id},now(),0, null,null,null,null, null,null,null,'images/icon_urlcontentmessageboard.swf', -2,0,5); \ No newline at end of file +2,0,5, +'org.lamsfoundation.lams.library.shareresourcesforum.ApplicationResources'); \ No newline at end of file Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030301.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/libraryActivity/DeployLibrary.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/libraryActivity/DeployLibrary.java,v diff -u -r1.7 -r1.7.10.1 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/libraryActivity/DeployLibrary.java 10 Jun 2008 06:48:52 -0000 1.7 +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/libraryActivity/DeployLibrary.java 29 Oct 2009 00:32:25 -0000 1.7.10.1 @@ -72,6 +72,9 @@ String languageFileDirectory = lib.getLanguageFileDirectory(); if ( languageFileDirectory != null ) { + // This is for combined tools only, deprecated + + /* // generate package names in which the language files are placed. String packagePath = "org.lamsfoundation.lams.library.llid"+lib.getLearningLibraryId(); @@ -91,6 +94,7 @@ activityDBTask.setActivityId(lib.getParentActivityId()); activityDBTask.setLanguageFilename(packagePath+'.'+lib.getLanguageFileRoot()); activityDBTask.execute(); + */ }