Index: lams_www/conf/lams/news.html =================================================================== RCS file: /usr/local/cvsroot/lams_www/conf/lams/news.html,v diff -u -r1.3 -r1.4 --- lams_www/conf/lams/news.html 24 May 2007 00:19:40 -0000 1.3 +++ lams_www/conf/lams/news.html 22 Jun 2007 03:12:51 -0000 1.4 @@ -1,8 +1,8 @@
LAMS 2.0.3 is a new release with bug fixes, improvements and key new feature: Live Edit, which allows teachers to modify a lesson on-the-fly directly in Monitor.
+
LAMS 2.0.4 is a new release with bug fixes, improvements and key new feature: Live Edit, which allows teachers to modify a lesson on-the-fly directly in Monitor.
If you want to learn more about LAMS, join the LAMS Community where teachers and developers share their experiences and ideas on the usage of LAMS.
Index: win_installer/license.txt
===================================================================
RCS file: /usr/local/cvsroot/win_installer/Attic/license.txt,v
diff -u -r1.13 -r1.14
--- win_installer/license.txt 6 Jun 2007 00:35:54 -0000 1.13
+++ win_installer/license.txt 22 Jun 2007 03:11:12 -0000 1.14
@@ -1,4 +1,4 @@
-LAMS 2.0.3 is released under the GPL license detailed below. This package
+LAMS 2.0.4 is released under the GPL license detailed below. This package
also includes other libraries/packages, whose respective licenses are
detailed below.
Index: win_installer/readme.txt
===================================================================
RCS file: /usr/local/cvsroot/win_installer/Attic/readme.txt,v
diff -u -r1.6 -r1.7
--- win_installer/readme.txt 6 Jun 2007 00:35:55 -0000 1.6
+++ win_installer/readme.txt 22 Jun 2007 03:11:13 -0000 1.7
@@ -1,7 +1,7 @@
-LAMS 2.0.3 - Learning Activity Management System
+LAMS 2.0.4 - Learning Activity Management System
----------------------------------------------
-This is a pre-packaged copy of LAMS 2.0.3 for Windows 2000, XP, or 2003.
+This is a pre-packaged copy of LAMS 2.0.4 for Windows 2000, XP, or 2003.
For the source code, please see the 'Building LAMS' wiki at
http://wiki.lamsfoundation.org/display/lams/Building+LAMS
Index: win_installer/src/Update204.java
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/Update204.java,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ win_installer/src/Update204.java 22 Jun 2007 03:11:12 -0000 1.1
@@ -0,0 +1,107 @@
+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;
+
+public class Update204
+{
+
+ private String dbDriverClass;
+ private String dbDriverUrl;
+ private String dbUsername;
+ private String dbPassword;
+ private String version;
+ private String serverVersion;
+
+ // Check that the mysql version is valid
+ public static void main(String[] args) throws SQLException
+ {
+ Update204 me = new Update204();
+
+ if (args.length != 5 )
+ {
+ System.out.println("Usage: Java checkmysql dbDriverUrl dbUsername dbPassword Version ServerVersion ");
+ System.exit(1);
+ }
+ else
+ {
+ me.execute(args[0], args[1], args[2], args[3], args[4]);
+ }
+ }
+
+ public void execute(String url, String user, String pass, String version, String serverVersion) throws SQLException
+ {
+
+ try{
+
+ this.dbDriverClass = "com.mysql.jdbc.Driver";
+ this.dbDriverUrl = url;
+ this.dbUsername = user;
+ this.dbPassword = pass;
+ this.version = version;
+ this.serverVersion = serverVersion;
+
+ Class.forName(dbDriverClass);
+ Connection conn = DriverManager.getConnection(dbDriverUrl, dbUsername, dbPassword);
+ conn.setAutoCommit(false);
+ PreparedStatement stmt = conn.prepareStatement("SELECT count(*) from lams_system_tool");
+ ResultSet results = stmt.executeQuery();
+
+ if (results.first() == false)
+ {
+ throw new SQLException("Could not find LAMS database using url: " + dbDriverUrl);
+ }
+ else
+ {
+ int rows = results.getInt(1);
+ if (rows == 5)
+ {
+ // Tells the 2.0.4 updater that the database does not need updating
+ System.out.print("TRUE");
+ }
+ else
+ {
+ //Tells the 2.0.4 updater that the database does need updating
+ //Update db
+
+
+ String insertStmt="INSERT INTO lams_system_tool (system_tool_id, learning_activity_type_id, tool_display_name, description, learner_url, learner_preview_url, learner_progress_url, export_pfolio_learner_url, export_pfolio_class_url, monitor_url, contribute_url, create_date_time) VALUES (5, 9, \'System Gate\', \'Gate: Opens under system control.\', \'learning/gate.do?method=knockGate\', \'learning/gate.do?method=knockGate\', null, null, \'monitoring/gateExportPortfolio?mode=teacher\', \'monitoring/gate.do?method=viewGate\', \'monitoring/gate.do?method=viewGate\', now() )";
+ PreparedStatement stmt2 = conn.prepareStatement(insertStmt);
+ stmt2.executeUpdate();
+
+ System.out.print("FALSE");
+ }
+
+ String insertStmt2="update lams_configuration set config_value=\"" +version+ "\" where config_key=\"Version\"";
+ PreparedStatement stmt3 = conn.prepareStatement(insertStmt2);
+ stmt3.executeUpdate();
+
+ insertStmt2="update lams_configuration set config_value=\"" +serverVersion+ "\" where config_key=\"ServerVersionNumber\" OR config_key=\"AuthoringClientVersion\" OR config_key=\"LearnerClientVersion\" OR config_key=\"MonitorClientVersion\"";
+ stmt3 = conn.prepareStatement(insertStmt2);
+ stmt3.executeUpdate();
+ }
+ conn.commit();
+ 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/build.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/build.xml,v
diff -u -r1.6 -r1.7
--- win_installer/src/build.xml 5 Nov 2006 02:07:08 -0000 1.6
+++ win_installer/src/build.xml 22 Jun 2007 03:11:12 -0000 1.7
@@ -34,6 +34,7 @@