Index: lams_build/build_tools_base.xml
===================================================================
diff -u -re59bc835a5ec91886980d67af70c0f05a0f7ae73 -r42fe359dd29180620751f3c218b0ee39820c2f8f
--- lams_build/build_tools_base.xml (.../build_tools_base.xml) (revision e59bc835a5ec91886980d67af70c0f05a0f7ae73)
+++ lams_build/build_tools_base.xml (.../build_tools_base.xml) (revision 42fe359dd29180620751f3c218b0ee39820c2f8f)
@@ -154,12 +154,6 @@
-
-
-
-
-
-
${ant.project.name}: Copying Tool language files
@@ -195,7 +189,6 @@
toolVersion="${tool.version}"
hideTool="${tool.hide}"
minServerVersionNumber="${min.server.version.number}"
- toolUpdateScriptPath="${build.deploy.sql}/updatescripts/updateTo${tool.version}.sql"
toolTablesScriptPath="${build.deploy.sql}/${tool.build.sql.create}"
toolTablesDeleteScriptPath="${build.deploy.sql}/${tool.build.sql.drop}"
toolActivityInsertScriptPath="${build.deploy.sql}/activity_insert.sql"
Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar
===================================================================
diff -u -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a -r42fe359dd29180620751f3c218b0ee39820c2f8f
Binary files differ
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_assessment/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_assessment/db/sql/updatescripts/updateTo20080229.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_chat/db/sql/updatescripts/UpdateLAMS202Chat.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_chat/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_chat/db/sql/updatescripts/updateTo20070315.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_chat/db/sql/updatescripts/updateTo20070524.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_chat/db/sql/updatescripts/updateTo20080229.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_chat/db/sql/updatescripts/updateTo20080813.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r42fe359dd29180620751f3c218b0ee39820c2f8f
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision 42fe359dd29180620751f3c218b0ee39820c2f8f)
@@ -94,15 +94,6 @@
// 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();
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java
===================================================================
diff -u -r9d57b27409122d7e8b897697019f5d59b1a97d33 -r42fe359dd29180620751f3c218b0ee39820c2f8f
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java (.../DeployConfig.java) (revision 9d57b27409122d7e8b897697019f5d59b1a97d33)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java (.../DeployConfig.java) (revision 42fe359dd29180620751f3c218b0ee39820c2f8f)
@@ -67,7 +67,6 @@
public static final String TOOL_SIGNATURE = "toolSignature";
public static final String TOOL_VERSION = "toolVersion";
public static final String HIDE_TOOL = "hideTool";
- public static final String TOOL_UPDATE_SCRIPT_PATH = "toolUpdateScriptPath";
public static final String TOOL_ACTIVITY_INSERT_SCRIPT_PATH = "toolActivityInsertScriptPath";
public static final String LAMS_EAR_PATH = "lamsEarPath";
public static final String I8N_LANGUAGE_FILES_PACKAGE = "languageFilesPackage";
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java
===================================================================
diff -u -r19ee29ae5f88059a3941ba2e5341be261f75d13b -r42fe359dd29180620751f3c218b0ee39820c2f8f
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision 19ee29ae5f88059a3941ba2e5341be261f75d13b)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision 42fe359dd29180620751f3c218b0ee39820c2f8f)
@@ -85,11 +85,6 @@
private String toolContext;
/**
- * Holds value of propert toolUpdateScriptPath
- */
- private String toolUpdateScriptPath;
-
- /**
* Holds value of property toolInsertScriptPath.
*/
private String toolInsertScriptPath;
@@ -223,10 +218,6 @@
toolContext = value;
}
- if ( key.equalsIgnoreCase(TOOL_UPDATE_SCRIPT_PATH) ) {
- toolUpdateScriptPath = value;
- }
-
if ( key.equalsIgnoreCase(TOOL_INSERT_SCRIPT_PATH) ) {
toolInsertScriptPath = value;
}
@@ -309,7 +300,6 @@
valid = valid && validateStringProperty(toolContext, TOOL_CONTEXT);
valid = valid && validateStringProperty(getLamsEarPath(), LAMS_EAR_PATH);
valid = valid && validateListProperty(getLanguageFiles(),LANGUAGE_FILES);
- valid = valid && validateStringProperty(toolUpdateScriptPath, TOOL_UPDATE_SCRIPT_PATH);
valid = valid && validateStringProperty(toolInsertScriptPath, TOOL_INSERT_SCRIPT_PATH);
valid = valid && validateStringProperty(toolLibraryInsertScriptPath, TOOL_LIBRARY_INSERT_SCRIPT_PATH);
valid = valid && validateStringProperty(toolActivityInsertScriptPath, TOOL_ACTIVITY_INSERT_SCRIPT_PATH);
@@ -347,8 +337,6 @@
if (config.getToolContext() != null)
this.toolContext = config.getToolContext();
if (config.getToolInsertScriptPath() != null)
- this.toolUpdateScriptPath = config.getToolUpdateScriptPath();
- if (config.getToolInsertScriptPath() != null)
this.toolInsertScriptPath = config.getToolInsertScriptPath();
if (config.getToolLibraryInsertScriptPath() != null)
this.toolLibraryInsertScriptPath = config.getToolLibraryInsertScriptPath();
@@ -382,7 +370,6 @@
System.out.println("Hide Tool: " + this.hideTool);
System.out.println("ToolWebUri: " + this.toolWebUri);
System.out.println("ToolContext: " + this.toolContext);
- System.out.println("ToolUpdateScriptPath: " + this.toolUpdateScriptPath);
System.out.println("ToolInsertScriptPath: " + this.toolInsertScriptPath);
System.out.println("ToolLibraryInsertScriptPath: " + this.toolLibraryInsertScriptPath);
System.out.println("ToolActivityInsertScriptPath: " + this.toolActivityInsertScriptPath);
@@ -462,20 +449,6 @@
}
/**
- * @return Returns the toolInstertScriptPath
- */
- public String getToolUpdateScriptPath() {
- return toolUpdateScriptPath;
- }
-
- /**
- * @param toolUpdateScriptPath The toolInsertScriptPath to set.
- */
- public void setToolUpdateScriptPath(String toolUpdateScriptPath) {
- this.toolUpdateScriptPath = toolUpdateScriptPath;
- }
-
- /**
* @return Returns the toolInsertScriptPath.
*/
public String getToolInsertScriptPath() {
@@ -613,7 +586,6 @@
if ( isGenerateForInstallers() ) {
System.out.println("Stripping paths output path "+outputPath);
int lengthOfPath = outputPath.length();
- toolUpdateScriptPath = stripPath(toolUpdateScriptPath, outputPath, lengthOfPath);
toolInsertScriptPath = stripPath(toolInsertScriptPath, outputPath, lengthOfPath);
toolLibraryInsertScriptPath = stripPath(toolLibraryInsertScriptPath, outputPath, lengthOfPath);
toolActivityInsertScriptPath = stripPath(toolActivityInsertScriptPath, outputPath, lengthOfPath);
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTask.java
===================================================================
diff -u -r19ee29ae5f88059a3941ba2e5341be261f75d13b -r42fe359dd29180620751f3c218b0ee39820c2f8f
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTask.java (.../ToolDBDeployTask.java) (revision 19ee29ae5f88059a3941ba2e5341be261f75d13b)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTask.java (.../ToolDBDeployTask.java) (revision 42fe359dd29180620751f3c218b0ee39820c2f8f)
@@ -57,11 +57,6 @@
private String toolTablesScriptPath;
/**
- * Holds value of property toolUpdateScriptPath
- */
- private String toolUpdateScriptPath;
-
- /**
* File path to insert autopatch version script
*/
private String toolDBVersionScriptPath;
@@ -89,15 +84,6 @@
}
/**
- * Setter for property toolUpdateFile.
- * @param toolUpdateFile New value of property toolUpdateFile.
- */
- public void setToolUpdateScriptPath(String toolUpdateScriptPath)
- {
- this.toolUpdateScriptPath = toolUpdateScriptPath;
- }
-
- /**
* Setter for property toolInsertFile.
* @param toolInsertFile New value of property toolInsertFile.
*/
@@ -407,30 +393,6 @@
}
}
-
- public void runToolUpdateScript (final String scriptSQL)
- {
- try
- {
- File updateScript = new File(scriptSQL);
- if (updateScript.exists())
- {
- System.out.println("Updating database with script: " + scriptSQL);
- Connection conn = this.getConnection();
- runScript(readFile(updateScript), conn);
- conn.close();
- System.out.println("Database updated");
- }
- else
- {
- System.out.println("No update file found at " +scriptSQL+ ", continuing install without database update script.");
- }
- }
- catch (SQLException se)
- {
- throw new DeployException("Failed to execute update script: " + scriptSQL);
- }
- }
/**
* Getter for property defaultContentId.
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_eadventure/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_eadventure/db/sql/updatescripts/updateTo20080229.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_forum/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_forum/db/sql/updatescripts/updateTo20080220.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_images/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_images/db/sql/updatescripts/updateTo20080229.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_imscc/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_imscc/db/sql/updatescripts/updateTo20080229.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_lamc/db/sql/updatescripts/updateTo20070214.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_laqa/db/sql/updatescripts/updateTo20070214.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_laqa/db/sql/updatescripts/updateTo20080108.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_laqa/db/sql/updatescripts/updateTo20101022.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_larsrc/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_larsrc/db/sql/updatescripts/updateTo20080229.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_mindmap/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_mindmap/db/sql/updatescripts/updateTo20080229.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_nb/db/sql/updatescripts/updateTo20070214.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_nb/db/sql/updatescripts/updateTo20070315.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_notebook/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_notebook/db/sql/updatescripts/updateTo20080229.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_sbmt/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_sbmt/db/sql/updatescripts/updateTo20080509.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_scribe/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_scribe/db/sql/updatescripts/updateTo20070315.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_scribe/db/sql/updatescripts/updateTo20071113.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_scribe/db/sql/updatescripts/updateTo20080229.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_spreadsheet/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_spreadsheet/db/sql/updatescripts/updateTo20080229.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_survey/db/sql/updatescripts/updateTo20070220.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_survey/db/sql/updatescripts/updateTo20080229.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_task/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/updatescripts/updateTo20070227.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/updatescripts/updateTo20080229.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_vote/db/sql/updatescripts/updateTo20070214.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 42fe359dd29180620751f3c218b0ee39820c2f8f refers to a dead (removed) revision in file `lams_tool_vote/db/sql/updatescripts/updateTo20080326.sql'.
Fisheye: No comparison available. Pass `N' to diff?