Index: unix_installer/installer-package/bin/checkmysql.class
===================================================================
diff -u -rc6a8998567722aec174bb639b1fb4d81dece93d8 -r09d5ee6e7bb3c8a1637b03b3f31c8af572c06c0e
Binary files differ
Fisheye: Tag 09d5ee6e7bb3c8a1637b03b3f31c8af572c06c0e refers to a dead (removed) revision in file `unix_installer/installer-package/bin/checkmysql.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: unix_installer/installer-package/build.xml
===================================================================
diff -u -r13109a867357a8730a4df2d3091d1eb71b2d6bb9 -r09d5ee6e7bb3c8a1637b03b3f31c8af572c06c0e
--- unix_installer/installer-package/build.xml (.../build.xml) (revision 13109a867357a8730a4df2d3091d1eb71b2d6bb9)
+++ unix_installer/installer-package/build.xml (.../build.xml) (revision 09d5ee6e7bb3c8a1637b03b3f31c8af572c06c0e)
@@ -68,5 +68,13 @@
+
+
+
+
+
Fisheye: Tag 09d5ee6e7bb3c8a1637b03b3f31c8af572c06c0e refers to a dead (removed) revision in file `unix_installer/installer-package/conf/unix/authentication/lamsauthentication.dtd'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 09d5ee6e7bb3c8a1637b03b3f31c8af572c06c0e refers to a dead (removed) revision in file `unix_installer/installer-package/conf/unix/authentication/lamsauthentication.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: unix_installer/installer-package/conf/unix/jboss/.log4j.xml.swp
===================================================================
diff -u -rb7b01efd191eaacd6f9220e339bb93b3c96a8215 -r09d5ee6e7bb3c8a1637b03b3f31c8af572c06c0e
Binary files differ
Index: unix_installer/installer-package/install-lams.sh
===================================================================
diff -u -r13109a867357a8730a4df2d3091d1eb71b2d6bb9 -r09d5ee6e7bb3c8a1637b03b3f31c8af572c06c0e
--- unix_installer/installer-package/install-lams.sh (.../install-lams.sh) (revision 13109a867357a8730a4df2d3091d1eb71b2d6bb9)
+++ unix_installer/installer-package/install-lams.sh (.../install-lams.sh) (revision 09d5ee6e7bb3c8a1637b03b3f31c8af572c06c0e)
@@ -23,7 +23,9 @@
# Installer shell script for LAMS
# Usage: sudo ./install.sh
-
+
+# The version of this lams installer
+LAMS_VERSION=2.1
MYSQL_VERSION_STR=5.
JAVA_REQ_VERSION=1.5
# Transform the required version string into a number that can be used in comparisons
Index: unix_installer/installer-package/java/checkmysql.java
===================================================================
diff -u
--- unix_installer/installer-package/java/checkmysql.java (revision 0)
+++ unix_installer/installer-package/java/checkmysql.java (revision 09d5ee6e7bb3c8a1637b03b3f31c8af572c06c0e)
@@ -0,0 +1,84 @@
+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 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
+ {
+ checkmysql me = new checkmysql();
+
+ if (args.length < 4)
+ {
+ System.out.println("Usage: Java checkmysql dbDriverUrl dbUsername dbPassword version");
+ System.exit(1);
+ }
+ else
+ {
+ me.execute(args[0], args[1], args[2], args[3]);
+ }
+ }
+
+ public void execute(String url, String user, String pass, String version) throws SQLException
+ {
+
+ 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("show variables where Variable_name=\"version\"");
+ ResultSet results = stmt.executeQuery();
+
+ if (results.first() == false)
+ {
+ throw new SQLException("No version row found in database");
+ }
+ else
+ {
+ String dbVersion = results.getString("Value");
+ if (dbVersion.contains(version) == false)
+ {
+ throw new SQLException("Your MySql Version: \"" + dbVersion + "\" is not compatible LAMS");
+ }
+ else
+ {
+ System.out.println("MySql host is compatible with LAMS.");
+ }
+
+ }
+ conn.close();
+ }
+ catch (SQLException e)
+ {
+ System.out.println(e.getMessage());
+ System.out.println("MySql check failed. Check that your MYSQL_HOST variable in lams.properties points to a MySql 5.x installation");
+ System.exit(1);
+ }
+ catch (Exception e)
+ {
+ System.out.println(e.getMessage());
+ System.out.println("Unknown failure finding MySql version");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+}
Index: unix_installer/installer-package/readme
===================================================================
diff -u -r13109a867357a8730a4df2d3091d1eb71b2d6bb9 -r09d5ee6e7bb3c8a1637b03b3f31c8af572c06c0e
--- unix_installer/installer-package/readme (.../readme) (revision 13109a867357a8730a4df2d3091d1eb71b2d6bb9)
+++ unix_installer/installer-package/readme (.../readme) (revision 09d5ee6e7bb3c8a1637b03b3f31c8af572c06c0e)
@@ -1,18 +1,18 @@
-LAMS 2.1 - Learning Activity Management System Installer
+LAMS 2.1 RC1 - Learning Activity Management System Installer
--------------------------------------------------------------------------------
-This is an installer package for LAMS 2.1. Please read this
+This is an installer package for LAMS 2.1 RC1. Please read this
document carefully before installing. Please also ensure that you have read
and understood the terms of the license agreement.
-LAMS 2.1 has been released for users to explore the new Branching
+LAMS 2.1 RC1 has been released for users to explore the new Branching
features coming in LAMS 2.1.
Do NOT use this installer to set up production server for LAMS.
You cannot use this installer to upgrade an existing copy of LAMS 2.0.
-For release notes goto: http://wiki.lamsfoundation.org/display/lams/2.1_RC1
+For release notes goto: http://wiki.lamsfoundation.org/display/lams/2.1RC1
CONTENTS
========
@@ -84,6 +84,10 @@
wrapper-linux-x86-32-3.2.3 Linux i386
wrapper-linux-x86-64-3.2.3 Linux IA64
+NOTE: If you are installing an production server, It is strongly recommended that
+you remove the jmx-console web applications as they can be a security risk. To do
+so, remove the jboss-4.0.2/server/default/management directory and the
+jboss-4.0.2/server/default/jmx-console.war diectory.
3. Languages and Locales
========================
@@ -265,4 +269,3 @@
LAMS Foundation
http://www.lamsfoundation.org
-