Index: win_installer/build.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/build.xml,v
diff -u -r1.1 -r1.2
--- win_installer/build.xml	29 Sep 2006 08:20:39 -0000	1.1
+++ win_installer/build.xml	6 Jun 2007 00:35:55 -0000	1.2
@@ -18,7 +18,7 @@
 	</target>
 	
 	<target name="compile-java" depends="mk-build-dir" description="Compile custom java class">
-		<javac srcdir="src" destdir="build" />
+		<javac srcdir="src" classpath="../lams_build/lib/hibernate/hibernate3.jar" destdir="build" />
 	</target>
 	
 </project>
\ No newline at end of file
Index: win_installer/license.txt
===================================================================
RCS file: /usr/local/cvsroot/win_installer/Attic/license.txt,v
diff -u -r1.12 -r1.13
--- win_installer/license.txt	20 Mar 2007 00:27:54 -0000	1.12
+++ win_installer/license.txt	6 Jun 2007 00:35:54 -0000	1.13
@@ -1,4 +1,4 @@
-LAMS 2.0.2 is released under the GPL license detailed below.  This package
+LAMS 2.0.3 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.5 -r1.6
--- win_installer/readme.txt	20 Mar 2007 01:10:55 -0000	1.5
+++ win_installer/readme.txt	6 Jun 2007 00:35:55 -0000	1.6
@@ -1,7 +1,7 @@
-LAMS 2.0.2 - Learning Activity Management System
+LAMS 2.0.3 - Learning Activity Management System
 ----------------------------------------------
 
-This is a pre-packaged copy of LAMS 2.0.2 for Windows 2000, XP, or 2003.
+This is a pre-packaged copy of LAMS 2.0.3 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 
@@ -21,6 +21,7 @@
 To stop LAMS 2, use the 'Stop LAMS' shortcut in the LAMSv2 Start Menu 
 folder.
 
+
 2. Server Configuration
 =======================
 For single user installations (i.e., personal use on your own desktop), please
@@ -42,9 +43,9 @@
 For Sun JDK versions before 1.5.0_07, the default is 64m.  If your Sun JDK 
 version is 1.5.0_07 or later, the default is 256m.  
 
+
 3. Web Resources
 ================
-	
 Windows Installer Help wiki (includes download links)
 
 	http://wiki.lamsfoundation.org/display/lamsdocs/Windows+Installer+Help
Index: win_installer/src/Functions.nsh
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/Functions.nsh,v
diff -u -r1.5 -r1.6
--- win_installer/src/Functions.nsh	8 Mar 2007 07:25:10 -0000	1.5
+++ win_installer/src/Functions.nsh	6 Jun 2007 00:35:55 -0000	1.6
@@ -531,3 +531,118 @@
   Exch 6
  
 FunctionEnd
+
+/*
+Push hello #text to be replaced
+Push blah #replace with
+Push all #replace all occurrences
+Push all #replace all occurrences
+Push C:\temp1.bat #file to replace in
+Call AdvReplaceInFile
+*/
+Function AdvReplaceInFile
+Exch $0 ;file to replace in
+Exch
+Exch $1 ;number to replace after
+Exch
+Exch 2
+Exch $2 ;replace and onwards
+Exch 2
+Exch 3
+Exch $3 ;replace with
+Exch 3
+Exch 4
+Exch $4 ;to replace
+Exch 4
+Push $5 ;minus count
+Push $6 ;universal
+Push $7 ;end string
+Push $8 ;left string
+Push $9 ;right string
+Push $R0 ;file1
+Push $R1 ;file2
+Push $R2 ;read
+Push $R3 ;universal
+Push $R4 ;count (onwards)
+Push $R5 ;count (after)
+Push $R6 ;temp file name
+ 
+  GetTempFileName $R6
+  FileOpen $R1 $0 r ;file to search in
+  FileOpen $R0 $R6 w ;temp file
+   StrLen $R3 $4
+   StrCpy $R4 -1
+   StrCpy $R5 -1
+ 
+loop_read:
+ ClearErrors
+ FileRead $R1 $R2 ;read line
+ IfErrors exit
+ 
+   StrCpy $5 0
+   StrCpy $7 $R2
+ 
+loop_filter:
+   IntOp $5 $5 - 1
+   StrCpy $6 $7 $R3 $5 ;search
+   StrCmp $6 "" file_write2
+   StrCmp $6 $4 0 loop_filter
+ 
+StrCpy $8 $7 $5 ;left part
+IntOp $6 $5 + $R3
+IntCmp $6 0 is0 not0
+is0:
+StrCpy $9 ""
+Goto done
+not0:
+StrCpy $9 $7 "" $6 ;right part
+done:
+StrCpy $7 $8$3$9 ;re-join
+ 
+IntOp $R4 $R4 + 1
+StrCmp $2 all file_write1
+StrCmp $R4 $2 0 file_write2
+IntOp $R4 $R4 - 1
+ 
+IntOp $R5 $R5 + 1
+StrCmp $1 all file_write1
+StrCmp $R5 $1 0 file_write1
+IntOp $R5 $R5 - 1
+Goto file_write2
+ 
+file_write1:
+ FileWrite $R0 $7 ;write modified line
+Goto loop_read
+ 
+file_write2:
+ FileWrite $R0 $R2 ;write unmodified line
+Goto loop_read
+ 
+exit:
+  FileClose $R0
+  FileClose $R1
+ 
+   SetDetailsPrint none
+  Delete $0
+  Rename $R6 $0
+  Delete $R6
+   SetDetailsPrint both
+ 
+Pop $R6
+Pop $R5
+Pop $R4
+Pop $R3
+Pop $R2
+Pop $R1
+Pop $R0
+Pop $9
+Pop $8
+Pop $7
+Pop $6
+Pop $5
+Pop $0
+Pop $1
+Pop $2
+Pop $3
+Pop $4
+FunctionEnd
Index: win_installer/src/GetLlidFolderNames.java
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/GetLlidFolderNames.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/src/GetLlidFolderNames.java	6 Jun 2007 00:35:55 -0000	1.1
@@ -0,0 +1,110 @@
+import java.io.File;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+
+public class GetLlidFolderNames {
+
+    private String title;
+	private String dbDriverClass;
+    private String dbDriverUrl;
+    private String dbUsername;
+    private String dbPassword;
+
+	/**
+	 * Dump out a list of all the nodes in the content repository, with their type and expected paths
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		GetLlidFolderNames me = new GetLlidFolderNames();
+		
+		if (args.length < 4)
+		{
+			System.out.println("Usage: Java GetLlidFolderNames title dbDriverUrl dbUsername dbPassword");
+			System.exit(1);
+		}
+		
+		String title = args[0];
+		String dbDriverUrl = args[1];
+		String dbUsername = args[2];
+		String dbPassword = args[3];
+		me.execute(title, dbDriverUrl, dbUsername, dbPassword);
+	}
+
+	public void execute(String title, String dbDriverUrl, String dbUsername, String dbPassword) throws Exception 
+	{
+		
+
+		this.dbDriverClass = "com.mysql.jdbc.Driver";
+		this.dbDriverUrl = dbDriverUrl;
+		this.dbUsername = dbUsername;
+		this.dbPassword = dbPassword;
+		this.title = title;
+		
+        String getLlid = "SELECT learning_library_id FROM lams_learning_library WHERE title = \'" + title +"\'";
+        // SELECT learning_library_id FROM lams_learning_library WHERE title = $\'Chat and Scribe$\';"
+        
+        
+        
+        
+        
+        
+        Class.forName(dbDriverClass);
+        Connection conn = DriverManager.getConnection(dbDriverUrl, dbUsername, dbPassword);
+        conn.setAutoCommit(false);
+        PreparedStatement stmt  = conn.prepareStatement(getLlid);
+        ResultSet results = stmt.executeQuery();
+
+        if (results.first())
+        {
+        	System.out.print(results.getString("learning_library_id"));
+        }
+        else
+        {
+        	System.out.println("Could not find llid for:" + title);
+        	System.exit(1);
+        }
+        /*
+        while (results.next())
+        {
+			Long uid = results.getLong("uid");
+			Boolean room_created = results.getBoolean("room_created");
+        	String jabber_room = results.getString("jabber_room");
+
+			String set_jabber_room;
+			Boolean set_room_created;
+			// checking if jabber_room is null
+        	if (results.wasNull()) {
+				// tool session was created by the room doesnt exist on the jabber server
+				// generating a unique jabber room name
+				set_room_created = false;
+				set_jabber_room = (String) idGenerator.generate(null, null) + "@" + XMPPConference;
+
+			} else {
+				// jabber has already been created
+				set_room_created = true;
+				set_jabber_room = jabber_room;
+			}
+
+			stmtUpdate.setBoolean(1, set_room_created);
+			stmtUpdate.setString(2, set_jabber_room);
+			stmtUpdate.setLong(3, uid);
+			stmtUpdate.addBatch();
+
+        	System.out.print(uid + "\t");
+        	System.out.print(room_created + "\t");
+        	System.out.print(jabber_room + "\n");
+
+        }
+        int[] upCount = stmtUpdate.executeBatch();
+        */
+        
+        
+		conn.commit();
+        conn.close();
+	}
+
+}
\ No newline at end of file
Index: win_installer/src/LanguagePack.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/LanguagePack.xml,v
diff -u -r1.2 -r1.3
--- win_installer/src/LanguagePack.xml	20 Dec 2006 04:42:16 -0000	1.2
+++ win_installer/src/LanguagePack.xml	6 Jun 2007 00:35:55 -0000	1.3
@@ -7,7 +7,7 @@
 	<target name="insertLocale-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"
Index: win_installer/src/UpdateLAMS202Chat.java
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/UpdateLAMS202Chat.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/src/UpdateLAMS202Chat.java	6 Jun 2007 00:35:55 -0000	1.1
@@ -0,0 +1,130 @@
+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 org.hibernate.Hibernate;
+import org.hibernate.id.Configurable;
+import org.hibernate.id.IdentifierGenerator;
+import org.hibernate.id.UUIDHexGenerator;
+
+public class UpdateLAMS202Chat {
+
+    private String XMPPConference;
+	private String dbDriverClass;
+    private String dbDriverUrl;
+    private String dbUsername;
+    private String dbPassword;
+    private String crPath;
+
+	/**
+	 * Dump out a list of all the nodes in the content repository, with their type and expected paths
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		UpdateLAMS202Chat me = new UpdateLAMS202Chat();
+		
+		if (args.length < 4)
+		{
+			System.out.println("Usage: Java XMPPConference dbDriverUrl dbUsername dbPassword crPath");
+			System.exit(1);
+		}
+		
+		String dbDriverUrl = args[0];
+		String dbUsername = args[1];
+		String dbPassword = args[2];
+		String crPath = args[3];
+		me.execute(dbDriverUrl, dbUsername, dbPassword, crPath);
+	}
+
+	public void execute(String dbDriverUrl, String dbUsername, String dbPassword, String crPath) throws Exception {
+		
+		dbDriverClass = "com.mysql.jdbc.Driver";
+		/*
+		dbDriverUrl = "jdbc:mysql://localhost/lams_demo?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true";
+		dbUsername = "root";
+		dbPassword = "secret4141";
+		crPath = "/var/opt/lams/repository";
+		*/
+		
+		this.dbDriverClass = dbDriverClass;
+		this.dbDriverUrl = dbDriverUrl;
+		this.dbUsername = dbUsername;
+		this.dbPassword = dbPassword;
+		this.crPath = crPath;
+		
+        String getChatSessions = "SELECT uid, jabber_room, room_created from tl_lachat11_session";
+        String getXmppConference = "SELECT config_value FROM lams_configuration WHERE config_key='XmppConference'";
+        String updateChatSessions = "UPDATE tl_lachat11_session set room_created=?, jabber_room=? where uid=?";
+
+        Class.forName(dbDriverClass);
+        Connection conn = DriverManager.getConnection(dbDriverUrl, dbUsername, dbPassword);
+        conn.setAutoCommit(false);
+        PreparedStatement stmt  = conn.prepareStatement(getChatSessions);
+        ResultSet results = stmt.executeQuery();
+
+        // getting XmppConference value from db.
+        Statement xmppStmt = conn.createStatement();
+        ResultSet xmppResult = xmppStmt.executeQuery(getXmppConference);
+        
+        if (xmppResult.next()) 
+        {
+	        XMPPConference = xmppResult.getString(1);
+	        System.out.println(XMPPConference);        
+        } 
+        else
+        {
+	        conn.close();
+	        System.out.println("Could not find XMPP Conference.");
+	        System.exit(1);
+        }
+      
+        PreparedStatement stmtUpdate = conn.prepareStatement(updateChatSessions);
+
+		IdentifierGenerator idGenerator = new UUIDHexGenerator();
+				((Configurable) idGenerator).configure(Hibernate.STRING,
+				new Properties(), null);
+
+        while (results.next())
+        {
+			Long uid = results.getLong("uid");
+			Boolean room_created = results.getBoolean("room_created");
+        	String jabber_room = results.getString("jabber_room");
+
+			String set_jabber_room;
+			Boolean set_room_created;
+			// checking if jabber_room is null
+        	if (results.wasNull()) {
+				// tool session was created by the room doesnt exist on the jabber server
+				// generating a unique jabber room name
+				set_room_created = false;
+				set_jabber_room = (String) idGenerator.generate(null, null) + "@" + XMPPConference;
+
+			} else {
+				// jabber has already been created
+				set_room_created = true;
+				set_jabber_room = jabber_room;
+			}
+
+			stmtUpdate.setBoolean(1, set_room_created);
+			stmtUpdate.setString(2, set_jabber_room);
+			stmtUpdate.setLong(3, uid);
+			stmtUpdate.addBatch();
+
+        	System.out.print(uid + "\t");
+        	System.out.print(room_created + "\t");
+        	System.out.print(jabber_room + "\n");
+
+        }
+
+        int[] upCount = stmtUpdate.executeBatch();
+
+		conn.commit();
+        conn.close();
+	}
+
+}
\ No newline at end of file
Index: win_installer/src/backup-finish.ini
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/backup-finish.ini,v
diff -u -r1.2 -r1.3
--- win_installer/src/backup-finish.ini	16 May 2007 03:54:42 -0000	1.2
+++ win_installer/src/backup-finish.ini	6 Jun 2007 00:35:55 -0000	1.3
@@ -14,4 +14,4 @@
 Top=78
 Right=288
 Bottom=107
-Text=To revert to the backup, follow the instructions listed at: \r\n\r\nhttp://wiki.lamsfoundation.org/display/lamsdocs/Revert+To+Windows+Backup.
+Text=To revert to the backup, follow the instructions listed at: \r\n\r\nhttp://wiki.lamsfoundation.org/display/lamsdocs/Revert+To+Windows+Backup
Index: win_installer/src/backup.ini
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/backup.ini,v
diff -u -r1.2 -r1.3
--- win_installer/src/backup.ini	26 Mar 2007 07:36:33 -0000	1.2
+++ win_installer/src/backup.ini	6 Jun 2007 00:35:55 -0000	1.3
@@ -25,4 +25,4 @@
 Top=12
 Right=291
 Bottom=94
-Text="Welcome to the LAMS 2 Backup Utility.\r\n\r\nThis utility will back up your entire LAMS 2 installation and your LAMS database to the directory you specify below.\r\n\r\nYou can restore your installation later by following the instructions at:\r\n\r\nhttp://wiki.lamsfoundation.org/display/lamsdocs/Revert+To+Windows+Updater+Backup\r\n"
+Text="Welcome to the LAMS 2 Backup Utility.\r\n\r\nThis utility will back up your entire LAMS 2 installation and your LAMS database to the directory you specify below.\r\n\r\nYou can restore your installation later by following the instructions at:\r\n\r\nhttp://wiki.lamsfoundation.org/display/lamsdocs/Revert+To+Windows+Backup\r\n"
Index: win_installer/src/backup.nsi
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/backup.nsi,v
diff -u -r1.3 -r1.4
Binary files differ
Index: win_installer/src/mysql.ini
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/mysql.ini,v
diff -u -r1.2 -r1.3
--- win_installer/src/mysql.ini	4 Oct 2006 04:17:50 -0000	1.2
+++ win_installer/src/mysql.ini	6 Jun 2007 00:35:55 -0000	1.3
@@ -5,7 +5,7 @@
 
 
 [Settings]
-NumFields=13
+NumFields=15
 
 [Field 1]
 Type=GroupBox
@@ -118,3 +118,19 @@
 Bottom=131
 Text=Click to get online help for these options
 State=http://wiki.lamsfoundation.org/display/lamsdocs/Windows+Installer+Help#WindowsInstallerHelp-mysql
+
+[Field 14]
+Type=Text
+Left=169
+Top=70
+Right=291
+Bottom=83
+State=localhost
+
+[Field 15]
+Type=Label
+Left=169
+Top=60
+Right=271
+Bottom=69
+Text="MySql host\r\n"
Index: win_installer/src/revert-dir.ini
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/revert-dir.ini,v
diff -u -r1.2 -r1.3
--- win_installer/src/revert-dir.ini	23 May 2007 06:35:12 -0000	1.2
+++ win_installer/src/revert-dir.ini	6 Jun 2007 00:35:55 -0000	1.3
@@ -1,6 +1,6 @@
 [Settings]
 NumFields=3
-NextButtonText=Run Revert
+NextButtonText=Restore LAMS
 
 [Field 1]
 Type=Label
@@ -23,4 +23,4 @@
 Top=4
 Right=284
 Bottom=108
-Text=Welcome to the LAMS Reverter!\r\n\r\nThis wizard will guide you through the process of reverting back to a previous LAMS installation after an update.\r\n\r\nYou should only use this utility if you have had a failed upgrade, or your upgrade is not working properly.\r\n\r\nTo revert your lams installation manually, follow the instrucations at:\r\nhttp://wiki.lamsfoundation.org/display/lamsdocs/Revert+To+Other+Backup\r\n\r\nEnter the directory LAMS was backed up to using the backup utility and the reverter will do the rest.
+Text=Welcome to the LAMS Reverter!\r\n\r\nThis wizard will guide you through the process of restoring a previous LAMS installation after an update.\r\n\r\nYou should only use this utility if you have had a failed upgrade, or your upgrade is not working properly.\r\n\r\nTo restore your lams installation manually, follow the instrucations at:\r\nhttp://wiki.lamsfoundation.org/display/lamsdocs/Revert+To+Other+Backup\r\n\r\nEnter the directory LAMS was backed up to using the backup utility and the reverter will do the rest.
Index: win_installer/src/revert.nsi
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/revert.nsi,v
diff -u -r1.3 -r1.4
Binary files differ
Index: win_installer/src/updateLocales.sql
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/updateLocales.sql,v
diff -u -r1.8 -r1.9
Binary files differ
Index: win_installer/src/updater.nsi
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/updater.nsi,v
diff -u -r1.10 -r1.11
Binary files differ
Index: win_installer/templates/index.html
===================================================================
RCS file: /usr/local/cvsroot/win_installer/templates/Attic/index.html,v
diff -u -r1.1 -r1.2
--- win_installer/templates/index.html	13 Oct 2006 02:18:35 -0000	1.1
+++ win_installer/templates/index.html	6 Jun 2007 00:35:54 -0000	1.2
@@ -50,7 +50,7 @@
 		
 		<div id="footer">
 		
-		<p>&copy; 2002-2006 LAMS Foundation.</p>
+		<p>&copy; 2002-2007 LAMS Foundation.</p>
 		
 	  </div><!--closes footer-->
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `win_installer/templates/news.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: win_installer/templates/update-core-database.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/templates/Attic/update-core-database.xml,v
diff -u -r1.1 -r1.2
--- win_installer/templates/update-core-database.xml	8 Mar 2007 07:25:10 -0000	1.1
+++ win_installer/templates/update-core-database.xml	6 Jun 2007 00:35:54 -0000	1.2
@@ -8,16 +8,16 @@
 	<target name="update-core-database"  description="Runs some update scripts found in lams_common\db\sql\updatscripts" >
 		<sql driver="com.mysql.jdbc.Driver" 
 			classpath="${jboss.deploy}/mysql-connector-java-3.1.12-bin.jar" 
-			url="jdbc:mysql://localhost/${db.name}?characterEncoding=UTF-8" 
+			url="${db.url}" 
 			userid="${db.username}" 
 			password="${db.password}"
 			encoding="utf8"
 			onerror="continue">
-			<transaction src="${temp}/lams/sql/alter_201_locale_id.sql" />
-			<transaction src="${temp}/lams/sql/alter_201_system_tool_user_workspace.sql" />
-			<transaction src="${temp}/lams/sql/alter_201_theme.sql" />
-			<transaction src="${temp}/lams/sql/alter_201_tool.sql" />
-			<transaction src="${temp}/lams/sql/alter_201_ext.sql" />
+			<transaction src="${temp}/lams/sql/updateConfiguration.sql" />
+			<transaction src="${temp}/lams/sql/alter_203_editonfly.sql" />
+			<transaction src="${temp}/lams/sql/alter_203_learner_progress.sql" />
+			<transaction src="${temp}/lams/sql/alter_203_rams_theme.sql" />
+			<transaction src="${temp}/lams/sql/alter_203_transition.sql" />
 		</sql>
 	</target>
 </project>
\ No newline at end of file
Index: win_installer/templates/update-deploy-tools.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/templates/Attic/update-deploy-tools.xml,v
diff -u -r1.4 -r1.5
--- win_installer/templates/update-deploy-tools.xml	8 Mar 2007 07:25:10 -0000	1.4
+++ win_installer/templates/update-deploy-tools.xml	6 Jun 2007 00:35:54 -0000	1.5
@@ -178,5 +178,4 @@
 			</java>	
 	</target>
 	
-	
 </project>
\ No newline at end of file