Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java =================================================================== diff -u -r1e0112c787e72a7240ef2aea57fabd73babda639 -ra5425d215a89d57b7c88049b0f717e61ecbbcb93 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java (.../DeployConfig.java) (revision 1e0112c787e72a7240ef2aea57fabd73babda639) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java (.../DeployConfig.java) (revision a5425d215a89d57b7c88049b0f717e61ecbbcb93) @@ -66,6 +66,8 @@ public static final String DB_DRIVER_URL = "dbDriverUrl"; 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"; @@ -78,6 +80,10 @@ */ protected String toolVersion; + /** + * Holds the value of property hideTool + */ + protected boolean hideTool; /** * Holds value of property dbDriverClass. @@ -343,6 +349,11 @@ 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 -r1e0112c787e72a7240ef2aea57fabd73babda639 -ra5425d215a89d57b7c88049b0f717e61ecbbcb93 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision 1e0112c787e72a7240ef2aea57fabd73babda639) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision a5425d215a89d57b7c88049b0f717e61ecbbcb93) @@ -58,6 +58,7 @@ private static final String TOOL_JAR_FILE_NAME = "toolJarFileName"; private static final String DEPLOY_FILES= "deployFiles"; protected static final String LANGUAGE_FILES= "languageFiles"; + /** * Holds value of property toolSignature. @@ -80,6 +81,11 @@ private String toolContext; /** + * Holds value of propert toolUpdateScriptPath + */ + private String toolUpdateScriptPath; + + /** * Holds value of property toolInsertScriptPath. */ private String toolInsertScriptPath; @@ -179,6 +185,11 @@ toolVersion = value; } + + if ( key.equalsIgnoreCase(TOOL_VERSION) ) { + + hideTool = java.lang.Boolean.parseBoolean(value); + } if ( key.equalsIgnoreCase(TOOL_WEB_URI) ) { toolWebUri = value; @@ -187,7 +198,11 @@ if ( key.equalsIgnoreCase(TOOL_CONTEXT) ) { toolContext = value; } - + + if ( key.equalsIgnoreCase(TOOL_UPDATE_SCRIPT_PATH) ) { + toolUpdateScriptPath = value; + } + if ( key.equalsIgnoreCase(TOOL_INSERT_SCRIPT_PATH) ) { toolInsertScriptPath = value; } @@ -260,6 +275,7 @@ 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); @@ -288,12 +304,15 @@ if (config.getToolSignature() != null) this.toolSignature = config.getToolSignature(); if (config.getToolVersion() != null) - this.toolVersion = config.getToolVersion(); + this.toolVersion = config.getToolVersion(); + this.hideTool = config.getHideTool(); if (config.getToolWebUri() != null) this.toolWebUri = config.getToolWebUri(); 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(); @@ -320,8 +339,10 @@ super.printObjectProperties(); System.out.println("Tool Signature: " + this.toolSignature); System.out.println("Tool Version: " + this.toolVersion); + 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); @@ -383,7 +404,35 @@ public void setToolContext(String toolContextRoot) { this.toolContext = toolContextRoot; } + /** + * @return Returns the thideTool. + */ + public boolean getHideTool() { + return hideTool; + } + /** + * @param hideTool The toolContextRoot to set. + */ + public void setHideTool(boolean hideTool) { + this.hideTool = hideTool; + } + + /** + * @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() { @@ -433,6 +482,7 @@ this.toolVersion = toolVersion; } + /** * @return Returns the toolTablesDeleteScriptPath. */ Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBUpdater.java =================================================================== diff -u -rff3f79a41e224643f7126174cba605cf031c81fe -ra5425d215a89d57b7c88049b0f717e61ecbbcb93 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBUpdater.java (.../ToolDBUpdater.java) (revision ff3f79a41e224643f7126174cba605cf031c81fe) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBUpdater.java (.../ToolDBUpdater.java) (revision a5425d215a89d57b7c88049b0f717e61ecbbcb93) @@ -55,6 +55,7 @@ // Holds the value of property toolNewer private boolean toolNewer; + /** * Creates instance of ToolDBUpdater */