Index: win_installer/src/build.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/build.xml,v
diff -u -r1.7 -r1.8
--- win_installer/src/build.xml	22 Jun 2007 03:11:12 -0000	1.7
+++ win_installer/src/build.xml	10 Aug 2007 06:41:40 -0000	1.8
@@ -90,13 +90,12 @@
 	<target name="import-db">
 		<sql driver="com.mysql.jdbc.Driver" 
 			classpath="${EARDIR}/mysql-connector-java-3.1.12-bin.jar" 
-			url="jdbc:mysql://localhost/${DB_NAME}?characterEncoding=UTF-8" 
+			url="jdbc:mysql://${MYSQL_HOST}/${DB_NAME}?characterEncoding=UTF-8" 
 			userid="${DB_USER}" 
 			password="${DB_PASS}"
 			encoding="utf8">
 			<transaction src="${TEMP}/dump.sql" />
 			<transaction src="${INSTDIR}/update_lams_configuration.sql" />
 		</sql>
-	</target>
-	
+	</target>	
 </project>
\ No newline at end of file
Index: win_installer/src/checkmysqlversion.java
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/checkmysqlversion.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/src/checkmysqlversion.java	10 Aug 2007 06:41:40 -0000	1.1
@@ -0,0 +1,97 @@
+import java.io.File;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.Properties;
+import java.sql.SQLException;
+import java.net.UnknownHostException;
+
+public class checkmysqlversion
+{
+	private String dbDriverClass;
+    private String dbDriverUrl;
+    private String dbUsername;
+	private String dbPassword;
+	
+	private double minMysqlVersion;
+	
+	// Check that the mysql version is valid
+	public static void main(String[] args) throws SQLException, UnknownHostException
+	{
+		System.out.println("Java program invoked");
+		checkmysqlversion me = new checkmysqlversion();
+
+		System.out.println("args.length: " + args.length);
+		if (args.length < 3)
+		{
+			System.out.println("Usage: Java checkmysqlversion dbDriverUrl dbUsername dbPassword");
+			System.exit(1);
+		}
+		else
+		{
+			try
+			{
+				me.execute(args[0], args[1], args[2]);
+			}
+			catch (UnknownHostException e)
+			{	
+				System.out.println("MySql Host is not valid, please enter a new value");
+				System.exit(1);
+			}
+		}
+	}
+
+	public void execute(String url, String user, String pass) throws SQLException, UnknownHostException
+	{
+		try{
+	        this.dbDriverClass = "com.mysql.jdbc.Driver";
+        	this.dbDriverUrl = url;
+        	this.dbUsername = user;
+        	this.dbPassword = pass;
+			this.minMysqlVersion = 5.0;
+	
+			Class.forName(dbDriverClass);
+       		Connection conn = DriverManager.getConnection(dbDriverUrl, dbUsername, dbPassword);
+       		conn.setAutoCommit(false);
+       		//PreparedStatement stmt  = conn.prepareStatement("SELECT * FROM lams_configuration WHERE config_key= \"Version\"");
+       		PreparedStatement stmt  = conn.prepareStatement("SHOW variables WHERE Variable_name=\"version\"");
+       		ResultSet results = stmt.executeQuery();
+	
+			if (results.first() == false)
+			{
+				throw new SQLException("Could not find mysql version usring url: " + dbDriverUrl);
+			}
+			else
+			{
+				String mysqlVersion = results.getString("Value");
+				// If mysqlversion >= 5.0
+				if (Double.parseDouble(mysqlVersion.substring(0,3)) >= minMysqlVersion )
+				{
+					System.out.println("MySQL version " + mysqlVersion + " is compatible with this version of LAMS.\n");	
+				}
+				else
+				{
+					throw new SQLException("The MySQL version you are attemping to use: " +mysqlVersion+ " is not compatible with this version of LAMS. Required version: " + minMysqlVersion);
+				}
+			}
+			conn.close();
+		}
+		catch (SQLException e)
+		{
+			System.out.println(e.getMessage());
+			System.out.println("Upgrade failed. MySQL check failed.\n");
+			System.exit(1); 
+		}
+	
+		catch (Exception e)
+        {
+            System.out.println(e.getMessage());
+            System.out.println("Upgrade failed. Unknown failure checking MySQL version.\n");
+            e.printStackTrace();
+            System.exit(1);
+		}
+	}
+	
+}
Index: win_installer/src/updater.nsi
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/updater.nsi,v
diff -u -r1.14 -r1.15
Binary files differ