Index: win_installer/src/checkmysql.java
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/checkmysql.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/src/checkmysql.java	11 Jul 2007 07:03:19 -0000	1.1
@@ -0,0 +1,92 @@
+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 checkmysql
+{
+	private String version;
+	private String dbDriverClass;
+    private String dbDriverUrl;
+    private String dbUsername;
+	private String dbPassword;	
+	
+	// Check that the mysql version is valid
+	public static void main(String[] args) throws SQLException, UnknownHostException
+	{
+		checkmysql me = new checkmysql();
+
+		if (args.length < 4)
+		{
+			System.out.println("Usage: Java checkmysql dbDriverUrl dbUsername dbPassword version");
+			System.exit(1);
+		}
+		else
+		{
+			try
+			{
+				me.execute(args[0], args[1], args[2], args[3]);
+			}
+			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, String version) throws SQLException, UnknownHostException
+	{
+		try{
+			this.version = version;
+	        this.dbDriverClass = "com.mysql.jdbc.Driver";
+        	this.dbDriverUrl = url;
+        	this.dbUsername = user;
+        	this.dbPassword = pass;
+	
+			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\"");
+	       	ResultSet results = stmt.executeQuery();
+	
+			if (results.first() == false)
+			{
+				throw new SQLException("Could not find LAMS database using url: " + dbDriverUrl);
+			}
+			else
+			{
+				String dbVersion = results.getString("config_value");
+				if (dbVersion.equals(version) == false)
+				{
+					throw new SQLException("Your current LAMS version: " +dbVersion+ " is not compatible with this upgrade. Required version: " +version);		
+				}
+				else
+				{
+					System.out.println("LAMS version is compatible with this upgrade.\n");
+				}
+			}
+			conn.close();
+		}
+		catch (SQLException e)
+		{
+			System.out.println(e.getMessage());
+			System.out.println("Upgrade failed. LAMS database check failed.\n");
+			System.exit(1); 
+		}
+	
+		catch (Exception e)
+        {
+            System.out.println(e.getMessage());
+            System.out.println("Upgrade failed. Unknown failure checking LAMS database version.\n");
+            e.printStackTrace();
+            System.exit(1);
+		}
+	}
+	
+}
Index: win_installer/src/lams-update.ini
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/lams-update.ini,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/src/lams-update.ini	11 Jul 2007 07:03:19 -0000	1.1
@@ -0,0 +1,50 @@
+[Settings]
+NumFields=6
+
+[Field 1]
+Type=GroupBox
+Left=0
+Top=0
+Right=-1
+Bottom=-4
+Text=Configure LAMS...
+
+[Field 2]
+Type=DirRequest
+Left=7
+Top=82
+Right=152
+Bottom=95
+
+[Field 3]
+Type=Label
+Left=7
+Top=70
+Right=152
+Bottom=79
+Text=Java JDK directory...
+
+[Field 4]
+Type=Link
+Left=7
+Top=117
+Right=152
+Bottom=126
+Text=Click to get online help for these options
+State=http://wiki.lamsfoundation.org/display/lamsdocs/Windows+Installer+Help#WindowsInstallerHelp-lams
+
+[Field 5]
+Type=Label
+Left=7
+Top=26
+Right=152
+Bottom=33
+Text=MySql Host...
+
+[Field 6]
+Type=Text
+Left=7
+Top=37
+Right=134
+Bottom=50
+State=localhost
Index: win_installer/src/updater.nsi
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/updater.nsi,v
diff -u -r1.12 -r1.13
Binary files differ