Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java =================================================================== diff -u -r80b79caffb24c6e12d0c308ca492bb70751e3415 -r5de58095d1e02a1410299d4aae62576302c579cc --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision 80b79caffb24c6e12d0c308ca492bb70751e3415) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision 5de58095d1e02a1410299d4aae62576302c579cc) @@ -57,7 +57,9 @@ private static final String TOOL_APP_CONTEXT_FILE_PATH = "toolApplicationContextPath"; private static final String TOOL_JAR_FILE_NAME = "toolJarFileName"; private static final String DEPLOY_FILES= "deployFiles"; + private static final String MIN_SERVER_VERSION_NUMBER= "minServerVersionNumber"; protected static final String LANGUAGE_FILES= "languageFiles"; + /** @@ -125,6 +127,11 @@ */ private String toolJarFileName; + /** + * Holds the value of property minServerVersionNumber. + */ + private String minServerVersionNumber; + /** * Holds value of property deployFiles. */ @@ -235,6 +242,10 @@ toolJarFileName = value; } + if ( key.equalsIgnoreCase(MIN_SERVER_VERSION_NUMBER) ) { + minServerVersionNumber = value; + } + if ( key.equalsIgnoreCase(DEPLOY_FILES) ) { deployFiles = convertList(value); } @@ -286,6 +297,7 @@ valid = valid && validateStringProperty(toolWebUri, TOOL_TABLES_SCRIPT_PATH); valid = valid && validateStringProperty(toolApplicationContextPath, TOOL_APP_CONTEXT_FILE_PATH); valid = valid && validateStringProperty(toolJarFileName,TOOL_JAR_FILE_NAME); + valid = valid && validateStringProperty(minServerVersionNumber,MIN_SERVER_VERSION_NUMBER); valid = valid && validateStringProperty(getDbUsername(), DB_USERNAME); valid = valid && validateStringProperty(getDbPassword(), DB_PASSWORD); valid = valid && validateStringProperty(getDbDriverClass(), DB_PASSWORD); @@ -330,6 +342,8 @@ this.toolApplicationContextPath = config.getToolApplicationContextPath(); if ( config.getToolJarFileName() != null ) this.toolJarFileName = config.getToolJarFileName(); + if ( config.getMinServerVersionNumber() != null ) + this.minServerVersionNumber = config.getMinServerVersionNumber(); if (config.getDeployFiles() != null) this.deployFiles = config.getDeployFiles(); if (config.getLanguageFiles() != null) @@ -354,6 +368,8 @@ System.out.println("ToolTableDeleteScriptPath: " + this.toolTablesDeleteScriptPath); System.out.println("ToolApplicationContextPath: " + this.toolApplicationContextPath); System.out.println("ToolJarFileName: "+this.toolJarFileName); + System.out.println("MinServerVersionNumber: "+this.minServerVersionNumber); + ArrayList list = this.deployFiles; for(int i=0; i