Index: lams_monitoring/conf/war/META-INF/MANIFEST.MF =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/conf/war/META-INF/Attic/MANIFEST.MF,v diff -u -r1.7 -r1.8 --- lams_monitoring/conf/war/META-INF/MANIFEST.MF 11 Apr 2006 23:56:42 -0000 1.7 +++ lams_monitoring/conf/war/META-INF/MANIFEST.MF 14 Apr 2006 06:40:27 -0000 1.8 @@ -1,2 +1,2 @@ -Class-Path: ./lams.jar ./lams-monitoring.jar ./lams-central.jar ./lams-learning.jar ./lams-tool-lafrum11.jar ./lams-tool-laicp10.jar ./lams-tool-lamc11.jar ./lams-tool-lanb11.jar ./lams-tool-laqa11.jar ./lams-tool-lasbmt11.jar ./lams-tool-lasr10.jar ./lams-tool-lachat11.jar ./lams-tool-larsrc11.jar ./lams-tool-vote11.jar +Class-Path: ./lams.jar ./lams-monitoring.jar ./lams-central.jar ./lams-learning.jar Index: lams_monitoring/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/conf/xdoclet/web-settings.xml,v diff -u -r1.13 -r1.14 --- lams_monitoring/conf/xdoclet/web-settings.xml 11 Apr 2006 23:56:42 -0000 1.13 +++ lams_monitoring/conf/xdoclet/web-settings.xml 14 Apr 2006 06:40:27 -0000 1.14 @@ -7,20 +7,11 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - - classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml - classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml - - + Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/Attic/TestMonitoringService.java,v diff -u -r1.32 -r1.33 --- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java 6 Apr 2006 06:33:52 -0000 1.32 +++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java 14 Apr 2006 06:40:27 -0000 1.33 @@ -136,7 +136,7 @@ return new String[] { "/org/lamsfoundation/lams/localApplicationContext.xml", "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", - "/org/lamsfoundation/lams/tool/toolApplicationContext.xml", + "/org/lamsfoundation/lams/toolApplicationContext.xml", "/org/lamsfoundation/lams/learning/learningApplicationContext.xml", "/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml", "/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml", Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestGateAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/Attic/TestGateAction.java,v diff -u -r1.4 -r1.5 --- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestGateAction.java 6 Apr 2006 06:33:51 -0000 1.4 +++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestGateAction.java 14 Apr 2006 06:40:27 -0000 1.5 @@ -76,7 +76,7 @@ { return "/org/lamsfoundation/lams/localApplicationContext.xml "+ "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "+ - "/org/lamsfoundation/lams/tool/toolApplicationContext.xml "+ + "/org/lamsfoundation/lams/toolApplicationContext.xml "+ "/org/lamsfoundation/lams/learning/learningApplicationContext.xml "+ "/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml "+ "/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml "+ @@ -90,7 +90,7 @@ +"/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml " +"/WEB-INF/spring/authoringApplicationContext.xml " +"/WEB-INF/spring/learningApplicationContext.xml " - +"/org/lamsfoundation/lams/tool/toolApplicationContext.xml " + +"/org/lamsfoundation/lams/toolApplicationContext.xml " +"/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml " +"/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml"; } */ Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/Attic/TestMonitoringAction.java,v diff -u -r1.4 -r1.5 --- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestMonitoringAction.java 6 Apr 2006 06:33:51 -0000 1.4 +++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestMonitoringAction.java 14 Apr 2006 06:40:27 -0000 1.5 @@ -62,7 +62,7 @@ { return "/org/lamsfoundation/lams/localApplicationContext.xml "+ "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "+ - "/org/lamsfoundation/lams/tool/toolApplicationContext.xml "+ + "/org/lamsfoundation/lams/toolApplicationContext.xml "+ "/org/lamsfoundation/lams/learning/learningApplicationContext.xml "+ "/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml "+ "/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml "+ Index: lams_monitoring/test/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/test/web/WEB-INF/Attic/web.xml,v diff -u -r1.5 -r1.6 --- lams_monitoring/test/web/WEB-INF/web.xml 7 Apr 2006 00:35:37 -0000 1.5 +++ lams_monitoring/test/web/WEB-INF/web.xml 14 Apr 2006 06:40:27 -0000 1.6 @@ -10,7 +10,7 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml Index: lams_monitoring/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/Attic/web.xml,v diff -u -r1.21 -r1.22 --- lams_monitoring/web/WEB-INF/web.xml 10 Apr 2006 11:07:56 -0000 1.21 +++ lams_monitoring/web/WEB-INF/web.xml 14 Apr 2006 06:40:27 -0000 1.22 @@ -10,20 +10,12 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - - classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml - classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml - - + Index: lams_tool_chat/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/build.xml,v diff -u -r1.2 -r1.3 --- lams_tool_chat/build.xml 3 Apr 2006 08:30:07 -0000 1.2 +++ lams_tool_chat/build.xml 14 Apr 2006 06:36:42 -0000 1.3 @@ -337,12 +337,14 @@ dbDriverUrl="${db.url}" dbDriverClass="com.mysql.jdbc.Driver" deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" + toolJarFileName="${product}.jar" toolSignature="${signature}" toolTablesScriptPath="${db.scripts}/create_lams_tool_chat.sql" toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_chat.sql" toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql" toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql" toolInsertScriptPath="${db.scripts}/tool_insert.sql" + toolApplicationContextPath="/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" toolWebUri="${product}.war" languageFilesPackage="org.lamsfoundation.lams.tool.chat"> Index: lams_tool_chat/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/conf/xdoclet/web-settings.xml,v diff -u -r1.2 -r1.3 --- lams_tool_chat/conf/xdoclet/web-settings.xml 3 Apr 2006 08:30:08 -0000 1.2 +++ lams_tool_chat/conf/xdoclet/web-settings.xml 14 Apr 2006 06:36:42 -0000 1.3 @@ -10,7 +10,7 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml Index: lams_tool_chat/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/Attic/web.xml,v diff -u -r1.2 -r1.3 --- lams_tool_chat/web/WEB-INF/web.xml 3 Apr 2006 08:30:08 -0000 1.2 +++ lams_tool_chat/web/WEB-INF/web.xml 14 Apr 2006 06:36:42 -0000 1.3 @@ -13,7 +13,7 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml Index: lams_tool_example/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/build.xml,v diff -u -r1.4 -r1.5 --- lams_tool_example/build.xml 5 Apr 2006 03:15:58 -0000 1.4 +++ lams_tool_example/build.xml 14 Apr 2006 06:36:01 -0000 1.5 @@ -337,12 +337,14 @@ dbDriverUrl="${db.url}" dbDriverClass="com.mysql.jdbc.Driver" deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" + toolJarFileName="${product}.jar" toolSignature="${signature}" toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_example.sql" toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_example.sql" toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" + toolApplicationContextPath="/org/lamsfoundation/lams/tool/example/applicationContext.xml" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" toolWebUri="${product}.war" Index: lams_tool_example/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/conf/xdoclet/web-settings.xml,v diff -u -r1.5 -r1.6 --- lams_tool_example/conf/xdoclet/web-settings.xml 10 Apr 2006 11:09:06 -0000 1.5 +++ lams_tool_example/conf/xdoclet/web-settings.xml 14 Apr 2006 06:36:01 -0000 1.6 @@ -10,7 +10,7 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml classpath:/org/lamsfoundation/lams/tool/example/applicationContext.xml Index: lams_tool_example/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/web/WEB-INF/web.xml,v diff -u -r1.3 -r1.4 --- lams_tool_example/web/WEB-INF/web.xml 27 Mar 2006 22:22:46 -0000 1.3 +++ lams_tool_example/web/WEB-INF/web.xml 14 Apr 2006 06:36:01 -0000 1.4 @@ -13,7 +13,7 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml classpath:/org/lamsfoundation/lams/tool/example/applicationContext.xml Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/ActionBaseTest.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/Attic/ActionBaseTest.java,v diff -u -r1.2 -r1.3 --- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/ActionBaseTest.java 6 Apr 2006 06:40:40 -0000 1.2 +++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/ActionBaseTest.java 14 Apr 2006 06:35:25 -0000 1.3 @@ -40,7 +40,7 @@ context.setInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "org/lamsfoundation/lams/localApplicationContext.xml," + "org/lamsfoundation/lams/contentrepository/applicationContext.xml," + - "org/lamsfoundation/lams/tool/toolApplicationContext.xml," + + "org/lamsfoundation/lams/toolApplicationContext.xml," + "org/lamsfoundation/lams/lesson/lessonApplicationContext.xml," + "org/lamsfoundation/lams/learning/learningApplicationContext.xml,"+ "org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml,"); Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/BaseTest.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/Attic/BaseTest.java,v diff -u -r1.2 -r1.3 --- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/BaseTest.java 6 Apr 2006 06:40:40 -0000 1.2 +++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/BaseTest.java 14 Apr 2006 06:35:25 -0000 1.3 @@ -36,7 +36,7 @@ protected String[] getContextConfigLocation() { return new String[] {"org/lamsfoundation/lams/localApplicationContext.xml", "org/lamsfoundation/lams/contentrepository/applicationContext.xml", - "org/lamsfoundation/lams/tool/toolApplicationContext.xml", + "org/lamsfoundation/lams/toolApplicationContext.xml", "org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", "org/lamsfoundation/lams/learning/learningApplicationContext.xml", "org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml"}; Index: lams_tool_nb/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/build.xml,v diff -u -r1.25 -r1.26 --- lams_tool_nb/build.xml 5 Apr 2006 04:08:44 -0000 1.25 +++ lams_tool_nb/build.xml 14 Apr 2006 06:32:49 -0000 1.26 @@ -429,12 +429,14 @@ dbDriverUrl="${db.url}" dbDriverClass="com.mysql.jdbc.Driver" deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" + toolJarFileName="${product}.jar" toolSignature="${signature}" toolTablesScriptPath="${db.scripts}/create_lams_tool_nb.sql" toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_nb.sql" toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql" toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql" toolInsertScriptPath="${db.scripts}/tool_insert.sql" + toolApplicationContextPath="/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" toolWebUri="${product}.war" Index: lams_tool_nb/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/conf/xdoclet/web-settings.xml,v diff -u -r1.4 -r1.5 --- lams_tool_nb/conf/xdoclet/web-settings.xml 27 Mar 2006 22:29:50 -0000 1.4 +++ lams_tool_nb/conf/xdoclet/web-settings.xml 14 Apr 2006 06:32:49 -0000 1.5 @@ -7,7 +7,7 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/Attic/NbDataAccessTestCase.java,v diff -u -r1.11 -r1.12 --- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java 6 Apr 2006 07:05:07 -0000 1.11 +++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java 14 Apr 2006 06:32:49 -0000 1.12 @@ -140,7 +140,7 @@ return new String[] { "org/lamsfoundation/lams/localApplicationContext.xml", "org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", - "org/lamsfoundation/lams/tool/toolApplicationContext.xml", + "org/lamsfoundation/lams/toolApplicationContext.xml", "org/lamsfoundation/lams/learning/learningApplicationContext.xml", "org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml"}; } Index: lams_tool_nb/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/Attic/web.xml,v diff -u -r1.13 -r1.14 --- lams_tool_nb/web/WEB-INF/web.xml 11 Apr 2006 06:27:37 -0000 1.13 +++ lams_tool_nb/web/WEB-INF/web.xml 14 Apr 2006 06:32:49 -0000 1.14 @@ -10,7 +10,7 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml Index: lams_tool_sbmt/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.xml,v diff -u -r1.29 -r1.30 --- lams_tool_sbmt/build.xml 7 Apr 2006 00:47:24 -0000 1.29 +++ lams_tool_sbmt/build.xml 14 Apr 2006 06:33:12 -0000 1.30 @@ -375,12 +375,14 @@ dbDriverUrl="${db.url}" dbDriverClass="${db.driver}" deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" + toolJarFileName="${product}.jar" toolSignature="${signature}" toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_sbmt.sql" toolTablesScriptPath="${db.scripts}/create_lams_tool_sbmt.sql" toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql" toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql" toolInsertScriptPath="${db.scripts}/tool_insert.sql" + toolApplicationContextPath="/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" toolWebUri="${product}.war" Index: lams_tool_sbmt/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/web-settings.xml,v diff -u -r1.5 -r1.6 --- lams_tool_sbmt/conf/xdoclet/web-settings.xml 10 Apr 2006 11:11:07 -0000 1.5 +++ lams_tool_sbmt/conf/xdoclet/web-settings.xml 14 Apr 2006 06:33:12 -0000 1.6 @@ -10,7 +10,7 @@ classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml Index: lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/SbmtBaseTestCase.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/Attic/SbmtBaseTestCase.java,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/SbmtBaseTestCase.java 6 Apr 2006 06:41:33 -0000 1.2 +++ lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/SbmtBaseTestCase.java 14 Apr 2006 06:33:12 -0000 1.3 @@ -62,7 +62,7 @@ "org/lamsfoundation/lams/contentrepository/applicationContext.xml", "org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", "org/lamsfoundation/lams/learning/learningApplicationContext.xml", - "org/lamsfoundation/lams/tool/toolApplicationContext.xml"}; + "org/lamsfoundation/lams/toolApplicationContext.xml"}; } Index: lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/web/SbmtBaseTestAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/web/Attic/SbmtBaseTestAction.java,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/web/SbmtBaseTestAction.java 6 Apr 2006 06:41:33 -0000 1.2 +++ lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/web/SbmtBaseTestAction.java 14 Apr 2006 06:33:12 -0000 1.3 @@ -46,7 +46,7 @@ "org/lamsfoundation/lams/contentrepository/applicationContext.xml,"+ "org/lamsfoundation/lams/lesson/lessonApplicationContext.xml,"+ "org/lamsfoundation/lams/learning/learningApplicationContext.xml,"+ - "org/lamsfoundation/lams/tool/toolApplicationContext.xml,"); + "org/lamsfoundation/lams/toolApplicationContext.xml,"); ctxLoader.initWebApplicationContext(context); } } Index: lams_tool_sbmt/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/Attic/web.xml,v diff -u -r1.15 -r1.16 --- lams_tool_sbmt/web/WEB-INF/web.xml 11 Apr 2006 06:29:47 -0000 1.15 +++ lams_tool_sbmt/web/WEB-INF/web.xml 14 Apr 2006 06:33:12 -0000 1.16 @@ -13,7 +13,7 @@ classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml Index: lams_tool_vote/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/build.xml,v diff -u -r1.1 -r1.2 --- lams_tool_vote/build.xml 7 Apr 2006 18:00:39 -0000 1.1 +++ lams_tool_vote/build.xml 14 Apr 2006 06:31:09 -0000 1.2 @@ -380,12 +380,14 @@ dbDriverUrl="${db.url}" dbDriverClass="com.mysql.jdbc.Driver" deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" + toolJarFileName="${product}.jar" toolSignature="${signature}" toolTablesScriptPath="${db.scripts}/create_lams_tool_vote.sql" toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_vote.sql" toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql" toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql" toolInsertScriptPath="${db.scripts}/tool_insert.sql" + toolApplicationContextPath="/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" toolWebUri="${product}.war" Index: lams_tool_vote/test/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/test/web/WEB-INF/Attic/web.xml,v diff -u -r1.2 -r1.3 --- lams_tool_vote/test/web/WEB-INF/web.xml 11 Apr 2006 15:03:09 -0000 1.2 +++ lams_tool_vote/test/web/WEB-INF/web.xml 14 Apr 2006 06:31:09 -0000 1.3 @@ -12,7 +12,7 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml classpath:/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml Index: lams_tool_vote/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/web.xml,v diff -u -r1.2 -r1.3 --- lams_tool_vote/web/WEB-INF/web.xml 11 Apr 2006 09:09:15 -0000 1.2 +++ lams_tool_vote/web/WEB-INF/web.xml 14 Apr 2006 06:31:09 -0000 1.3 @@ -31,7 +31,7 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml classpath:/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml