Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java =================================================================== diff -u -rff3f79a41e224643f7126174cba605cf031c81fe -r80b79caffb24c6e12d0c308ca492bb70751e3415 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision ff3f79a41e224643f7126174cba605cf031c81fe) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision 80b79caffb24c6e12d0c308ca492bb70751e3415) @@ -98,8 +98,9 @@ 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 @@ -124,9 +125,18 @@ deployLanguageFilesTask.execute(); } - // Enabling the tool so it can now be used by LAMS - dbUpdater.activateTool(toolSignature, 1); - + // 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.activateTool(toolSignature, 0); + } + System.out.println("Tool update completed"); System.exit(0); } @@ -201,16 +211,27 @@ updateWebXmlTask.setJarFileName(config.getToolJarFileName()); updateWebXmlTask.execute(); - System.out.println("Activating Tool in LAMS"); - ToolDBActivateTask dbActivateTask = new ToolDBActivateTask(); - dbActivateTask.setDbUsername(config.getDbUsername()); - dbActivateTask.setDbPassword(config.getDbPassword()); - dbActivateTask.setDbDriverClass(config.getDbDriverClass()); - dbActivateTask.setDbDriverUrl(config.getDbDriverUrl()); - dbActivateTask.setLearningLibraryId(dbDeployTask.getLearningLibraryId()); - dbActivateTask.setToolId(dbDeployTask.getToolId()); - dbActivateTask.execute(); + if (config.getHideTool()==false) + { + System.out.println("Activating Tool: " + config.getToolSignature()); + dbUpdater.activateTool(config.getToolSignature(), 1); + + /*ToolDBActivateTask dbActivateTask = new ToolDBActivateTask(); + dbActivateTask.setDbUsername(config.getDbUsername()); + dbActivateTask.setDbPassword(config.getDbPassword()); + dbActivateTask.setDbDriverClass(config.getDbDriverClass()); + dbActivateTask.setDbDriverUrl(config.getDbDriverUrl()); + dbActivateTask.setLearningLibraryId(dbDeployTask.getLearningLibraryId()); + dbActivateTask.setToolId(dbDeployTask.getToolId()); + dbActivateTask.execute();*/ + } + else + { + System.out.println("Hiding tool: " + config.getToolSignature()); + dbUpdater.activateTool(config.getToolSignature(), 0); + } + System.out.println("Tool Deployed"); } catch (Exception ex) Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java =================================================================== diff -u -ra5425d215a89d57b7c88049b0f717e61ecbbcb93 -r80b79caffb24c6e12d0c308ca492bb70751e3415 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java (.../DeployConfig.java) (revision a5425d215a89d57b7c88049b0f717e61ecbbcb93) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java (.../DeployConfig.java) (revision 80b79caffb24c6e12d0c308ca492bb70751e3415) @@ -80,11 +80,8 @@ */ protected String toolVersion; - /** - * Holds the value of property hideTool - */ - protected boolean hideTool; + /** * Holds value of property dbDriverClass. */ @@ -349,11 +346,8 @@ return toolVersion; } - public boolean getHideTool() - { - return hideTool; - } + /** Used for testing purposes only */ public void printObjectProperties() Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java =================================================================== diff -u -ra5425d215a89d57b7c88049b0f717e61ecbbcb93 -r80b79caffb24c6e12d0c308ca492bb70751e3415 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision a5425d215a89d57b7c88049b0f717e61ecbbcb93) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision 80b79caffb24c6e12d0c308ca492bb70751e3415) @@ -96,6 +96,11 @@ private String toolLibraryInsertScriptPath; /** + * Holds the value of property hideTool + */ + private boolean hideTool; + + /** * Holds value of property toolActivityInsertScriptPath. */ private String toolActivityInsertScriptPath; @@ -186,8 +191,7 @@ toolVersion = value; } - if ( key.equalsIgnoreCase(TOOL_VERSION) ) { - + if ( key.equalsIgnoreCase(HIDE_TOOL) ) { hideTool = java.lang.Boolean.parseBoolean(value); } @@ -523,6 +527,8 @@ public ArrayList getLanguageFiles() { return languageFiles; } + + public void setLanguageFiles(ArrayList languageFiles) { this.languageFiles = languageFiles; Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBUpdater.java =================================================================== diff -u -ra5425d215a89d57b7c88049b0f717e61ecbbcb93 -r80b79caffb24c6e12d0c308ca492bb70751e3415 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBUpdater.java (.../ToolDBUpdater.java) (revision a5425d215a89d57b7c88049b0f717e61ecbbcb93) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBUpdater.java (.../ToolDBUpdater.java) (revision 80b79caffb24c6e12d0c308ca492bb70751e3415) @@ -36,13 +36,7 @@ * @author Luke Foxton */ public class ToolDBUpdater extends DBTask -{ - // Holds value of property toolId - private long toolId; - - // Holds value of property learningLibraryId. - private long learningLibraryId; - +{ // Holds value of property toolSignature private String toolSignature; @@ -74,7 +68,6 @@ PreparedStatement stmt = null; try { - System.out.println("TEST: UPDATE lams_tool SET tool_version = \"" +toolVersion+ "\" WHERE tool_signature = \"" +toolSignature+ "\""); stmt = conn.prepareStatement("UPDATE lams_tool SET tool_version = \"" +toolVersion+ "\" WHERE tool_signature = \"" +toolSignature+ "\""); stmt.execute(); } @@ -101,16 +94,12 @@ { stmt = conn.prepareStatement("SELECT tool_version FROM lams_tool WHERE tool_signature=\""+toolSignature+"\""); results = stmt.executeQuery(); - System.out.println("SELECT tool_version FROM lams_tool WHERE tool_signature=\""+toolSignature+"\""); if (results.first()) { toolExists = true; double dbVersion = java.lang.Double.parseDouble(results.getString("tool_version")); double instVersion = java.lang.Double.parseDouble(toolVersion); - - System.out.println("TEST: dbVersion = " + dbVersion); - System.out.println("TEST: instVersion = " + instVersion); - + if (instVersion > dbVersion) { toolNewer = true; @@ -148,10 +137,22 @@ { Connection conn = getConnection(); PreparedStatement stmt = null; + ResultSet results = null; try { stmt = conn.prepareStatement("UPDATE lams_tool SET valid_flag = "+flag+" WHERE tool_signature = \"" +toolSig+ "\""); stmt.execute(); + + stmt = conn.prepareStatement("SELECT learning_library_id FROM lams_tool WHERE tool_signature=\""+toolSignature+"\""); + results = stmt.executeQuery(); + + if (results.first()) + { + double llid = results.getDouble("learning_library_id"); + + stmt = conn.prepareStatement("UPDATE lams_learning_library SET valid_flag = "+flag+" WHERE learning_library_id = \"" +llid+ "\""); + stmt.execute(); + } } catch (SQLException se) { @@ -163,23 +164,7 @@ } } - - - - /** - * set method for toolId - * @param toolId The toolId to be set - */ - public void setToolId(long toolId) {this.toolId = toolId;} - - /** - * set method for learningLibraryId - * @param id The LearningLibrayId to be set - */ - public void setLearningLibraryId(long id) {this.learningLibraryId = id;} - - /** * set method for toolSignature * @param sig The toolSignature to be set */ Index: lams_tool_scribe/build.properties =================================================================== diff -u -r72b6b6e1dd023b2cf48526d929dc7eb40bf364fb -r80b79caffb24c6e12d0c308ca492bb70751e3415 --- lams_tool_scribe/build.properties (.../build.properties) (revision 72b6b6e1dd023b2cf48526d929dc7eb40bf364fb) +++ lams_tool_scribe/build.properties (.../build.properties) (revision 80b79caffb24c6e12d0c308ca492bb70751e3415) @@ -5,6 +5,9 @@ # project version tool.version=20061024 +# hide tool option +hideTool=true + package=org/lamsfoundation/lams/tool/scribe package.name=org.lamsfoundation.lams.tool.scribe weblib=lib Index: lams_tool_scribe/build.xml =================================================================== diff -u -r6bfe987420fb2770e06815edcd57c0f95c51c90b -r80b79caffb24c6e12d0c308ca492bb70751e3415 --- lams_tool_scribe/build.xml (.../build.xml) (revision 6bfe987420fb2770e06815edcd57c0f95c51c90b) +++ lams_tool_scribe/build.xml (.../build.xml) (revision 80b79caffb24c6e12d0c308ca492bb70751e3415) @@ -403,6 +403,8 @@ toolJarFileName="${product}.jar" toolSignature="${signature}" toolVersion="${tool.version}" + hideTool="${hideTool}" + toolUpdateScriptPath="${build.deploy}/sql/updateTo${tool.version}.sql" toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_scribe.sql" toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_scribe.sql" toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" @@ -439,13 +441,13 @@ - Marking activity as invalid - set it to valid if debugging or use the combined chat/scribe or forum/scribe activity. This is not an error. +