Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar =================================================================== diff -u -r49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6 -r3a8216a0f97d66b941870386f80f9288f2a4c4dc Binary files differ Index: lams_tool_deploy/build.xml =================================================================== diff -u -rfc085e0eda6c46d659c5b98f9ee9e29f495af042 -r3a8216a0f97d66b941870386f80f9288f2a4c4dc --- lams_tool_deploy/build.xml (.../build.xml) (revision fc085e0eda6c46d659c5b98f9ee9e29f495af042) +++ lams_tool_deploy/build.xml (.../build.xml) (revision 3a8216a0f97d66b941870386f80f9288f2a4c4dc) @@ -10,6 +10,7 @@ + @@ -69,6 +70,10 @@ + + + + Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r3a8216a0f97d66b941870386f80f9288f2a4c4dc --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java (.../DeployConfig.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java (.../DeployConfig.java) (revision 3a8216a0f97d66b941870386f80f9288f2a4c4dc) @@ -64,7 +64,8 @@ public static final String DB_PASSWORD = "dbPassword"; public static final String DB_DRIVER_CLASS = "dbDriverClass"; public static final String DB_DRIVER_URL = "dbDriverUrl"; - public static final String TOOL_SIGNATURE = "toolSignature"; + public static final String TOOL_SIGNATURE = "toolSignature"; + public static final String TOOL_VERSION = "toolVersion"; 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 -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r3a8216a0f97d66b941870386f80f9288f2a4c4dc --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision 3a8216a0f97d66b941870386f80f9288f2a4c4dc) @@ -63,8 +63,13 @@ * Holds value of property toolSignature. */ private String toolSignature; - + /** + * Holds value of property toolVersion. + */ + private String toolVersion; + + /** * Holds value of property toolWebUri. */ private String toolWebUri; @@ -169,6 +174,11 @@ toolSignature = value; } + + if ( key.equalsIgnoreCase(TOOL_VERSION) ) { + + toolVersion = value; + } if ( key.equalsIgnoreCase(TOOL_WEB_URI) ) { toolWebUri = value; @@ -277,6 +287,8 @@ super.copyProperties(config); if (config.getToolSignature() != null) this.toolSignature = config.getToolSignature(); + if (config.getToolVersion() != null) + this.toolVersion = config.getToolVersion(); if (config.getToolWebUri() != null) this.toolWebUri = config.getToolWebUri(); if (config.getToolContext() != null) @@ -307,6 +319,7 @@ { super.printObjectProperties(); System.out.println("Tool Signature: " + this.toolSignature); + System.out.println("Tool Version: " + this.toolVersion); System.out.println("ToolWebUri: " + this.toolWebUri); System.out.println("ToolContext: " + this.toolContext); System.out.println("ToolInsertScriptPath: " + this.toolInsertScriptPath); @@ -402,12 +415,24 @@ return toolSignature; } /** + * @return Returns the toolVersion. + */ + public String getToolVersion() { + return toolVersion; + } + /** * @param toolSignature The toolSignature to set. */ public void setToolSignature(String toolSignature) { this.toolSignature = toolSignature; } /** + * @param toolVersion The toolVersion to set. + */ + public void setToolVersion(String toolVersion) { + this.toolVersion = toolVersion; + } + /** * @return Returns the toolTablesDeleteScriptPath. */ public String getToolTablesDeleteScriptPath() {