Index: lams_tool_assessment/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/tool_insert.sql,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_assessment/db/sql/tool_insert.sql 29 Jan 2009 05:59:05 -0000 1.1 +++ lams_tool_assessment/db/sql/tool_insert.sql 17 Mar 2009 21:14:58 -0000 1.1.2.1 @@ -27,8 +27,6 @@ moderation_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time ) @@ -57,8 +55,6 @@ 'tool/laasse10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/laasse10', 'org.lamsfoundation.lams.tool.assessment.ApplicationResources', -'lams-tool-laasse10.jar', -'/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml', NOW(), NOW() ) Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml 2 Mar 2009 22:58:51 -0000 1.4 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml 17 Mar 2009 21:14:58 -0000 1.4.2.1 @@ -4,73 +4,52 @@ - + org.lamsfoundation.lams.tool.assessment.ApplicationResources - - - - - - - org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.hbm.xml - org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml - org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml - org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.hbm.xml - org/lamsfoundation/lams/tool/assessment/model/AssessmentOverallFeedback.hbm.xml - org/lamsfoundation/lams/tool/assessment/model/AssessmentUnit.hbm.xml - org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.hbm.xml - org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml - org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.hbm.xml - org/lamsfoundation/lams/tool/assessment/model/AssessmentAttachment.hbm.xml - org/lamsfoundation/lams/tool/assessment/model/AssessmentSession.hbm.xml - - - - - + - + - + - + - + - + - + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_assessment/web/WEB-INF/applicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_assessment/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/web.xml,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_assessment/web/WEB-INF/web.xml 27 Feb 2009 22:13:55 -0000 1.2 +++ lams_tool_assessment/web/WEB-INF/web.xml 17 Mar 2009 21:14:58 -0000 1.2.2.1 @@ -9,17 +9,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.assessment.ApplicationResources - + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml - + + + locatorFactorySelector + + + + parentContextKey + context.central + @@ -40,7 +41,7 @@ sessionFactoryBeanName - assessmentSessionFactory + coreSessionFactory Index: lams_tool_chat/conf/xdoclet/filters.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/conf/xdoclet/filters.xml,v diff -u -r1.2 -r1.2.6.1 --- lams_tool_chat/conf/xdoclet/filters.xml 23 May 2006 04:03:48 -0000 1.2 +++ lams_tool_chat/conf/xdoclet/filters.xml 17 Mar 2009 21:12:35 -0000 1.2.6.1 @@ -12,7 +12,7 @@ sessionFactoryBeanName - chatSessionFactory + coreSessionFactory 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.7 -r1.7.4.1 --- lams_tool_chat/conf/xdoclet/web-settings.xml 23 Sep 2008 04:21:23 -0000 1.7 +++ lams_tool_chat/conf/xdoclet/web-settings.xml 17 Mar 2009 21:12:35 -0000 1.7.4.1 @@ -7,14 +7,14 @@ contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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 - classpath:/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + Index: lams_tool_chat/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/db/sql/tool_insert.sql,v diff -u -r1.10 -r1.10.2.1 --- lams_tool_chat/db/sql/tool_insert.sql 9 Dec 2008 05:40:31 -0000 1.10 +++ lams_tool_chat/db/sql/tool_insert.sql 17 Mar 2009 21:12:35 -0000 1.10.2.1 @@ -26,8 +26,6 @@ pedagogical_planner_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, supports_outputs @@ -58,8 +56,6 @@ 'tool/lachat11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lachat11', 'org.lamsfoundation.lams.tool.chat.ApplicationResources', -'lams-tool-lachat11.jar', -'/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml', NOW(), NOW(), 1 Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml,v diff -u -r1.10 -r1.10.2.1 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml 16 Mar 2009 05:55:59 -0000 1.10 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml 17 Mar 2009 21:12:35 -0000 1.10.2.1 @@ -10,33 +10,17 @@ - + org.lamsfoundation.lams.tool.chat.ApplicationResources - - - - - - org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml - org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml - org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml - org/lamsfoundation/lams/tool/chat/model/ChatUser.hbm.xml - org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml - org/lamsfoundation/lams/tool/chat/model/ChatAttachment.hbm.xml - org/lamsfoundation/lams/tool/chat/model/ChatCondition.hbm.xml - - - - - + @@ -82,23 +66,23 @@ - + - + - + - + - + Index: lams_tool_daco/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/tool_insert.sql,v diff -u -r1.3 -r1.3.4.1 --- lams_tool_daco/db/sql/tool_insert.sql 14 Nov 2008 04:05:26 -0000 1.3 +++ lams_tool_daco/db/sql/tool_insert.sql 17 Mar 2009 21:11:57 -0000 1.3.4.1 @@ -27,8 +27,6 @@ moderation_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, supports_outputs @@ -58,8 +56,6 @@ 'tool/ladaco10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/ladaco10', 'org.lamsfoundation.lams.tool.daco.ApplicationResources', -'lams-tool-ladaco10.jar', -'/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml', NOW(), NOW(), 1 Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml,v diff -u -r1.5 -r1.5.4.1 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml 14 Nov 2008 04:05:26 -0000 1.5 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml 17 Mar 2009 21:11:57 -0000 1.5.4.1 @@ -4,58 +4,40 @@ - + org.lamsfoundation.lams.tool.daco.ApplicationResources - - - - - - - - org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml - org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml - org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml - org/lamsfoundation/lams/tool/daco/model/DacoAttachment.hbm.xml - org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml - org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml - org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.hbm.xml - - - - - + - + - + - + - + @@ -65,7 +47,7 @@ - + @@ -106,7 +88,7 @@ - + Index: lams_tool_daco/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/web.xml,v diff -u -r1.5 -r1.5.2.1 --- lams_tool_daco/web/WEB-INF/web.xml 6 Feb 2009 02:19:03 -0000 1.5 +++ lams_tool_daco/web/WEB-INF/web.xml 17 Mar 2009 21:11:57 -0000 1.5.2.1 @@ -9,18 +9,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.daco.ApplicationResources - + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/daco/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + @@ -40,7 +40,7 @@ sessionFactoryBeanName - dacoSessionFactory + coreSessionFactory Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java,v diff -u -r1.23 -r1.23.4.1 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java 24 Sep 2008 03:36:39 -0000 1.23 +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java 17 Mar 2009 21:12:28 -0000 1.23.4.1 @@ -24,224 +24,196 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.deploy; -import java.util.LinkedList; import java.util.List; - - - - /** * Tool Deployer Main Class * - * Command Line Parameters: - * properties_file_path: mandatory - * forcedb: optional, defaults to false. if true, deletes any old entries in db. + * Command Line Parameters: properties_file_path: mandatory forcedb: optional, defaults to false. if true, deletes any + * old entries in db. * - * Only use forceDB for development - not designed for production. If forceDB is set, - * then toolSignature and toolTablesDeleteScriptPath are needed. - * + * Only use forceDB for development - not designed for production. If forceDB is set, then toolSignature and + * toolTablesDeleteScriptPath are needed. + * * @author Chris Perfect, modifications by Fiona Malikoff, Luke Foxton */ -public class Deploy -{ - +public class Deploy { + /** Creates a new instance of Deploy */ - public Deploy() - { + public Deploy() { } - + /** * Runs the Deploy - * @param args the command line arguments + * + * @param args + * the command line arguments */ - public static void main(String[] args) throws Exception - { - - if ((args.length < 1) || (args[0] == null)) - { - throw new IllegalArgumentException("Usage: Deployer . n" + - "\nforceDB deletes the old database entries before creating the new entries." + - "\nSo it should be set to false for production and true for development"); - } - Boolean forceDB = Boolean.FALSE; - if ( args.length == 2 && args[1] != null) { - forceDB = new Boolean(args[1]); - } - - - System.out.println("Starting Tool Deploy"); - try - { - System.out.println("Reading Configuration File "+args[0]); - DeployToolConfig config = new DeployToolConfig(null, args[0]); - - String toolSignature = config.getToolSignature(); - String toolVersionStr = config.getToolVersion(); - - /** - * Checking if the tool is installed, if not continue to install the new tool - * If it is, check if the tool to be installed is newer than the current - * If it is newer, update the db, jar and war files, otherwise - * put up a message that the tool is already up to date and do nothing - */ - ToolDBUpdater dbUpdater = new ToolDBUpdater(); - dbUpdater.setDbUsername(config.getDbUsername()); - dbUpdater.setDbPassword(config.getDbPassword()); - dbUpdater.setDbDriverClass(config.getDbDriverClass()); - dbUpdater.setDbDriverUrl(config.getDbDriverUrl()); - dbUpdater.setToolSignature(config.getToolSignature()); - dbUpdater.setToolVersion(config.getToolVersion()); - dbUpdater.setToolCompatibleVersion(config.getMinServerVersionNumber()); - dbUpdater.checkInstalledVersion(); - if (dbUpdater.getToolExists() && forceDB==false) - { - if (dbUpdater.getToolNewer()) - { - System.out.println("Updating tool: " +toolSignature+ " with version " +toolVersionStr); - - // Disabling the tool while update takes place - System.out.println("Disabling tool for update, valid flags set to 0."); - dbUpdater.activateTool(toolSignature, 0); - - // updates the lams_tool table with the lams_version - dbUpdater.execute(); - - // Run update scripts if present - ToolDBDeployTask dbDeployTask = new ToolDBDeployTask(); - dbDeployTask.setDbUsername(config.getDbUsername()); - dbDeployTask.setDbPassword(config.getDbPassword()); - dbDeployTask.setDbDriverClass(config.getDbDriverClass()); - dbDeployTask.setDbDriverUrl(config.getDbDriverUrl()); - dbDeployTask.setToolUpdateScriptPath(config.getToolUpdateScriptPath()); - dbDeployTask.runToolUpdateScript(config.getToolUpdateScriptPath()); - - // deploy the jar and war files - System.out.println("Deploying files to ear"); - DeployFilesTask deployFilesTask = new DeployFilesTask(); - deployFilesTask.setLamsEarPath(config.getLamsEarPath()); - deployFilesTask.setDeployFiles(config.getDeployFiles()); - deployFilesTask.execute(); - - // deploy the language files - List files = config.getLanguageFiles(); - if ( files != null && files.size() > 0 ) { - DeployLanguageFilesTask deployLanguageFilesTask = new DeployLanguageFilesTask(); - deployLanguageFilesTask.setLamsEarPath(config.getLamsEarPath()); - deployLanguageFilesTask.setDictionaryPacket(config.getLanguageFilesPackage()); - deployLanguageFilesTask.setDeployFiles(config.getLanguageFiles()); - deployLanguageFilesTask.execute(); - } - - // Enabling the tool so it can now be used by LAMS (if not to be hidden) - if (config.getHideTool()==false) - { - System.out.println("Enabling Tool, valid flags set to 1"); - dbUpdater.activateTool(toolSignature, 1); - } - else - { - System.out.println("Hiding Tool, valid flags set to 0"); - dbUpdater.hideTool(toolSignature); - } - - System.out.println("Tool update completed"); - System.exit(0); - } - else - { - System.out.println("The tool to be installed: " +toolSignature+ " " +toolVersionStr+ " is already up to date."); - System.exit(0); - } - } - else - { - System.out.println("The tool to be installed: " +toolSignature+ " does not exist in database"); - System.out.println("Continuing with full install"); - // Do nothing, continue with full install - } - - - if ( forceDB.booleanValue() ) { - System.out.println("Removing old tool entries from database"); - ToolDBRemoveToolEntriesTask dbRemoveTask = new ToolDBRemoveToolEntriesTask(); - dbRemoveTask.setDbUsername(config.getDbUsername()); - dbRemoveTask.setDbPassword(config.getDbPassword()); - dbRemoveTask.setDbDriverClass(config.getDbDriverClass()); - dbRemoveTask.setDbDriverUrl(config.getDbDriverUrl()); - dbRemoveTask.setToolSignature(config.getToolSignature()); - dbRemoveTask.setToolTablesDeleteScriptPath(config.getToolTablesDeleteScriptPath()); - dbRemoveTask.execute(); - } - - System.out.println("Running Tool DB Deploy"); - ToolDBDeployTask dbDeployTask = new ToolDBDeployTask(); - dbDeployTask.setDbUsername(config.getDbUsername()); - dbDeployTask.setDbPassword(config.getDbPassword()); - dbDeployTask.setDbDriverClass(config.getDbDriverClass()); - dbDeployTask.setDbDriverUrl(config.getDbDriverUrl()); - dbDeployTask.setToolInsertScriptPath(config.getToolInsertScriptPath()); - dbDeployTask.setToolLibraryInsertScriptPath(config.getToolLibraryInsertScriptPath()); - dbDeployTask.setToolActivityInsertScriptPath(config.getToolActivityInsertScriptPath()); - dbDeployTask.setToolTablesScriptPath(config.getToolTablesScriptPath()); - if (config.getToolDBVersionScriptPath() != null - && config.getToolDBVersionScriptPath().trim().length() > 0) { - dbDeployTask.setToolDBVersionScriptPath(config.getToolDBVersionScriptPath()); - } - dbDeployTask.execute(); - - System.out.println("Deploying files to ear"); - DeployFilesTask deployFilesTask = new DeployFilesTask(); - deployFilesTask.setLamsEarPath(config.getLamsEarPath()); - deployFilesTask.setDeployFiles(config.getDeployFiles()); - deployFilesTask.execute(); - - List files = config.getLanguageFiles(); - if ( files != null && files.size() > 0 ) { - DeployLanguageFilesTask deployLanguageFilesTask = new DeployLanguageFilesTask(); - deployLanguageFilesTask.setLamsEarPath(config.getLamsEarPath()); - deployLanguageFilesTask.setDictionaryPacket(config.getLanguageFilesPackage()); - deployLanguageFilesTask.setDeployFiles(config.getLanguageFiles()); - deployLanguageFilesTask.execute(); - } + public static void main(String[] args) throws Exception { - AddWebAppToApplicationXmlTask addWebAppTask = new AddWebAppToApplicationXmlTask(); - addWebAppTask.setLamsEarPath(config.getLamsEarPath()); - addWebAppTask.setContextRoot(config.getToolContext()); - addWebAppTask.setWebUri(config.getToolWebUri()); - addWebAppTask.execute(); - - - List warFiles = new LinkedList(); - warFiles.add("lams-central.war"); - warFiles.add("lams-learning.war"); - warFiles.add("lams-monitoring.war"); - InsertToolContextClasspathTask updateWebXmlTask = new InsertToolContextClasspathTask(); - updateWebXmlTask.setLamsEarPath(config.getLamsEarPath()); - updateWebXmlTask.setArchivesToUpdate(warFiles); - updateWebXmlTask.setApplicationContextPath(config.getToolApplicationContextPath()); - updateWebXmlTask.setJarFileName(config.getToolJarFileName()); - updateWebXmlTask.execute(); + if (args.length < 1 || args[0] == null) { + throw new IllegalArgumentException("Usage: Deployer . n" + + "\nforceDB deletes the old database entries before creating the new entries." + + "\nSo it should be set to false for production and true for development"); + } + Boolean forceDB = Boolean.FALSE; + if (args.length == 2 && args[1] != null) { + forceDB = new Boolean(args[1]); + } - - if (config.getHideTool()==false) - { - System.out.println("Activating Tool: " + config.getToolSignature()); - dbUpdater.activateTool(config.getToolSignature(), 1); - } - else - { - System.out.println("Hiding tool: " + config.getToolSignature()); - dbUpdater.hideTool(config.getToolSignature()); - } - - System.out.println("Tool Deployed"); - } - catch (Exception ex) - { - System.out.println("TOOL DEPLOY FAILED"); - ex.printStackTrace(); - } + System.out.println("Starting Tool Deploy"); + try { + System.out.println("Reading Configuration File " + args[0]); + DeployToolConfig config = new DeployToolConfig(null, args[0]); + + String toolSignature = config.getToolSignature(); + String toolVersionStr = config.getToolVersion(); + + /** + * Checking if the tool is installed, if not continue to install the new tool If it is, check if the tool to + * be installed is newer than the current If it is newer, update the db, jar and war files, otherwise put up + * a message that the tool is already up to date and do nothing + */ + ToolDBUpdater dbUpdater = new ToolDBUpdater(); + dbUpdater.setDbUsername(config.getDbUsername()); + dbUpdater.setDbPassword(config.getDbPassword()); + dbUpdater.setDbDriverClass(config.getDbDriverClass()); + dbUpdater.setDbDriverUrl(config.getDbDriverUrl()); + dbUpdater.setToolSignature(config.getToolSignature()); + dbUpdater.setToolVersion(config.getToolVersion()); + dbUpdater.setToolCompatibleVersion(config.getMinServerVersionNumber()); + dbUpdater.checkInstalledVersion(); + if (dbUpdater.getToolExists() && forceDB == false) { + if (dbUpdater.getToolNewer()) { + System.out.println("Updating tool: " + toolSignature + " with version " + toolVersionStr); + + // Disabling the tool while update takes place + System.out.println("Disabling tool for update, valid flags set to 0."); + dbUpdater.activateTool(toolSignature, 0); + + // updates the lams_tool table with the lams_version + dbUpdater.execute(); + + // Run update scripts if present + ToolDBDeployTask dbDeployTask = new ToolDBDeployTask(); + dbDeployTask.setDbUsername(config.getDbUsername()); + dbDeployTask.setDbPassword(config.getDbPassword()); + dbDeployTask.setDbDriverClass(config.getDbDriverClass()); + dbDeployTask.setDbDriverUrl(config.getDbDriverUrl()); + dbDeployTask.setToolUpdateScriptPath(config.getToolUpdateScriptPath()); + dbDeployTask.runToolUpdateScript(config.getToolUpdateScriptPath()); + + // deploy the jar and war files + System.out.println("Deploying files to ear"); + DeployFilesTask deployFilesTask = new DeployFilesTask(); + deployFilesTask.setLamsEarPath(config.getLamsEarPath()); + deployFilesTask.setDeployFiles(config.getDeployFiles()); + deployFilesTask.execute(); + + // deploy the language files + List files = config.getLanguageFiles(); + if (files != null && files.size() > 0) { + DeployLanguageFilesTask deployLanguageFilesTask = new DeployLanguageFilesTask(); + deployLanguageFilesTask.setLamsEarPath(config.getLamsEarPath()); + deployLanguageFilesTask.setDictionaryPacket(config.getLanguageFilesPackage()); + deployLanguageFilesTask.setDeployFiles(config.getLanguageFiles()); + deployLanguageFilesTask.execute(); + } + + // Enabling the tool so it can now be used by LAMS (if not to be hidden) + if (config.getHideTool() == false) { + System.out.println("Enabling Tool, valid flags set to 1"); + dbUpdater.activateTool(toolSignature, 1); + } else { + System.out.println("Hiding Tool, valid flags set to 0"); + dbUpdater.hideTool(toolSignature); + } + + System.out.println("Tool update completed"); + System.exit(0); + } else { + System.out.println("The tool to be installed: " + toolSignature + " " + toolVersionStr + + " is already up to date."); + System.exit(0); + } + } else { + System.out.println("The tool to be installed: " + toolSignature + " does not exist in database"); + System.out.println("Continuing with full install"); + // Do nothing, continue with full install + } + + if (forceDB.booleanValue()) { + System.out.println("Removing old tool entries from database"); + ToolDBRemoveToolEntriesTask dbRemoveTask = new ToolDBRemoveToolEntriesTask(); + dbRemoveTask.setDbUsername(config.getDbUsername()); + dbRemoveTask.setDbPassword(config.getDbPassword()); + dbRemoveTask.setDbDriverClass(config.getDbDriverClass()); + dbRemoveTask.setDbDriverUrl(config.getDbDriverUrl()); + dbRemoveTask.setToolSignature(config.getToolSignature()); + dbRemoveTask.setToolTablesDeleteScriptPath(config.getToolTablesDeleteScriptPath()); + dbRemoveTask.execute(); + } + + System.out.println("Running Tool DB Deploy"); + ToolDBDeployTask dbDeployTask = new ToolDBDeployTask(); + dbDeployTask.setDbUsername(config.getDbUsername()); + dbDeployTask.setDbPassword(config.getDbPassword()); + dbDeployTask.setDbDriverClass(config.getDbDriverClass()); + dbDeployTask.setDbDriverUrl(config.getDbDriverUrl()); + dbDeployTask.setToolInsertScriptPath(config.getToolInsertScriptPath()); + dbDeployTask.setToolLibraryInsertScriptPath(config.getToolLibraryInsertScriptPath()); + dbDeployTask.setToolActivityInsertScriptPath(config.getToolActivityInsertScriptPath()); + dbDeployTask.setToolTablesScriptPath(config.getToolTablesScriptPath()); + if (config.getToolDBVersionScriptPath() != null && config.getToolDBVersionScriptPath().trim().length() > 0) { + dbDeployTask.setToolDBVersionScriptPath(config.getToolDBVersionScriptPath()); + } + dbDeployTask.execute(); + + System.out.println("Deploying files to ear"); + DeployFilesTask deployFilesTask = new DeployFilesTask(); + deployFilesTask.setLamsEarPath(config.getLamsEarPath()); + deployFilesTask.setDeployFiles(config.getDeployFiles()); + deployFilesTask.execute(); + + List files = config.getLanguageFiles(); + if (files != null && files.size() > 0) { + DeployLanguageFilesTask deployLanguageFilesTask = new DeployLanguageFilesTask(); + deployLanguageFilesTask.setLamsEarPath(config.getLamsEarPath()); + deployLanguageFilesTask.setDictionaryPacket(config.getLanguageFilesPackage()); + deployLanguageFilesTask.setDeployFiles(config.getLanguageFiles()); + deployLanguageFilesTask.execute(); + } + + AddWebAppToApplicationXmlTask addWebAppTask = new AddWebAppToApplicationXmlTask(); + addWebAppTask.setLamsEarPath(config.getLamsEarPath()); + addWebAppTask.setContextRoot(config.getToolContext()); + addWebAppTask.setWebUri(config.getToolWebUri()); + addWebAppTask.execute(); + + /* + * LDEV-2174: This update is no longer needed since we use shared Spring context. + * + * List warFiles = new LinkedList(); warFiles.add("lams-central.war"); + * warFiles.add("lams-learning.war"); warFiles.add("lams-monitoring.war"); InsertToolContextClasspathTask + * updateWebXmlTask = new InsertToolContextClasspathTask(); + * updateWebXmlTask.setLamsEarPath(config.getLamsEarPath()); updateWebXmlTask.setArchivesToUpdate(warFiles); + * updateWebXmlTask.setApplicationContextPath(config.getToolApplicationContextPath()); + * updateWebXmlTask.setJarFileName(config.getToolJarFileName()); updateWebXmlTask.execute(); + */ + + if (config.getHideTool() == false) { + System.out.println("Activating Tool: " + config.getToolSignature()); + dbUpdater.activateTool(config.getToolSignature(), 1); + } else { + System.out.println("Hiding tool: " + config.getToolSignature()); + dbUpdater.hideTool(config.getToolSignature()); + } + + System.out.println("Tool Deployed"); + } catch (Exception ex) { + System.out.println("TOOL DEPLOY FAILED"); + ex.printStackTrace(); + } } - + } Index: lams_tool_dimdim/conf/xdoclet/filters.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/conf/xdoclet/Attic/filters.xml,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_dimdim/conf/xdoclet/filters.xml 15 Aug 2008 08:42:42 -0000 1.1 +++ lams_tool_dimdim/conf/xdoclet/filters.xml 17 Mar 2009 21:12:10 -0000 1.1.4.1 @@ -12,7 +12,7 @@ sessionFactoryBeanName - dimdimSessionFactory + coreSessionFactory Index: lams_tool_dimdim/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/conf/xdoclet/Attic/web-settings.xml,v diff -u -r1.2 -r1.2.4.1 --- lams_tool_dimdim/conf/xdoclet/web-settings.xml 23 Sep 2008 04:21:19 -0000 1.2 +++ lams_tool_dimdim/conf/xdoclet/web-settings.xml 17 Mar 2009 21:12:10 -0000 1.2.4.1 @@ -7,14 +7,14 @@ contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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/dimdim/dimdimApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/dimdim/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/dimdim/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + Index: lams_tool_dimdim/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/db/sql/tool_insert.sql,v diff -u -r1.3 -r1.3.4.1 --- lams_tool_dimdim/db/sql/tool_insert.sql 21 Nov 2008 06:32:54 -0000 1.3 +++ lams_tool_dimdim/db/sql/tool_insert.sql 17 Mar 2009 21:12:10 -0000 1.3.4.1 @@ -26,8 +26,6 @@ help_url, admin_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time ) @@ -57,8 +55,6 @@ 'http://wiki.lamsfoundation.org/display/lamsdocs/laddim10', 'tool/laddim10/admin/view.do', 'org.lamsfoundation.lams.tool.dimdim.ApplicationResources', -'lams-tool-laddim10.jar', -'/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml', NOW(), NOW() ) Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml 16 Mar 2009 05:56:02 -0000 1.3 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml 17 Mar 2009 21:12:10 -0000 1.3.2.1 @@ -10,20 +10,6 @@ - - - - - - org/lamsfoundation/lams/tool/dimdim/model/Dimdim.hbm.xml - org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.hbm.xml - org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.hbm.xml - org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.hbm.xml - org/lamsfoundation/lams/tool/dimdim/model/DimdimConfig.hbm.xml - - - - @@ -69,23 +55,23 @@ - + - + - + - + - + Index: lams_tool_forum/conf/xdoclet/filters.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/filters.xml,v diff -u -r1.5 -r1.5.2.1 --- lams_tool_forum/conf/xdoclet/filters.xml 2 Feb 2009 03:21:24 -0000 1.5 +++ lams_tool_forum/conf/xdoclet/filters.xml 17 Mar 2009 21:13:38 -0000 1.5.2.1 @@ -5,7 +5,7 @@ sessionFactoryBeanName - forumSessionFactory + coreSessionFactory Index: lams_tool_forum/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/web-settings.xml,v diff -u -r1.11 -r1.11.4.1 --- lams_tool_forum/conf/xdoclet/web-settings.xml 23 Sep 2008 04:21:19 -0000 1.11 +++ lams_tool_forum/conf/xdoclet/web-settings.xml 17 Mar 2009 21:13:38 -0000 1.11.4.1 @@ -9,16 +9,17 @@ - + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + + Index: lams_tool_forum/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/tool_insert.sql,v diff -u -r1.27 -r1.27.2.1 --- lams_tool_forum/db/sql/tool_insert.sql 9 Dec 2008 05:40:32 -0000 1.27 +++ lams_tool_forum/db/sql/tool_insert.sql 17 Mar 2009 21:13:39 -0000 1.27.2.1 @@ -26,8 +26,6 @@ pedagogical_planner_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, supports_outputs @@ -58,8 +56,6 @@ 'tool/lafrum11/authoring/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lafrum11', 'org.lamsfoundation.lams.tool.forum.ApplicationResources', -'lams-tool-lafrum11.jar', -'/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml', NOW(), NOW(), 1 Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml,v diff -u -r1.21 -r1.21.2.1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml 2 Feb 2009 03:21:24 -0000 1.21 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml 17 Mar 2009 21:13:39 -0000 1.21.2.1 @@ -2,7 +2,7 @@ + > @@ -12,77 +12,51 @@ - - - - - - - - - - - - org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml - org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml - org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml - org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml - org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml - org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml - org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml - org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.hbm.xml - org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml - org/lamsfoundation/lams/tool/forum/persistence/Timestamp.hbm.xml - - - - - + - + - + - + - + - + - + Index: lams_tool_gmap/conf/xdoclet/filters.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/conf/xdoclet/filters.xml,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_gmap/conf/xdoclet/filters.xml 23 May 2008 06:29:10 -0000 1.1 +++ lams_tool_gmap/conf/xdoclet/filters.xml 17 Mar 2009 21:11:35 -0000 1.1.4.1 @@ -12,7 +12,7 @@ sessionFactoryBeanName - gmapSessionFactory + coreSessionFactory Index: lams_tool_gmap/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/conf/xdoclet/web-settings.xml,v diff -u -r1.2 -r1.2.4.1 --- lams_tool_gmap/conf/xdoclet/web-settings.xml 23 Sep 2008 04:21:18 -0000 1.2 +++ lams_tool_gmap/conf/xdoclet/web-settings.xml 17 Mar 2009 21:11:35 -0000 1.2.4.1 @@ -7,14 +7,14 @@ contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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/gmap/gmapApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + Index: lams_tool_gmap/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/db/sql/tool_insert.sql,v diff -u -r1.2 -r1.2.4.1 --- lams_tool_gmap/db/sql/tool_insert.sql 18 Sep 2008 01:41:44 -0000 1.2 +++ lams_tool_gmap/db/sql/tool_insert.sql 17 Mar 2009 21:11:35 -0000 1.2.4.1 @@ -25,8 +25,6 @@ moderation_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, admin_url @@ -56,8 +54,6 @@ 'tool/lagmap10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lagmap10', 'org.lamsfoundation.lams.tool.gmap.ApplicationResources', -'lams-tool-lagmap10.jar', -'/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml', NOW(), NOW(), 'tool/lagmap10/lagmap10admin.do' Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml 16 Mar 2009 05:56:05 -0000 1.4 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml 17 Mar 2009 21:11:35 -0000 1.4.2.1 @@ -10,22 +10,8 @@ - - - - - - org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml - org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml - org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml - org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.hbm.xml - org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml - org/lamsfoundation/lams/tool/gmap/model/GmapConfigItem.hbm.xml - - - - + @@ -71,27 +57,27 @@ - + - + - + - + - + - + Index: lams_tool_images/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/db/sql/tool_insert.sql,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_images/db/sql/tool_insert.sql 4 Dec 2008 12:01:36 -0000 1.3 +++ lams_tool_images/db/sql/tool_insert.sql 17 Mar 2009 21:13:05 -0000 1.3.2.1 @@ -27,8 +27,6 @@ moderation_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, admin_url, @@ -59,8 +57,6 @@ 'tool/laimag10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/laimag10', 'org.lamsfoundation.lams.tool.imageGallery.ApplicationResources', -'lams-tool-laimag10.jar', -'/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml', NOW(), NOW(), 'tool/laimag10/laimag10admin/start.do', Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml,v diff -u -r1.7 -r1.7.2.1 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml 16 Dec 2008 18:16:12 -0000 1.7 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml 17 Mar 2009 21:13:05 -0000 1.7.2.1 @@ -7,30 +7,9 @@ org.lamsfoundation.lams.tool.imageGallery.ApplicationResources - + - - - - - - - - - org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.hbm.xml - org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml - org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml - org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.hbm.xml - org/lamsfoundation/lams/tool/imageGallery/model/ImageRating.hbm.xml - org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.hbm.xml - org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.hbm.xml - org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.hbm.xml - org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.hbm.xml - org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryConfigItem.hbm.xml - - - @@ -40,56 +19,56 @@ - + - + - + - + - + - + - + - + - + - + Index: lams_tool_images/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/web.xml,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_images/web/WEB-INF/web.xml 6 Feb 2009 02:21:10 -0000 1.3 +++ lams_tool_images/web/WEB-INF/web.xml 17 Mar 2009 21:13:05 -0000 1.3.2.1 @@ -9,18 +9,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.imageGallery.ApplicationResources - + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/imageGallery/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + @@ -41,7 +41,7 @@ sessionFactoryBeanName - laimagImageGallerySessionFactory + coreSessionFactory Index: lams_tool_lamc/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/tool_insert.sql,v diff -u -r1.25 -r1.25.2.1 --- lams_tool_lamc/db/sql/tool_insert.sql 9 Dec 2008 05:38:09 -0000 1.25 +++ lams_tool_lamc/db/sql/tool_insert.sql 17 Mar 2009 21:12:43 -0000 1.25.2.1 @@ -26,8 +26,6 @@ pedagogical_planner_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, supports_outputs @@ -58,8 +56,6 @@ 'tool/lamc11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lamc11', 'org.lamsfoundation.lams.tool.mc.ApplicationResources', -'lams-tool-lamc11.jar', -'/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml', NOW(), NOW(), 1) Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml,v diff -u -r1.18 -r1.18.4.1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml 15 May 2008 05:40:13 -0000 1.18 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml 17 Mar 2009 21:12:43 -0000 1.18.4.1 @@ -12,56 +12,39 @@ - - - - - - /org/lamsfoundation/lams/tool/mc/McContent.hbm.xml - /org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml - /org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml - /org/lamsfoundation/lams/tool/mc/McSession.hbm.xml - /org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml - /org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml - /org/lamsfoundation/lams/tool/mc/McUploadedFile.hbm.xml - - - - - - + - + - + - + - + - + - + @@ -74,7 +57,7 @@ org.lamsfoundation.lams.tool.mc.ApplicationResources - + Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/testmcApplicationContext.xml,v diff -u -r1.5 -r1.5.10.1 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml 7 Oct 2005 20:19:26 -0000 1.5 +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml 17 Mar 2009 21:12:43 -0000 1.5.10.1 @@ -59,7 +59,7 @@ - + @@ -70,34 +70,34 @@ - + - + - + - + - + - + Index: lams_tool_lamc/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/web.xml,v diff -u -r1.27 -r1.27.2.1 --- lams_tool_lamc/web/WEB-INF/web.xml 6 Feb 2009 02:21:40 -0000 1.27 +++ lams_tool_lamc/web/WEB-INF/web.xml 17 Mar 2009 21:12:43 -0000 1.27.2.1 @@ -6,18 +6,18 @@ org.lamsfoundation.lams.tool.mc.ApplicationResources - - contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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/mc/mcApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml - - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + SystemSessionFilter @@ -33,7 +33,7 @@ sessionFactoryBeanName - mcSessionFactory + coreSessionFactory Index: lams_tool_laqa/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/tool_insert.sql,v diff -u -r1.29 -r1.29.2.1 --- lams_tool_laqa/db/sql/tool_insert.sql 9 Dec 2008 05:38:14 -0000 1.29 +++ lams_tool_laqa/db/sql/tool_insert.sql 17 Mar 2009 21:12:59 -0000 1.29.2.1 @@ -47,8 +47,6 @@ pedagogical_planner_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, supports_outputs, @@ -80,8 +78,6 @@ 'tool/laqa11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/laqa11', 'org.lamsfoundation.lams.tool.qa.ApplicationResources', -'lams-tool-laqa11.jar', -'/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml', NOW(), NOW(), 1, Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml,v diff -u -r1.23 -r1.23.4.1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 4 Nov 2008 00:41:19 -0000 1.23 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 17 Mar 2009 21:12:59 -0000 1.23.4.1 @@ -11,75 +11,54 @@ - + org.lamsfoundation.lams.tool.qa.ApplicationResources - - - - - - org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml - /org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml - /org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml - /org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml - /org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml - /org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml - /org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml - /org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml - /org/lamsfoundation/lams/tool/qa/QaConfigItem.hbm.xml - /org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml - /org/lamsfoundation/lams/tool/qa/QaWizardQuestion.hbm.xml - /org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml - - - - - + - + - + - + - + - + - + - + - + Index: lams_tool_laqa/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/web.xml,v diff -u -r1.29 -r1.29.2.1 --- lams_tool_laqa/web/WEB-INF/web.xml 9 Feb 2009 00:20:55 -0000 1.29 +++ lams_tool_laqa/web/WEB-INF/web.xml 17 Mar 2009 21:12:59 -0000 1.29.2.1 @@ -7,18 +7,18 @@ org.lamsfoundation.lams.tool.qa.ApplicationResources - - contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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/qa/qaApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml - - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + SystemSessionFilter @@ -34,7 +34,7 @@ sessionFactoryBeanName - qaSessionFactory + coreSessionFactory Index: lams_tool_larsrc/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/tool_insert.sql,v diff -u -r1.12 -r1.12.2.1 --- lams_tool_larsrc/db/sql/tool_insert.sql 20 Jan 2009 16:18:54 -0000 1.12 +++ lams_tool_larsrc/db/sql/tool_insert.sql 17 Mar 2009 21:13:32 -0000 1.12.2.1 @@ -28,8 +28,6 @@ pedagogical_planner_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time ) @@ -59,8 +57,6 @@ 'tool/larsrc11/authoring/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/larsrc11', 'org.lamsfoundation.lams.tool.rsrc.ApplicationResources', -'lams-tool-larsrc11.jar', -'/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml', NOW(), NOW() ) Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml,v diff -u -r1.16 -r1.16.4.1 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml 10 Oct 2008 00:37:16 -0000 1.16 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml 17 Mar 2009 21:13:32 -0000 1.16.4.1 @@ -4,64 +4,45 @@ - + org.lamsfoundation.lams.tool.rsrc.ApplicationResources - - - - - - - - - org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.hbm.xml - org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml - org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml - org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.hbm.xml - org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml - org/lamsfoundation/lams/tool/rsrc/model/ResourceAttachment.hbm.xml - org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.hbm.xml - - - - - + - + - + - + - + - + @@ -111,7 +92,7 @@ - + Index: lams_tool_larsrc/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/web.xml,v diff -u -r1.19 -r1.19.2.1 --- lams_tool_larsrc/web/WEB-INF/web.xml 13 Feb 2009 05:56:15 -0000 1.19 +++ lams_tool_larsrc/web/WEB-INF/web.xml 17 Mar 2009 21:13:32 -0000 1.19.2.1 @@ -9,18 +9,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.rsrc.ApplicationResources - + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/rsrc/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + @@ -41,7 +41,7 @@ sessionFactoryBeanName - resourceSessionFactory + coreSessionFactory Index: lams_tool_nb/conf/xdoclet/filters.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/conf/xdoclet/filters.xml,v diff -u -r1.3 -r1.3.6.1 --- lams_tool_nb/conf/xdoclet/filters.xml 11 Apr 2006 06:27:37 -0000 1.3 +++ lams_tool_nb/conf/xdoclet/filters.xml 17 Mar 2009 21:11:14 -0000 1.3.6.1 @@ -20,7 +20,7 @@ sessionFactoryBeanName - nbSessionFactory + coreSessionFactory 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.7 -r1.7.4.1 --- lams_tool_nb/conf/xdoclet/web-settings.xml 23 Sep 2008 04:21:19 -0000 1.7 +++ lams_tool_nb/conf/xdoclet/web-settings.xml 17 Mar 2009 21:11:14 -0000 1.7.4.1 @@ -2,15 +2,15 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.noticeboard.ApplicationResources - - contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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 - classpath:/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml - - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + Index: lams_tool_nb/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/db/sql/tool_insert.sql,v diff -u -r1.25 -r1.25.2.1 --- lams_tool_nb/db/sql/tool_insert.sql 9 Dec 2008 05:40:32 -0000 1.25 +++ lams_tool_nb/db/sql/tool_insert.sql 17 Mar 2009 21:11:14 -0000 1.25.2.1 @@ -26,8 +26,6 @@ pedagogical_planner_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time ) @@ -57,8 +55,6 @@ 'tool/lanb11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lanb11', 'org.lamsfoundation.lams.tool.noticeboard.ApplicationResources', -'lams-tool-lanb11.jar', -'/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml', NOW(), NOW() ); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_notebook/conf/xdoclet/filters.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/xdoclet/filters.xml,v diff -u -r1.1 -r1.1.6.1 --- lams_tool_notebook/conf/xdoclet/filters.xml 20 Jul 2006 01:11:09 -0000 1.1 +++ lams_tool_notebook/conf/xdoclet/filters.xml 17 Mar 2009 21:13:19 -0000 1.1.6.1 @@ -12,7 +12,7 @@ sessionFactoryBeanName - notebookSessionFactory + coreSessionFactory Index: lams_tool_notebook/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/xdoclet/web-settings.xml,v diff -u -r1.2 -r1.2.4.1 --- lams_tool_notebook/conf/xdoclet/web-settings.xml 23 Sep 2008 04:21:22 -0000 1.2 +++ lams_tool_notebook/conf/xdoclet/web-settings.xml 17 Mar 2009 21:13:18 -0000 1.2.4.1 @@ -7,14 +7,14 @@ contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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/notebook/notebookApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + Index: lams_tool_notebook/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/db/sql/tool_insert.sql,v diff -u -r1.9 -r1.9.2.1 --- lams_tool_notebook/db/sql/tool_insert.sql 9 Dec 2008 05:40:32 -0000 1.9 +++ lams_tool_notebook/db/sql/tool_insert.sql 17 Mar 2009 21:13:18 -0000 1.9.2.1 @@ -26,8 +26,6 @@ pedagogical_planner_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, supports_outputs @@ -58,8 +56,6 @@ 'tool/lantbk11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lantbk11', 'org.lamsfoundation.lams.tool.notebook.ApplicationResources', -'lams-tool-lantbk11.jar', -'/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml', NOW(), NOW(), 1 Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml,v diff -u -r1.6 -r1.6.2.1 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml 16 Mar 2009 05:55:59 -0000 1.6 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml 17 Mar 2009 21:13:18 -0000 1.6.2.1 @@ -10,31 +10,16 @@ - + org.lamsfoundation.lams.tool.notebook.ApplicationResources - - - - - - org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml - org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml - org/lamsfoundation/lams/tool/notebook/model/NotebookSession.hbm.xml - org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml - org/lamsfoundation/lams/tool/notebook/model/NotebookAttachment.hbm.xml - org/lamsfoundation/lams/tool/notebook/model/NotebookCondition.hbm.xml - - - - - + @@ -80,19 +65,19 @@ - + - + - + - + Index: lams_tool_pixlr/conf/xdoclet/filters.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/conf/xdoclet/filters.xml,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_pixlr/conf/xdoclet/filters.xml 7 Jan 2009 22:37:48 -0000 1.1 +++ lams_tool_pixlr/conf/xdoclet/filters.xml 17 Mar 2009 21:11:49 -0000 1.1.2.1 @@ -12,7 +12,7 @@ sessionFactoryBeanName - pixlrSessionFactory + coreSessionFactory Index: lams_tool_pixlr/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/conf/xdoclet/web-settings.xml,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_pixlr/conf/xdoclet/web-settings.xml 7 Jan 2009 22:37:48 -0000 1.1 +++ lams_tool_pixlr/conf/xdoclet/web-settings.xml 17 Mar 2009 21:11:49 -0000 1.1.2.1 @@ -7,14 +7,14 @@ contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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/pixlr/pixlrApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/pixlr/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + Index: lams_tool_pixlr/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/db/sql/tool_insert.sql,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_pixlr/db/sql/tool_insert.sql 12 Jan 2009 03:15:39 -0000 1.2 +++ lams_tool_pixlr/db/sql/tool_insert.sql 17 Mar 2009 21:11:49 -0000 1.2.2.1 @@ -25,8 +25,6 @@ moderation_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, supports_outputs, @@ -57,8 +55,6 @@ 'tool/lapixl10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lapixl10', 'org.lamsfoundation.lams.tool.pixlr.ApplicationResources', -'lams-tool-lapixl10.jar', -'/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml', NOW(), NOW(), 0, Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml 17 Mar 2009 01:33:35 -0000 1.3 +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml 17 Mar 2009 21:11:49 -0000 1.3.2.1 @@ -10,30 +10,16 @@ - + org.lamsfoundation.lams.tool.pixlr.ApplicationResources - - - - - - org/lamsfoundation/lams/tool/pixlr/model/Pixlr.hbm.xml - org/lamsfoundation/lams/tool/pixlr/model/PixlrSession.hbm.xml - org/lamsfoundation/lams/tool/pixlr/model/PixlrUser.hbm.xml - org/lamsfoundation/lams/tool/pixlr/model/PixlrAttachment.hbm.xml - org/lamsfoundation/lams/tool/pixlr/model/PixlrConfigItem.hbm.xml - - - - - + @@ -80,27 +66,27 @@ - + - + - + - + - + Index: lams_tool_sbmt/conf/xdoclet/filters.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/filters.xml,v diff -u -r1.5 -r1.5.6.1 --- lams_tool_sbmt/conf/xdoclet/filters.xml 11 Apr 2006 06:29:47 -0000 1.5 +++ lams_tool_sbmt/conf/xdoclet/filters.xml 17 Mar 2009 21:11:42 -0000 1.5.6.1 @@ -5,7 +5,7 @@ sessionFactoryBeanName - sbmtSessionFactory + coreSessionFactory 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.8 -r1.8.4.1 --- lams_tool_sbmt/conf/xdoclet/web-settings.xml 23 Sep 2008 04:21:23 -0000 1.8 +++ lams_tool_sbmt/conf/xdoclet/web-settings.xml 17 Mar 2009 21:11:42 -0000 1.8.4.1 @@ -1,19 +1,19 @@ LAMS Learning Activity Management System - + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml - 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/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + + javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.sbmt.ApplicationResources \ No newline at end of file Index: lams_tool_sbmt/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/tool_insert.sql,v diff -u -r1.23 -r1.23.2.1 --- lams_tool_sbmt/db/sql/tool_insert.sql 14 Jan 2009 10:44:23 -0000 1.23 +++ lams_tool_sbmt/db/sql/tool_insert.sql 17 Mar 2009 21:11:42 -0000 1.23.2.1 @@ -26,8 +26,6 @@ pedagogical_planner_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time ) @@ -57,8 +55,6 @@ 'tool/lasbmt11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lasbmt11', 'org.lamsfoundation.lams.tool.sbmt.ApplicationResources', -'lams-tool-lasbmt11.jar', -'/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml', NOW(), NOW() ); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml,v diff -u -r1.22 -r1.22.2.1 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 16 Mar 2009 05:56:03 -0000 1.22 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 17 Mar 2009 21:11:43 -0000 1.22.2.1 @@ -4,7 +4,7 @@ - + org.lamsfoundation.lams.tool.sbmt.ApplicationResources @@ -13,46 +13,31 @@ - - - - - - org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml - org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml - org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml - org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml - org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml - org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml - - - - - + - + - + - + - + - + Index: lams_tool_scribe/conf/xdoclet/filters.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/xdoclet/filters.xml,v diff -u -r1.1 -r1.1.6.1 --- lams_tool_scribe/conf/xdoclet/filters.xml 15 Sep 2006 03:09:52 -0000 1.1 +++ lams_tool_scribe/conf/xdoclet/filters.xml 17 Mar 2009 21:11:21 -0000 1.1.6.1 @@ -12,7 +12,7 @@ sessionFactoryBeanName - lascrbScribeSessionFactory + coreSessionFactory Index: lams_tool_scribe/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/xdoclet/web-settings.xml,v diff -u -r1.2 -r1.2.4.1 --- lams_tool_scribe/conf/xdoclet/web-settings.xml 23 Sep 2008 04:21:22 -0000 1.2 +++ lams_tool_scribe/conf/xdoclet/web-settings.xml 17 Mar 2009 21:11:21 -0000 1.2.4.1 @@ -7,14 +7,14 @@ contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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/scribe/scribeApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + Index: lams_tool_scribe/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/db/sql/tool_insert.sql,v diff -u -r1.7 -r1.7.2.1 --- lams_tool_scribe/db/sql/tool_insert.sql 26 Feb 2009 19:19:22 -0000 1.7 +++ lams_tool_scribe/db/sql/tool_insert.sql 17 Mar 2009 21:11:22 -0000 1.7.2.1 @@ -26,8 +26,6 @@ pedagogical_planner_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time ) @@ -57,8 +55,6 @@ 'tool/lascrb11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lascrb11', 'org.lamsfoundation.lams.tool.scribe.ApplicationResources', -'lams-tool-lascrb11.jar', -'/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml', NOW(), NOW() ) Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml,v diff -u -r1.5 -r1.5.2.1 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml 16 Mar 2009 05:56:03 -0000 1.5 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml 17 Mar 2009 21:11:21 -0000 1.5.2.1 @@ -10,21 +10,6 @@ - - - - - - org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml - org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml - org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml - org/lamsfoundation/lams/tool/scribe/model/ScribeAttachment.hbm.xml - org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.hbm.xml - org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.hbm.xml - - - - @@ -69,22 +54,22 @@ - + - + - + - + - + Index: lams_tool_spreadsheet/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/db/sql/tool_insert.sql,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_spreadsheet/db/sql/tool_insert.sql 4 Jul 2008 07:40:26 -0000 1.1 +++ lams_tool_spreadsheet/db/sql/tool_insert.sql 17 Mar 2009 21:13:11 -0000 1.1.4.1 @@ -27,8 +27,6 @@ moderation_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time ) @@ -57,8 +55,6 @@ 'tool/lasprd10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lasprd10', 'org.lamsfoundation.lams.tool.spreadsheet.ApplicationResources', -'lams-tool-lasprd10.jar', -'/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml', NOW(), NOW() ) Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml,v diff -u -r1.2 -r1.2.4.1 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml 11 Jul 2008 08:19:58 -0000 1.2 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml 17 Mar 2009 21:13:11 -0000 1.2.4.1 @@ -4,65 +4,49 @@ - + org.lamsfoundation.lams.tool.spreadsheet.ApplicationResources - - - - - - - - org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.hbm.xml - org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.hbm.xml - org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.hbm.xml - org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetMark.hbm.xml - org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetAttachment.hbm.xml - org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.hbm.xml - - - - + - + - + - + - + - + @@ -112,7 +96,7 @@ - + Index: lams_tool_spreadsheet/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/web.xml,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_spreadsheet/web/WEB-INF/web.xml 6 Feb 2009 02:25:15 -0000 1.4 +++ lams_tool_spreadsheet/web/WEB-INF/web.xml 17 Mar 2009 21:13:11 -0000 1.4.2.1 @@ -9,18 +9,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.spreadsheet.ApplicationResources - + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + @@ -35,7 +35,7 @@ sessionFactoryBeanName - spreadsheetSessionFactory + coreSessionFactory Index: lams_tool_survey/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/db/sql/tool_insert.sql,v diff -u -r1.10 -r1.10.4.1 --- lams_tool_survey/db/sql/tool_insert.sql 22 Oct 2008 00:11:48 -0000 1.10 +++ lams_tool_survey/db/sql/tool_insert.sql 17 Mar 2009 21:11:29 -0000 1.10.4.1 @@ -27,8 +27,6 @@ moderation_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, supports_outputs @@ -58,8 +56,6 @@ 'tool/lasurv11/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lasurv11', 'org.lamsfoundation.lams.tool.survey.ApplicationResources', -'lams-tool-lasurv11.jar', -'/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml', NOW(), NOW(), 1 Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml,v diff -u -r1.6 -r1.6.4.1 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml 22 Oct 2008 00:11:48 -0000 1.6 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml 17 Mar 2009 21:11:29 -0000 1.6.4.1 @@ -7,65 +7,46 @@ org.lamsfoundation.lams.tool.survey.ApplicationResources - + - - - - - - - - org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml - org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml - org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml - org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml - org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml - org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml - org/lamsfoundation/lams/tool/survey/model/SurveyAttachment.hbm.xml - org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml - org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml - - - - + - + - + - + - + - + - + Index: lams_tool_survey/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/web.xml,v diff -u -r1.9 -r1.9.2.1 --- lams_tool_survey/web/WEB-INF/web.xml 6 Feb 2009 02:25:33 -0000 1.9 +++ lams_tool_survey/web/WEB-INF/web.xml 17 Mar 2009 21:11:29 -0000 1.9.2.1 @@ -9,18 +9,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.survey.ApplicationResources - + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/survey/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + @@ -40,7 +40,7 @@ sessionFactoryBeanName - lasurvSurveySessionFactory + coreSessionFactory Index: lams_tool_task/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/db/sql/tool_insert.sql,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_task/db/sql/tool_insert.sql 14 Jan 2009 10:44:30 -0000 1.3 +++ lams_tool_task/db/sql/tool_insert.sql 17 Mar 2009 21:13:25 -0000 1.3.2.1 @@ -28,8 +28,6 @@ pedagogical_planner_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, supports_outputs @@ -60,8 +58,6 @@ 'tool/latask10/authoring/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/latask10', 'org.lamsfoundation.lams.tool.taskList.ApplicationResources', -'lams-tool-latask10.jar', -'/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml', NOW(), NOW(), 1 Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml,v diff -u -r1.6 -r1.6.4.1 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml 11 Apr 2008 06:46:38 -0000 1.6 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml 17 Mar 2009 21:13:25 -0000 1.6.4.1 @@ -7,30 +7,10 @@ org.lamsfoundation.lams.tool.taskList.ApplicationResources - + - - - - - - - - org/lamsfoundation/lams/tool/taskList/model/TaskListUser.hbm.xml - org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml - org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml - org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.hbm.xml - org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.hbm.xml - org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.hbm.xml - org/lamsfoundation/lams/tool/taskList/model/TaskListAttachment.hbm.xml - org/lamsfoundation/lams/tool/taskList/model/TaskListSession.hbm.xml - org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml - - - - @@ -39,41 +19,41 @@ - + - + - + - + - + - + - + Index: lams_tool_task/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/web.xml,v diff -u -r1.5 -r1.5.2.1 --- lams_tool_task/web/WEB-INF/web.xml 6 Feb 2009 02:25:50 -0000 1.5 +++ lams_tool_task/web/WEB-INF/web.xml 17 Mar 2009 21:13:25 -0000 1.5.2.1 @@ -9,18 +9,18 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.taskList.ApplicationResources - + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/taskList/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + @@ -40,7 +40,7 @@ sessionFactoryBeanName - lataskTaskListSessionFactory + coreSessionFactory Index: lams_tool_videorecorder/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/.classpath,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_videorecorder/.classpath 18 Dec 2008 02:20:34 -0000 1.1 +++ lams_tool_videorecorder/.classpath 17 Mar 2009 21:12:50 -0000 1.1.2.1 @@ -11,5 +11,6 @@ + Index: lams_tool_videorecorder/conf/xdoclet/filters.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/conf/xdoclet/filters.xml,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_videorecorder/conf/xdoclet/filters.xml 18 Dec 2008 02:20:34 -0000 1.1 +++ lams_tool_videorecorder/conf/xdoclet/filters.xml 17 Mar 2009 21:12:50 -0000 1.1.2.1 @@ -12,7 +12,7 @@ sessionFactoryBeanName - videoRecorderSessionFactory + coreSessionFactory Index: lams_tool_videorecorder/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/conf/xdoclet/web-settings.xml,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_videorecorder/conf/xdoclet/web-settings.xml 18 Dec 2008 02:20:34 -0000 1.1 +++ lams_tool_videorecorder/conf/xdoclet/web-settings.xml 17 Mar 2009 21:12:50 -0000 1.1.2.1 @@ -7,14 +7,14 @@ contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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/videoRecorder/videoRecorderApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + Index: lams_tool_videorecorder/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/db/sql/tool_insert.sql,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_videorecorder/db/sql/tool_insert.sql 18 Dec 2008 02:20:35 -0000 1.1 +++ lams_tool_videorecorder/db/sql/tool_insert.sql 17 Mar 2009 21:12:50 -0000 1.1.2.1 @@ -25,8 +25,6 @@ moderation_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, supports_outputs @@ -56,8 +54,6 @@ 'tool/lavidr10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lavidr10', 'org.lamsfoundation.lams.tool.videoRecorder.ApplicationResources', -'lams-tool-lavidr10.jar', -'/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml', NOW(), NOW(), 1 Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml 17 Mar 2009 01:38:00 -0000 1.3 +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml 17 Mar 2009 21:12:50 -0000 1.3.2.1 @@ -10,34 +10,16 @@ - + org.lamsfoundation.lams.tool.videoRecorder.ApplicationResources - - - - - - org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml - org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.hbm.xml - org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.hbm.xml - org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderUser.hbm.xml - org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderAttachment.hbm.xml - org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderCondition.hbm.xml - org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.hbm.xml - org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRating.hbm.xml - org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderComment.hbm.xml - - - - - + @@ -87,31 +69,31 @@ - + - + - + - + - + - + - + Index: lams_tool_vote/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/db/sql/tool_insert.sql,v diff -u -r1.14 -r1.14.2.1 --- lams_tool_vote/db/sql/tool_insert.sql 9 Dec 2008 05:38:13 -0000 1.14 +++ lams_tool_vote/db/sql/tool_insert.sql 17 Mar 2009 21:12:04 -0000 1.14.2.1 @@ -47,8 +47,6 @@ pedagogical_planner_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, supports_outputs @@ -79,8 +77,6 @@ 'tool/lavote11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lavote11', 'org.lamsfoundation.lams.tool.vote.ApplicationResources', -'lams-tool-lavote11.jar', -'/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml', NOW(), NOW(), 1 Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml,v diff -u -r1.10 -r1.10.4.1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml 13 May 2008 03:44:34 -0000 1.10 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml 17 Mar 2009 21:12:04 -0000 1.10.4.1 @@ -14,53 +14,38 @@ org.lamsfoundation.lams.tool.vote.ApplicationResources - + - - - - - - /org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml - /org/lamsfoundation/lams/tool/vote/VoteQueContent.hbm.xml - /org/lamsfoundation/lams/tool/vote/VoteSession.hbm.xml - /org/lamsfoundation/lams/tool/vote/VoteQueUsr.hbm.xml - /org/lamsfoundation/lams/tool/vote/VoteUsrAttempt.hbm.xml - /org/lamsfoundation/lams/tool/vote/VoteUploadedFile.hbm.xml - - - - - + - + - + - + - + - + Index: lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/testmcApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/Attic/testmcApplicationContext.xml,v diff -u -r1.1 -r1.1.6.1 --- lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/testmcApplicationContext.xml 7 Apr 2006 18:00:39 -0000 1.1 +++ lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/testmcApplicationContext.xml 17 Mar 2009 21:12:04 -0000 1.1.6.1 @@ -35,33 +35,33 @@ - + - + - + - + - + - + - + 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.16 -r1.16.2.1 --- lams_tool_vote/web/WEB-INF/web.xml 6 Feb 2009 02:26:42 -0000 1.16 +++ lams_tool_vote/web/WEB-INF/web.xml 17 Mar 2009 21:12:04 -0000 1.16.2.1 @@ -26,18 +26,18 @@ org.lamsfoundation.lams.tool.vote.ApplicationResources - - contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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 - classpath:/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml - - + + contextConfigLocation + classpath:/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml + + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + SystemSessionFilter @@ -53,7 +53,7 @@ sessionFactoryBeanName - voteSessionFactory + coreSessionFactory Index: lams_tool_wiki/conf/xdoclet/filters.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/xdoclet/filters.xml,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_wiki/conf/xdoclet/filters.xml 8 Oct 2008 05:33:00 -0000 1.1 +++ lams_tool_wiki/conf/xdoclet/filters.xml 17 Mar 2009 21:12:19 -0000 1.1.4.1 @@ -12,7 +12,7 @@ sessionFactoryBeanName - wikiSessionFactory + coreSessionFactory Index: lams_tool_wiki/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/xdoclet/web-settings.xml,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_wiki/conf/xdoclet/web-settings.xml 8 Oct 2008 05:33:00 -0000 1.1 +++ lams_tool_wiki/conf/xdoclet/web-settings.xml 17 Mar 2009 21:12:19 -0000 1.1.4.1 @@ -7,14 +7,14 @@ contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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/wiki/wikiApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + Index: lams_tool_wiki/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/db/sql/tool_insert.sql,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_wiki/db/sql/tool_insert.sql 21 Jan 2009 22:17:04 -0000 1.3 +++ lams_tool_wiki/db/sql/tool_insert.sql 17 Mar 2009 21:12:19 -0000 1.3.2.1 @@ -26,8 +26,6 @@ pedagogical_planner_url, help_url, language_file, -classpath_addition, -context_file, create_date_time, modified_date_time, supports_outputs @@ -58,8 +56,6 @@ 'tool/lawiki10/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lawiki10', 'org.lamsfoundation.lams.tool.wiki.ApplicationResources', -'lams-tool-lawiki10.jar', -'/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml', NOW(), NOW(), 1 Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml 16 Mar 2009 05:56:06 -0000 1.3 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml 17 Mar 2009 21:12:19 -0000 1.3.2.1 @@ -10,21 +10,6 @@ - - - - - - org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml - org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml - org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.hbm.xml - org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml - org/lamsfoundation/lams/tool/wiki/model/WikiUser.hbm.xml - org/lamsfoundation/lams/tool/wiki/model/WikiAttachment.hbm.xml - - - - @@ -74,34 +59,34 @@ - + - + - + - + - + - + - + org.lamsfoundation.lams.tool.wiki.ApplicationResources Index: lams_tool_wiki/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/Attic/web.xml,v diff -u -r1.5 -r1.5.2.1 --- lams_tool_wiki/web/WEB-INF/web.xml 6 Feb 2009 02:27:19 -0000 1.5 +++ lams_tool_wiki/web/WEB-INF/web.xml 17 Mar 2009 21:12:19 -0000 1.5.2.1 @@ -10,16 +10,16 @@ contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.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/wiki/wikiApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/wiki/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.tool + SystemSessionFilter @@ -34,7 +34,7 @@ sessionFactoryBeanName - wikiSessionFactory + coreSessionFactory Index: lams_tool_wiki/web/WEB-INF/struts/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/struts/Attic/struts-config.xml,v diff -u -r1.2 -r1.2.4.1 --- lams_tool_wiki/web/WEB-INF/struts/struts-config.xml 15 Oct 2008 03:30:46 -0000 1.2 +++ lams_tool_wiki/web/WEB-INF/struts/struts-config.xml 17 Mar 2009 21:12:19 -0000 1.2.4.1 @@ -22,6 +22,10 @@ type="org.lamsfoundation.lams.tool.wiki.web.forms.LearningForm" /> + @@ -148,6 +152,21 @@ redirect="false" /> + + +