Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/deploy-tool/lib/lams-tool-deploy.jar,v
diff -u -r1.21 -r1.22
Binary files differ
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java,v
diff -u -r1.22 -r1.23
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java	23 Sep 2008 04:21:26 -0000	1.22
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java	24 Sep 2008 03:36:39 -0000	1.23
@@ -184,7 +184,10 @@
             dbDeployTask.setToolLibraryInsertScriptPath(config.getToolLibraryInsertScriptPath());
             dbDeployTask.setToolActivityInsertScriptPath(config.getToolActivityInsertScriptPath());
             dbDeployTask.setToolTablesScriptPath(config.getToolTablesScriptPath());
-            dbDeployTask.setToolDBVersionScriptPath(config.getToolDBVersionScriptPath());
+            if (config.getToolDBVersionScriptPath() != null 
+        	    && config.getToolDBVersionScriptPath().trim().length() > 0) {
+        	dbDeployTask.setToolDBVersionScriptPath(config.getToolDBVersionScriptPath());
+            }
             dbDeployTask.execute();
             
             System.out.println("Deploying files to ear");
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java,v
diff -u -r1.17 -r1.18
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java	23 Sep 2008 04:21:26 -0000	1.17
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java	24 Sep 2008 03:36:39 -0000	1.18
@@ -298,7 +298,9 @@
        return list;
    }
    
-   /** Check that all the correct properties exist - tool delete path is optional. */
+   /** Check that all the correct properties exist - tool delete path is optional. 
+    *  toolDBVersionScriptPath is also optional. 
+    */
    public void validateProperties() throws DeployException {
        boolean valid;
        validationError = ""; // object attribute - will be updated by validateProperty() if something is missing.
@@ -311,7 +313,7 @@
        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);
-       valid = valid && validateStringProperty(toolDBVersionScriptPath, TOOL_DB_VERSION_SCRIPT_PATH);
+       //valid = valid && validateStringProperty(toolDBVersionScriptPath, TOOL_DB_VERSION_SCRIPT_PATH);
        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);
@@ -617,7 +619,9 @@
 	    	toolActivityInsertScriptPath = stripPath(toolActivityInsertScriptPath, outputPath, lengthOfPath);
 	    	toolTablesScriptPath = stripPath(toolTablesScriptPath, outputPath, lengthOfPath);
 	    	toolTablesDeleteScriptPath = stripPath(toolTablesDeleteScriptPath, outputPath, lengthOfPath);
-	    	toolDBVersionScriptPath = stripPath(toolDBVersionScriptPath, outputPath, lengthOfPath);
+	    	if (toolDBVersionScriptPath != null && toolDBVersionScriptPath.trim().length() > 0) {
+	    	    toolDBVersionScriptPath = stripPath(toolDBVersionScriptPath, outputPath, lengthOfPath);
+	    	}
 	    	
 	    	ArrayList<String> newLanguageFiles = new ArrayList<String>(languageFiles.size());
 	    	for ( String file : languageFiles ) {
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTask.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTask.java,v
diff -u -r1.14 -r1.15
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTask.java	23 Sep 2008 04:21:26 -0000	1.14
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTask.java	24 Sep 2008 03:36:39 -0000	1.15
@@ -149,7 +149,9 @@
         toolLibraryInsertScript = new File(toolLibraryInsertScriptPath);
         toolActivityInsertScript = new File(toolActivityInsertScriptPath);
         toolTablesScript = new File(toolTablesScriptPath);
-        toolDBVersionScript = new File(toolDBVersionScriptPath);
+        if (toolDBVersionScriptPath != null && toolDBVersionScriptPath.trim().length() > 0) {
+            toolDBVersionScript = new File(toolDBVersionScriptPath);
+        }
         //get a connection
         Connection conn = getConnection();
         try
@@ -198,7 +200,9 @@
             runScript(toolTablesScriptSQL, conn);
             
             //run the db version script
-            runScript(readFile(toolDBVersionScript), conn);
+            if (toolDBVersionScriptPath != null && toolDBVersionScriptPath.trim().length() > 0) {
+        	runScript(readFile(toolDBVersionScript), conn);
+            }
             
             //commit transaction
             conn.commit();