Index: lams_build/build_tools_base.xml =================================================================== diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -rb6159ecd849c58b23795d7b5eeb05cdeb5f532da --- lams_build/build_tools_base.xml (.../build_tools_base.xml) (revision 65efb0abb529cafc1977e284e2c9a4ed33722334) +++ lams_build/build_tools_base.xml (.../build_tools_base.xml) (revision b6159ecd849c58b23795d7b5eeb05cdeb5f532da) @@ -26,7 +26,6 @@ - clean-db --> Removes DB tables and entries build-db --> Creates database tables and entries deploy-tool --> Deploys all Tool content @@ -35,15 +34,7 @@ - - - ${ant.project.name}: Dropping Tool database tables - - - - - ${ant.project.name}: Creating Tool database tables @@ -79,7 +70,6 @@ ${ant.project.name}: Copying Tool SQL files - @@ -141,7 +131,6 @@ hideTool="${tool.hide}" minServerVersionNumber="${min.server.version.number}" toolTablesScriptPath="${basedir}/build/deploy/sql/${tool.build.sql.create}" - toolTablesDeleteScriptPath="${basedir}/build/deploy/sql/${tool.build.sql.drop}" toolActivityInsertScriptPath="${basedir}/build/deploy/sql/activity_insert.sql" toolLibraryInsertScriptPath="${basedir}/build/deploy/sql/library_insert.sql" toolInsertScriptPath="${basedir}/build/deploy/sql/tool_insert.sql" Index: lams_build/common.properties =================================================================== diff -u -r126f035c48e99c5c295d765d68f6921ed7ba3502 -rb6159ecd849c58b23795d7b5eeb05cdeb5f532da --- lams_build/common.properties (.../common.properties) (revision 126f035c48e99c5c295d765d68f6921ed7ba3502) +++ lams_build/common.properties (.../common.properties) (revision b6159ecd849c58b23795d7b5eeb05cdeb5f532da) @@ -48,7 +48,6 @@ # Tool SQL files tool.build.sql.create=create_lams_tool_${tool.short.name}.sql -tool.build.sql.drop=drop_lams_tool_${tool.short.name}.sql #======== END TOOL PROPERTIES ========= Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar =================================================================== diff -u -raf59b708be7a54320ef016c27577b4638a2a29ec -rb6159ecd849c58b23795d7b5eeb05cdeb5f532da Binary files differ Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_assessment/db/sql/drop_lams_tool_assessment.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_bbb/db/sql/drop_lams_tool_bbb.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_chat/db/sql/drop_lams_tool_chat.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_daco/db/sql/drop_lams_tool_daco.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rb6159ecd849c58b23795d7b5eeb05cdeb5f532da --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision b6159ecd849c58b23795d7b5eeb05cdeb5f532da) @@ -32,8 +32,7 @@ * 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 is needed. * * @author Chris Perfect, modifications by Fiona Malikoff, Luke Foxton */ @@ -133,18 +132,6 @@ // 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()); Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rb6159ecd849c58b23795d7b5eeb05cdeb5f532da --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision b6159ecd849c58b23795d7b5eeb05cdeb5f532da) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.deploy; import java.io.IOException; @@ -53,7 +52,6 @@ private static final String TOOL_INSERT_SCRIPT_PATH = "toolInsertScriptPath"; private static final String TOOL_LIBRARY_INSERT_SCRIPT_PATH = "toolLibraryInsertScriptPath"; private static final String TOOL_TABLES_SCRIPT_PATH = "toolTablesScriptPath"; - private static final String TOOL_TABLES_DELETE_SCRIPT_PATH = "toolTablesDeleteScriptPath"; private static final String TOOL_DB_VERSION_SCRIPT_PATH = "toolDBVersionScriptPath"; private static final String TOOL_APP_CONTEXT_FILE_PATH = "toolApplicationContextPath"; private static final String TOOL_JAR_FILE_NAME = "toolJarFileName"; @@ -112,18 +110,10 @@ private String toolTablesScriptPath; /** - * Holds value of property toolTablesDeleteScriptPath. - */ - private String toolTablesDeleteScriptPath; - - /** * Holds value of property toolDBVersionScriptPath. */ private String toolDBVersionScriptPath; - /** - * Holds value of property toolTablesDeleteScriptPath. - */ private String toolApplicationContextPath; /** @@ -157,7 +147,7 @@ /** * Creates an instance of DeployToolConfig object, with the values * of its properties, set to that specified by the Xml configuration file - * + * * @param configurationFilePath * - only needed when generating the initial deploy.xml * @throws ParserConfigurationException @@ -237,10 +227,6 @@ toolTablesScriptPath = value; } - if (key.equalsIgnoreCase(TOOL_TABLES_DELETE_SCRIPT_PATH)) { - toolTablesDeleteScriptPath = value; - } - if (key.equalsIgnoreCase(TOOL_DB_VERSION_SCRIPT_PATH)) { toolDBVersionScriptPath = value; } @@ -281,7 +267,7 @@ /** * Converts a String to a List. Entries should be comma separated. - * + * * @param Input * string containing entries. * @return List of (String) properties, null if not found. @@ -331,7 +317,7 @@ * Upon deserialisation of the xml string, a new object will be created. * The properties of this object will be copied to the calling object. * Only copy properties if the properties are not null - * + * * @param config */ protected void copyProperties(DeployToolConfig config) { @@ -361,9 +347,6 @@ if (config.getToolTablesScriptPath() != null) { this.toolTablesScriptPath = config.getToolTablesScriptPath(); } - if (config.getToolTablesDeleteScriptPath() != null) { - this.toolTablesDeleteScriptPath = config.getToolTablesDeleteScriptPath(); - } if (config.getToolDBVersionScriptPath() != null) { this.toolDBVersionScriptPath = config.getToolDBVersionScriptPath(); } @@ -398,7 +381,6 @@ System.out.println("ToolLibraryInsertScriptPath: " + this.toolLibraryInsertScriptPath); System.out.println("ToolActivityInsertScriptPath: " + this.toolActivityInsertScriptPath); System.out.println("ToolTableScriptPath: " + this.toolTablesScriptPath); - System.out.println("ToolTableDeleteScriptPath: " + this.toolTablesDeleteScriptPath); System.out.println("ToolDBVersionScriptPath: " + this.toolDBVersionScriptPath); System.out.println("ToolApplicationContextPath: " + this.toolApplicationContextPath); System.out.println("ToolJarFileName: " + this.toolJarFileName); @@ -541,21 +523,6 @@ } /** - * @return Returns the toolTablesDeleteScriptPath. - */ - public String getToolTablesDeleteScriptPath() { - return toolTablesDeleteScriptPath; - } - - /** - * @param toolTablesDeleteScriptPath - * The toolTablesDeleteScriptPath to set. - */ - public void setToolTablesDeleteScriptPath(String toolTablesDeleteScriptPath) { - this.toolTablesDeleteScriptPath = toolTablesDeleteScriptPath; - } - - /** * @return Returns the toolTablesScriptPath. */ public String getToolTablesScriptPath() { @@ -641,7 +608,6 @@ toolLibraryInsertScriptPath = stripPath(toolLibraryInsertScriptPath, outputPath, lengthOfPath); toolActivityInsertScriptPath = stripPath(toolActivityInsertScriptPath, outputPath, lengthOfPath); toolTablesScriptPath = stripPath(toolTablesScriptPath, outputPath, lengthOfPath); - toolTablesDeleteScriptPath = stripPath(toolTablesDeleteScriptPath, outputPath, lengthOfPath); if (toolDBVersionScriptPath != null && toolDBVersionScriptPath.trim().length() > 0) { toolDBVersionScriptPath = stripPath(toolDBVersionScriptPath, outputPath, lengthOfPath); } Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBRemoveToolEntriesTask.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/templateDeployTool.xml =================================================================== diff -u -rc6c6b31e86ee6b43fc6dd424a21b562cc7de4d4c -rb6159ecd849c58b23795d7b5eeb05cdeb5f532da --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/templateDeployTool.xml (.../templateDeployTool.xml) (revision c6c6b31e86ee6b43fc6dd424a21b562cc7de4d4c) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/templateDeployTool.xml (.../templateDeployTool.xml) (revision b6159ecd849c58b23795d7b5eeb05cdeb5f532da) @@ -11,7 +11,6 @@ test/file/sql/library_insert.sql test/file/sql/activity_insert.sql test/file/sql/create_tool_tables.sql - Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_eadventure/db/sql/drop_lams_tool_eadventure.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_forum/db/sql/drop_lams_tool_forum.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_gmap/db/sql/drop_lams_tool_gmap.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_images/db/sql/drop_lams_tool_imageGallery.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_imscc/db/sql/drop_lams_tool_commonCartridge.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_kaltura/db/sql/drop_lams_tool_kaltura.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_lamc/db/sql/drop_lams_tool_mc.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_laqa/db/sql/drop_lams_tool_qa.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_larsrc/db/sql/drop_lams_tool_rsrc.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_leader/db/sql/drop_lams_tool_leaderselection.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_mindmap/db/sql/drop_lams_tool_mindmap.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/build.properties =================================================================== diff -u -r5df0d44b0e94fca808f5d4f70fc01c0c428c3dfe -rb6159ecd849c58b23795d7b5eeb05cdeb5f532da --- lams_tool_nb/build.properties (.../build.properties) (revision 5df0d44b0e94fca808f5d4f70fc01c0c428c3dfe) +++ lams_tool_nb/build.properties (.../build.properties) (revision b6159ecd849c58b23795d7b5eeb05cdeb5f532da) @@ -11,7 +11,6 @@ # Tool SQL files tool.build.sql.create=create_lams_tool_nb.sql -tool.build.sql.drop=drop_lams_tool_nb.sql ## Test toolContentID test.contentid=355 \ No newline at end of file Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_nb/db/sql/drop_lams_tool_nb.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_notebook/db/sql/drop_lams_tool_notebook.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_pixlr/db/sql/drop_lams_tool_pixlr.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_preview/db/sql/drop_lams_tool_peerreview.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_sbmt/db/sql/drop_lams_tool_sbmt.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_scratchie/db/sql/drop_lams_tool_scratchie.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_scribe/db/sql/drop_lams_tool_scribe.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_spreadsheet/db/sql/drop_lams_tool_spreadsheet.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_survey/db/sql/drop_lams_tool_survey.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_task/db/sql/drop_lams_tool_taskList.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/drop_lams_tool_videoRecorder.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_wiki/db/sql/drop_lams_tool_wiki.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6159ecd849c58b23795d7b5eeb05cdeb5f532da refers to a dead (removed) revision in file `lams_tool_wookie/db/sql/drop_lams_tool_wookie.sql'. Fisheye: No comparison available. Pass `N' to diff?