Index: win_installer/installer/readme.txt
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/Attic/readme.txt,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/readme.txt	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,75 @@
+LAMS 2.1 Beta - Learning Activity Management System
+----------------------------------------------
+
+This is a pre-packaged copy of LAMS 2.1 Beta for Windows 2000, XP, or 2003.
+It is designed for LAMS users to explore the new Branching and Optional
+Sequences features. We would love some feedback on things you like, things
+you don't like, or suggestions for improvements in the wording or icons on
+the branching screens. 
+
+This is a "play" version of LAMS. It is NOT designed for production and you
+will NOT be able to upgrade it to the real LAMS 2.1.
+
+If you want to install a production version of LAMS, you should
+install LAMS 2.0.4. 
+
+1. Startup and Shutdown
+=======================
+To use LAMS 2, first make sure it is started - use the 'Start LAMS' shortcut
+in the LAMSv2 Start Menu folder if you're not sure.  MySQL must be running.
+For chat rooms to function, Wildfire must also be running.
+
+While LAMS 2 is running, you may access the login page using the 'Access 
+LAMS' short cut in the LAMSv2 Start Menu folder.
+
+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
+ignore this section.
+
+For server deployments, you will probably want to configure the default JVM 
+memory settings for your server.  In C:\lams\jboss-4.0.2\bin\run.bat (or 
+wherever you installed LAMS 2), find the line near the bottom that says
+
+	set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m
+	
+and adjust the minimum and maximum amount of memory allocated there.
+
+We also recommend increasing the -XX:MaxPermSize option if you have more than
+a couple of users.  e.g.
+
+	set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m -XX:MaxPermSize=128m
+
+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
+	
+LAMS 2 developer-oriented information
+
+	http://wiki.lamsfoundation.org/display/lams
+
+LAMS 2 help documents
+
+	http://wiki.lamsfoundation.org/display/lamsdocs
+
+Educational and technical forums for help and discussion
+				
+	http://www.lamscommunity.org
+
+LAMS 2 bug tracker			
+
+	https://bugs.lamsfoundation.org
+
+LAMS Foundation					
+	
+	http://www.lamsfoundation.org
Index: win_installer/installer/conf/log4j.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/conf/log4j.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/conf/log4j.xml	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.1 2007/12/18 02:01:48 lfoxton Exp $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+  <!-- ================================= -->
+  <!-- Preserve messages in a local file -->
+  <!-- ================================= -->
+
+  <!-- A time/date based rolling appender -->
+  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+    <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+    <param name="File" value="${jboss.server.home.dir}/log/server.log"/>
+    <param name="Append" value="false"/>
+    <param name="Threshold" value="INFO"/>
+
+    <!-- Rollover at midnight each day -->
+    <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+    <!-- Rollover at the top of each hour
+    <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+    -->
+
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- The default pattern: Date Priority [Category] Message\n -->
+      <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n"/>
+
+      <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+      <param name="ConversionPattern" value="%d{ISO8601} %-5r %-5p [%c] (%t:%x) %m%n"/>
+       -->
+    </layout>	    
+  </appender>
+
+  <!-- A size based file rolling appender
+  <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+    <param name="File" value="${jboss.server.home.dir}/log/server.log"/>
+    <param name="Append" value="false"/>
+    <param name="MaxFileSize" value="500KB"/>
+    <param name="MaxBackupIndex" value="1"/>
+    <param name="Threshold" value="INFO"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n"/>
+    </layout>	    
+  </appender>
+  -->
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <!-- ====================== -->
+   <!-- More Appender examples -->
+   <!-- ====================== -->
+
+   <!-- Buffer events and log them asynchronously
+   <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <appender-ref ref="FILE"/>
+     <appender-ref ref="CONSOLE"/>
+     <appender-ref ref="SMTP"/>
+   </appender>
+   -->
+
+   <!-- EMail events to an administrator
+   <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Threshold" value="ERROR"/>
+     <param name="To" value="admin@myhost.domain.com"/>
+     <param name="From" value="nobody@myhost.domain.com"/>
+     <param name="Subject" value="JBoss Sever Errors"/>
+     <param name="SMTPHost" value="localhost"/>
+     <param name="BufferSize" value="10"/>
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="[%d{ISO8601},%c{1}] %m%n"/>
+     </layout>
+   </appender>
+   -->
+
+   <!-- Syslog events
+   <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Facility" value="LOCAL7"/>
+     <param name="FacilityPrinting" value="true"/>
+     <param name="SyslogHost" value="localhost"/>
+   </appender>
+   -->
+
+   <!-- Log events to JMS (requires a topic to be created)
+   <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="Threshold" value="ERROR"/>
+     <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+     <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+   </appender>
+   -->
+
+   <!-- Log events through SNMP
+   <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
+     <param name="ManagementHost" value="127.0.0.1"/>
+     <param name="ManagementHostTrapListenPort" value="162"/>
+     <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
+     <param name="LocalIPAddress" value="127.0.0.1"/>
+     <param name="LocalTrapSendPort" value="161"/>
+     <param name="GenericTrapType" value="6"/>
+     <param name="SpecificTrapType" value="12345678"/>
+     <param name="CommunityString" value="public"/>
+     <param name="ForwardStackTraceWithTrap" value="true"/>
+     <param name="Threshold" value="DEBUG"/>
+     <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
+     <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
+     </layout>
+   </appender>
+   -->
+
+  <!-- ======================= -->
+  <!-- LAMS Setup              -->
+  <!-- ======================= -->
+  
+    <appender name="AUDITFILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+    <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+    <param name="File" value="${jboss.server.home.dir}/log/audit.log"/>
+    <param name="Append" value="true"/>
+    <param name="Threshold" value="INFO"/>
+
+    <!-- Rollover at midnight each day -->
+    <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{ISO8601} [%t:%x] %-5p %c - %m%n"/>
+
+    </layout>	    
+  </appender>
+ 
+  <appender name="LAMSFILE" class="org.jboss.logging.appender.RollingFileAppender">
+    <param name="File" value="${jboss.server.home.dir}/log/lams.log"/>
+    <param name="Append" value="true"/>
+    <param name="MaxFileSize" value="5MB"/>
+    <param name="MaxBackupIndex" value="20"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- Date [Thread:NDC] LEVEL Category - Message\n -->
+      <param name="ConversionPattern" value="%d{ISO8601} [%t:%x] %-5p %c - %m%n"/>
+    </layout>	    
+  </appender>
+
+  <appender name="LAMSCONSOLE" class="org.apache.log4j.ConsoleAppender">
+    <param name="Target" value="System.out"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- Date Priority Category - Message\n -->
+      <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1}] %m%n"/>
+    </layout>
+  </appender>
+
+  <appender name="HIBERNATEFILE" class="org.jboss.logging.appender.RollingFileAppender">
+    <param name="File" value="${jboss.server.home.dir}/log/hibernatelams.log"/>
+    <param name="Append" value="true"/>
+    <param name="MaxFileSize" value="5MB"/>
+    <param name="MaxBackupIndex" value="20"/>
+    <layout class="org.apache.log4j.PatternLayout">
+		<!-- Date [Thread] Priority Category - Message\n -->
+		<param name="ConversionPattern" value="%d{ISO8601} [%t] %-5p %c - %m%n"/>
+    </layout>	    
+  </appender>
+  
+  <category name="org.lamsfoundation.lams" additivity="false">
+    <priority value="INFO"/>
+    <appender-ref ref="LAMSFILE"/>
+    <appender-ref ref="LAMSCONSOLE"/>
+  </category>
+  
+  <category name="org.lamsfoundation.lams.util.audit" additivity="false">
+    <priority value="INFO"/>
+    <appender-ref ref="AUDITFILE"/>
+  </category>
+  
+  <category name="org.hibernate" additivity="false">
+    <priority value="INFO"/>
+    <appender-ref ref="HIBERNATEFILE"/>
+  </category>
+  
+  <category name="org.jboss">
+    <priority value="INFO"/>
+  </category>
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->   
+
+   <category name="org.apache">
+      <priority value="INFO"/>
+   </category>
+
+   <!--  To avoid LDEV-881 exception info -->
+   <category name="org.apache.catalina.core">
+      <priority value="ERROR"/>
+   </category>
+
+   <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+   <category name="org.jgroups">
+      <priority value="WARN"/>
+   </category>
+
+   <!-- Limit apache axis to INFO as its DEBUG is even more verbose -->
+   <category name="org.jboss.axis">
+      <priority value="INFO"/>
+   </category>
+
+   <!-- Limit JBoss categories
+   <category name="org.jboss">
+      <priority value="INFO"/>
+   </category>
+   -->
+
+   <!-- Limit the JSR77 categories -->
+   <category name="org.jboss.management">
+      <priority value="INFO"/>
+   </category>
+
+   <!-- Limit JBoss webservice category
+   <category name="org.jboss.webservice">
+      <priority value="DEBUG"/>
+   </category>
+   -->
+
+   <!-- Decrease the priority threshold for the org.jboss.varia category
+   <category name="org.jboss.varia">
+     <priority value="DEBUG"/>
+   </category>
+   -->
+
+   <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
+   <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+   -->
+
+   <!--
+      | An example of enabling the custom TRACE level priority that is used
+      | by the JBoss internals to diagnose low level details. This example
+      | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+      | subpackages. This will produce A LOT of logging output.
+   <category name="org.jboss.system">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+   <category name="org.jboss.ejb.plugins">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+   -->
+  
+   <!--
+       | Logs these events to SNMP:
+           - server starts/stops
+           - cluster evolution (node death/startup)
+           - When an EJB archive is deployed (and associated verified messages)
+           - When an EAR archive is deployed
+      	 
+   <category name="org.jboss.system.server.Server">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+  
+   <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+
+   <category name="org.jboss.deployment.MainDeployer">
+     <priority value="ERROR" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   
+   <category name="org.jboss.ejb.EJBDeployer">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   
+   <category name="org.jboss.deployment.EARDeployer">
+     <priority value="INFO" />
+     <appender-ref ref="TRAP_LOG"/>
+   </category>
+   
+  
+   -->
+
+
+  <!-- ======================= -->
+  <!-- Setup the Root category -->
+  <!-- ======================= -->
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+   <!-- Clustering logging -->
+   <!-- Uncomment the following to redirect the org.jgroups and
+      org.jboss.ha categories to a cluster.log file.
+
+   <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="File" value="${jboss.server.home.dir}/log/cluster.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+     </layout>
+   </appender>
+   <category name="org.jgroups">
+     <priority value="DEBUG" />
+     <appender-ref ref="CLUSTER"/>
+   </category>
+   <category name="org.jboss.ha">
+     <priority value="DEBUG" />
+     <appender-ref ref="CLUSTER"/>
+   </category>
+   -->
+
+
+</log4j:configuration>
Index: win_installer/installer/conf/login-config.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/conf/login-config.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/conf/login-config.xml	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,170 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<!-- The XML based JAAS login configuration read by the
+org.jboss.security.auth.login.XMLLoginConfig mbean. Add
+an application-policy element for each security domain.
+
+The outline of the application-policy is:
+<application-policy name="security-domain-name">
+  <authentication>
+    <login-module code="login.module1.class.name" flag="control_flag">
+      <module-option name = "option1-name">option1-value</module-option>
+      <module-option name = "option2-name">option2-value</module-option>
+      ...
+    </login-module>
+
+    <login-module code="login.module2.class.name" flag="control_flag">
+      ...
+    </login-module>
+    ...
+  </authentication>
+</application-policy>
+
+$Revision: 1.1 $
+-->
+
+<policy>
+    <!-- Used by clients within the application server VM such as
+    mbeans and servlets that access EJBs.
+    -->
+    <application-policy name = "client-login">
+       <authentication>
+          <login-module code = "org.jboss.security.ClientLoginModule"
+             flag = "required">
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- Security domain for JBossMQ -->
+    <application-policy name = "jbossmq">
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+             flag = "required">
+             <module-option name = "unauthenticatedIdentity">guest</module-option>
+             <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+             <module-option name = "principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option>
+             <module-option name = "rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- Security domain for JBossMQ when using file-state-service.xml
+    <application-policy name = "jbossmq">
+       <authentication>
+          <login-module code = "org.jboss.mq.sm.file.DynamicLoginModule"
+             flag = "required">
+             <module-option name = "unauthenticatedIdentity">guest</module-option>
+             <module-option name = "sm.objectname">jboss.mq:service=StateManager</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+    -->
+
+    <!-- Security domains for testing new jca framework -->
+    <application-policy name = "HsqlDbRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">sa</module-option>
+             <module-option name = "userName">sa</module-option>
+             <module-option name = "password"></module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <application-policy name = "JmsXARealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">guest</module-option>
+             <module-option name = "userName">guest</module-option>
+             <module-option name = "password">guest</module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- A template configuration for the jmx-console web application. This
+      defaults to the UsersRolesLoginModule the same as other and should be
+      changed to a stronger authentication mechanism as required.
+    -->
+    <application-policy name = "jmx-console">
+       <authentication>
+          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required">
+           <module-option name="usersProperties">props/jmx-console-users.properties</module-option>
+           <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- A template configuration for the web-console web application. This
+      defaults to the UsersRolesLoginModule the same as other and should be
+      changed to a stronger authentication mechanism as required.
+    -->
+    <application-policy name = "web-console">
+       <authentication>
+          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required">
+             <module-option name="usersProperties">web-console-users.properties</module-option>
+             <module-option name="rolesProperties">web-console-roles.properties</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- A template configuration for the JBossWS web application (and transport layer!).
+      This defaults to the UsersRolesLoginModule the same as other and should be
+      changed to a stronger authentication mechanism as required.
+    -->
+    <application-policy name="JBossWS">
+      <authentication>
+        <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+          flag="required">
+          <module-option name="unauthenticatedIdentity">anonymous</module-option>
+        </login-module>
+      </authentication>
+    </application-policy>
+
+    <!-- The default login configuration used by any security domain that
+    does not have a application-policy entry with a matching name
+    -->
+    <application-policy name = "other">
+       <!-- A simple server login module, which can be used when the number 
+       of users is relatively small. It uses two properties files:
+       users.properties, which holds users (key) and their password (value).
+       roles.properties, which holds users (key) and a comma-separated list of
+       their roles (value).
+       The unauthenticatedIdentity property defines the name of the principal
+       that will be used when a null username and password are presented as is
+       the case for an unuathenticated web client or MDB. If you want to
+       allow such users to be authenticated add the property, e.g.,
+       unauthenticatedIdentity="nobody"
+       -->
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required" />
+       </authentication>
+    </application-policy>
+
+	<application-policy name = "lams">
+       <authentication>
+          <login-module code = "org.lamsfoundation.lams.security.UniversalLoginModule" flag = "required">
+             <module-option name="dsJndiName">java:/jdbc/lams-ds</module-option>
+             <module-option name="principalsQuery">select password from lams_user where login=?</module-option>
+             <module-option name="rolesQuery">
+             	SELECT DISTINCT  r.name,'Roles' FROM
+             	lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id)
+             	LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id)
+             	LEFT OUTER JOIN lams_role r USING (role_id)
+             	WHERE u.login=?
+             </module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+
+</policy>
Index: win_installer/installer/conf/news.html
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/conf/news.html,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/conf/news.html	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,9 @@
+<h2>Latest News &amp; Updates</h2>
+  <ul>
+  	<li>
+	  	<h3>Welcome to LAMS 2.1!</h3> 
+	 	<p> 
+	       News is on its way!
+	    </p>
+	</li>
+</ul>
Index: win_installer/installer/src/build.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/src/build.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/src/build.xml	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="configure-lams" basedir=".">
+	
+	<property file="installer.properties" />
+
+	<target name="configure-deploy">
+		<copy overwrite="yes" todir="${INSTDIR}">
+			<fileset dir="${TEMP}">
+				<include name="update_lams_configuration.sql" />
+			</fileset>
+			<filterset>
+				<filter token="URL" value="${URL}" />
+				<filter token="INSTDIR" value="${INSTDIR}" />
+				<filter token="TEMPDIR" value="${TEMPDIR}" />
+				<filter token="DUMPDIR" value="${DUMPDIR}" />
+				<filter token="EARDIR" value="${EARDIR}" />
+				<filter token="REPOSITORYDIR" value="${REPOSITORYDIR}" />
+				<filter token="LOCALE" value="${LOCALE}" />
+				<filter token="LOCALE_DIRECTION" value="${LOCALE_DIRECTION}" />
+				<filter token="WILDFIRE_DOMAIN" value="${WILDFIRE_DOMAIN}" />
+				<filter token="WILDFIRE_CONFERENCE" value="${WILDFIRE_CONFERENCE}" />
+				<filter token="WILDFIRE_USER" value="${WILDFIRE_USER}" />
+				<filter token="WILDFIRE_PASS" value="${WILDFIRE_PASS}" />
+				<filter token="LAMS_USER" value="${LAMS_USER}" />
+				<filter token="LAMS_PASS" value="${LAMS_PASS}" />
+			</filterset>
+		</copy>
+		<copy overwrite="yes" todir="${DEPLOYDIR}">
+			<fileset dir="${TEMP}">
+				<include name="mysql-ds.xml" />
+			</fileset>
+			<filterset>
+				<filter token="DB_NAME" value="${DB_NAME}" />
+				<filter token="DB_USER" value="${DB_USER}" />
+				<filter token="DB_PASS" value="${DB_PASS}" />
+				<filter token="MYSQL_HOST" value="${MYSQL_HOST}" />
+			</filterset>
+		</copy>
+		<copy overwrite="yes" todir="${TOMCATDIR}">
+			<fileset dir="${TEMP}">
+				<include name="server.xml" />
+			</fileset>
+			<filterset>
+				<filter token="LAMS_PORT" value="${LAMS_PORT}" />
+			</filterset>
+		</copy>
+		<copy overwrite="yes" todir="${BINDIR}">
+			<fileset dir="${TEMP}">
+				<include name="run.bat" />
+			</fileset>
+			<filterset>
+				<filter token="JAVA_HOME" value="${JDK_DIR_UNIX_SLASH}" />
+			</filterset>
+		</copy>
+		<copy overwrite="yes" todir="${INSTDIR}">
+			<fileset dir="${TEMP}">
+				<include name="wrapper.conf" />
+			</fileset>
+			<filterset>
+				<filter token="JAVA_HOME" value="${JDK_DIR_UNIX_SLASH}" />
+			</filterset>
+		</copy>
+		<copy overwrite="yes" todir="${INSTDIR}">
+			<fileset dir="${TEMP}">
+				<include name="index.html" />
+			</fileset>
+			<filterset>
+				<filter token="URL" value="${URL}" />
+			</filterset>
+		</copy>
+		<copy overwrite="yes" todir="${INSTDIR}/jboss-4.0.2/server/default/conf">
+			<fileset dir="${TEMP}">
+				<include name="login-config.xml" />
+			</fileset>
+			<filterset>
+				<filter token="confdir" value="${INSTDIR}/jboss-4.0.2/server/default/conf" />
+			</filterset>
+		</copy>
+	</target>
+	
+	<target name="import-db">
+		<sql driver="com.mysql.jdbc.Driver" 
+			classpath="${EARDIR}/mysql-connector-java-3.1.12-bin.jar" 
+			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>	
+</project>
\ No newline at end of file
Index: win_installer/installer/src/final.ini
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/src/final.ini,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/src/final.ini	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,17 @@
+[Settings]
+NumFields=2
+
+[Field 1]
+Type=Label
+Left=19
+Top=11
+Right=197
+Bottom=30
+Text="LAMS Configuration Completed.\r\n\r\n"
+
+[Field 2]
+Type=Label
+Left=19
+Top=26
+Right=218
+Bottom=47
Index: win_installer/installer/src/installer.nsi
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/src/installer.nsi,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/src/installer.nsi	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,1244 @@
+/****************************************************************
+ * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; ifnot, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $$Id: installer.nsi,v 1.1 2007/12/18 02:01:48 lfoxton Exp $$ */
+
+/**
+ * updater.nsi is actually an updater/installer/language-pack. There are 2 
+ * possibilites:
+ * 1) ifLAMS 2.x is installed and this is a newer version, the updater will be 
+ *    run
+ 
+ 
+ * 2) If there is no LAMS 2.x installation, a full install will take place
+ *
+ * Builds to win_installer\build\LAMS-updater-$VERSION.exe
+ * You must change the $VERSION to comply with this version (Line 49 approx)
+ * Change the LANGUAGE_PACK_VERSION To the date you compile YYYY-MM-DD
+ * Change the DATE_TIME_STAMP to the same as can be found in lams_common\db\sql\insert_windows_config_data.sql
+ */
+
+# includes
+!include "TextFunc.nsh"
+!include "includes\Functions.nsh"
+!include "MUI.nsh"
+!include "LogicLib.nsh"
+;!define ArrayNoTemp4
+;!include "..\includes\Array.nsh"
+
+# functions from TextFunc.nsh
+!insertmacro FileJoin
+!insertmacro LineFind
+
+# constants
+!define VERSION "2.1 Beta"
+;!define PREVIOUS_VERSION "2.0.2"
+;!define LANGUAGE_PACK_VERSION "2007-06-01"
+;!define LANGUAGE_PACK_VERSION_INT "20070601"
+!define DATE_TIME_STAMP "200712201000"
+!define SERVER_VERSION_NUMBER "${VERSION}.${DATE_TIME_STAMP}"
+!define BASE_VERSION "2.0"
+!define SOURCE_JBOSS_HOME "D:\jboss-4.0.2"  ; location of jboss where lams was deployed
+!define REG_HEAD "Software\LAMS Foundation\LAMSv2"
+!define BASE_DEV_DIR "..\..\"
+!define BUILD "..\..\build\"
+
+# installer settings
+!define MUI_ICON "${BASE_DEV_DIR}\graphics\lams2.ico"
+!define MUI_UNICON "${BASE_DEV_DIR}\graphics\lams2.ico"
+Name "LAMS ${VERSION}"
+;BrandingText "LAMS ${VERSION} -- built on ${__TIMESTAMP__}"
+BrandingText "LAMS ${VERSION} -- built on ${__DATE__} ${__TIME__}"
+OutFile "${BUILD}\LAMS-2.1-beta.exe"
+InstallDir "C:\lams"
+InstallDirRegKey HKLM "${REG_HEAD}" ""
+LicenseForceSelection radiobuttons "I Agree" "I Do Not Agree" 
+InstProgressFlags smooth
+
+
+# set warning when cancelling install
+!define MUI_ABORTWARNING
+
+# set welcome page
+!define MUI_WELCOMEPAGE_TITLE "LAMS ${VERSION} Install/Update Wizard"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of LAMS ${VERSION}.\r\n\r\n\
+    LAMS 2.1 Beta has been released for users to explore the new Branching features coming in LAMS 2.1.\r\n\r\n\
+    Do NOT use this installer to set up production server for LAMS.\r\n\r\n\  
+    You cannot use this installer to upgrade an existing copy of LAMS 2.0.\r\n\r\n\ 
+    Please ensure you have a copy of MySQL 5.x installed and running, and Java JDK version 1.5.x. or 1.6.x\r\n\r\n\
+    Click Next to continue."
+
+
+# set instfiles page to wait when done
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_UNFINISHPAGE_NOAUTOCLOSE
+
+# display finish page stuff
+!define MUI_FINISHPAGE_RUN $INSTDIR\lams-start.exe
+!define MUI_FINISHPAGE_RUN_TEXT "Start LAMS now"
+;!define MUI_FINISHPAGE_TEXT "The LAMS Server has been successfully installed on your computer."
+!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
+!define MUI_FINISHPAGE_SHOWREADME_TEXT "Open the readme file"
+!define MUI_FINISHPAGE_LINK "Visit LAMS Community"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.lamscommunity.org"
+
+# installer screen progression
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "${BASE_DEV_DIR}\license.txt"
+!insertmacro MUI_PAGE_COMPONENTS
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeave
+!insertmacro MUI_PAGE_DIRECTORY
+Page custom PreLAMSConfig PostLAMSConfig
+Page custom PreMySQLConfig PostMySQLConfig
+Page custom PreLAMS2Config PostLAMS2Config
+Page custom PreWildfireConfig PostWildfireConfig
+Page custom PreFinal PostFinal
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+;!insertmacro MUI_PAGE_WELCOME
+;!insertmacro MUI_PAGE_LICENSE "..\license.txt"
+;!insertmacro MUI_PAGE_COMPONENTS
+;!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirectoryLeave
+;!insertmacro MUI_PAGE_DIRECTORY
+;;Page custom PreMySQLConfig PostMySQLConfig
+;Page custom PreLAMSConfig PostLAMSConfig
+;Page custom PreLAMS2Config PostLAMS2Config
+;Page custom PreWildfireConfig PostWildfireConfig
+;;!insertmacro MUI_PAGE_INSTFILES
+;!insertmacro MUI_PAGE_FINISH
+
+
+# uninstaller screens
+!insertmacro MUI_UNPAGE_WELCOME
+UninstPage custom un.PreUninstall un.PostUninstall
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+
+# supported translations
+!insertmacro MUI_LANGUAGE "English" # first language is the default language
+
+
+# reserve files
+#
+ReserveFile "lams.ini"
+ReserveFile "lams2.ini"
+ReserveFile "mysql.ini"
+ReserveFile "wildfire.ini"
+;ReserveFile "lams_components.ini"
+ReserveFile "final.ini"
+!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+# variables
+Var MYSQL_DIR           ; path to user's mysql directory
+Var MYSQL_ROOT_PASS     ; root pass for mysql
+Var MYSQL_HOST            ; ip address for mysql
+Var DB_NAME             ; db name for lams
+Var DB_USER             ; db user for lams
+Var DB_PASS             ; db pass for lams
+Var JDK_DIR             ; path to user's JDK directory  
+Var LAMS_DOMAIN         ; server URL for lams
+Var LAMS_PORT           ; PORT for lams usually 8080
+Var LAMS_LOCALE         ; default language locale on startup
+Var LAMS_REPOSITORY     ; path to repository on user's box
+Var LAMS_USER           ; user name for lams system administrater
+Var LAMS_PASS           ; password for lams system administrater
+Var WILDFIRE_DOMAIN     ; wildfire URL
+Var WILDFIRE_USER       ; wildfire username
+Var WILDFIRE_PASS       ; wildfie password
+Var WINTEMP             ; temp dir
+Var RETAIN_DIR          ; path to directory to retain files on uninstall
+Var RETAIN_FILES        ; bool value to devide whether to retain files
+;Var IS_UPDATE           ; bool value to determine whether this is an update
+;Var INCLUDE_JSMATH      ; bool value to determine whether to include JBOSS
+;Var TOOL_SIG            ; tool signature used for tool deployer
+Var TIMESTAMP           ; timestamp
+;Var BACKUP              ; bool value to determine whether the updater will backup
+
+
+#LANGUAGE PACK VARIABLES #####
+;Var UPDATE_LANGUAGES    ; bool value to determine whether to update languages with language pack
+;Var LAMS_DIR            ; directory lams is installed at
+;Var VERSION_INT         ; version of the language pack
+;Var OLD_LANG_VERSION         ; previous version of language pack
+
+##############################
+
+SectionGroup "LAMS ${VERSION} Full Install" fullInstall
+    Section "JBoss 4.0.2" jboss
+
+        DetailPrint "Setting up JBoss 4.0.2"
+        SetOutPath $INSTDIR
+        File /a /r /x all /x minimal /x robyn /x log /x tmp /x work /x jsMath.war /x *.bak ${SOURCE_JBOSS_HOME}
+        
+        ; Copy jboss-cache.jar, jgroups.jar from server/all/lib to server/default/lib
+        copyfiles "$INSTDIR\jboss-4.0.2\server\all\lib\jboss-cache.jar" "$INSTDIR\jboss-4.0.2\server\default\lib"
+        copyfiles "$INSTDIR\jboss-4.0.2\server\all\lib\jgroups.jar" "$INSTDIR\jboss-4.0.2\server\default\lib"
+
+    SectionEnd
+
+    Section "LAMS ${VERSION}" lams
+
+        Detailprint "Installing LAMS ${VERSION}"
+        
+        SetOutPath $INSTDIR
+        
+        
+        Call DeployConfig
+        Call ImportDatabase
+        
+        CreateDirectory "$INSTDIR\temp"
+        
+        CreateDirectory "$INSTDIR\dump"
+        CreateDirectory "$LAMS_REPOSITORY"
+        
+        # Log mode is set to INFO in this template
+        SetOutPath "$INSTDIR\jboss-4.0.2\server\default\conf"
+        File /a "..\conf\log4j.xml"
+        
+        Call WriteRegEntries
+        
+        SetOutPath $INSTDIR
+        File /a "${BUILD}\lams-start.exe"
+        File /a "${BUILD}\lams-stop.exe"
+        File /a "${BUILD}\lams-backup.exe"
+        File /a "${BUILD}\lams-restore.exe"
+        File /a "${BASE_DEV_DIR}\license.txt"
+        File /a "${BASE_DEV_DIR}\license-wrapper.txt"
+        File /a "..\readme.txt"
+        Call SetupStartMenu
+        
+        ${if} $RETAIN_FILES == "1"
+            Call OverWriteRetainedFiles
+        ${endif}
+        
+        WriteUninstaller "$INSTDIR\lams-uninstall.exe"
+
+    SectionEnd
+    
+    Section  "Install as Service" service
+        DetailPrint "Setting up lams ${VERSION} as a service."
+        SetOutPath "$INSTDIR\jboss-4.0.2\bin"
+        File /a "${BASE_DEV_DIR}\wrapper-windows-x86-32-3.2.3\bin\wrapper.exe"
+        File /a "/oname=$INSTDIR\jboss-4.0.2\bin\InstallLAMS-NT.bat" "${BASE_DEV_DIR}\wrapper-windows-x86-32-3.2.3\bin\InstallTestWrapper-NT.bat"
+        File /a "/oname=$INSTDIR\jboss-4.0.2\bin\UninstallLAMS-NT.bat" "${BASE_DEV_DIR}\wrapper-windows-x86-32-3.2.3\bin\UninstallTestWrapper-NT.bat"
+        SetOutPath "$INSTDIR\jboss-4.0.2\lib"
+        File /a "${BASE_DEV_DIR}\wrapper-windows-x86-32-3.2.3\lib\wrapper.dll"
+        File /a "${BASE_DEV_DIR}\wrapper-windows-x86-32-3.2.3\lib\wrapper.jar"
+        CreateDirectory "$INSTDIR\jboss-4.0.2\conf"
+        CopyFiles "$INSTDIR\wrapper.conf" "$INSTDIR\jboss-4.0.2\conf\wrapper.conf"
+        CreateDirectory "$INSTDIR\jboss-4.0.2\logs"
+        nsExec::ExecToStack '$INSTDIR\jboss-4.0.2\bin\InstallLAMS-NT.bat'
+        Pop $0
+        ${If} $0 == 0
+            DetailPrint "LAMSv2 successfully setup as a service. ($0)"
+        ${Else}
+            DetailPrint "LAMSv2 was not setup as a service. ($0)"
+            MessageBox MB_OK|MB_ICONEXCLAMATION "LAMSv2 was not installed as a service.  However you may start LAMS by double-clicking $INSTDIR\jboss-4.0.2\bin\run.bat."
+        ${EndIf}        
+    SectionEnd
+SectionGroupEnd
+
+/*
+SectionGroup "jsMath (optional)"
+    
+    Section /o "jsMath (compressed)" jsmathc
+        SetOutPath "$INSTDIR\jboss-4.0.2\server\default\deploy"
+        File /a /r  "${BASE_DEV_DIR}\..\jsmath\build\lib\jsMath.war"
+    SectionEnd
+
+    Section /o "jsMath (expanded)" jsmathe
+            DetailPrint "Including jsMath in LAMS ${VERSION}"
+            SetOutPath "$TEMP"
+            File /a  "${BASE_DEV_DIR}\..\jsmath\build\lib\jsMath.war"
+            CreateDirectory "$INSTDIR\jboss-4.0.2\server\default\deploy\jsMath.war"
+            SetOutPath "$INSTDIR\jboss-4.0.2\server\default\deploy\jsMath.war"
+            DetailPrint "$JDK_DIR\bin\jar xf $TEMP\jsMath.war"
+            DetailPrint "Expanding jsMath.war... This may take several minutes"
+            nsExec::ExecToStack "$JDK_DIR\bin\jar xf $TEMP\jsMath.war"
+            Pop $0
+            Pop $1
+            
+            CreateDirectory "$INSTDIR\install_logs"
+    
+            FileOpen $R0 "$INSTDIR\install_logs\installer_jsmathe.log" w
+                IfErrors 0 +2
+                    goto error
+            FileWrite $R0 $1
+            FileClose $R0
+            
+            ${If} $0 != 0
+                DetailPrint "Failed to expand jsMath.war."
+                DetailPrint "Error: $1"
+            ${EndIf}
+            Delete "$TEMP\jsMath.war"
+            
+            goto done
+            error:
+                DetailPrint "Problem opening $INSTDIR\install_logs\installer_jsmathe.log for writing"
+            done:
+    SectionEnd
+SectionGroupEnd
+*/
+
+# functions
+#
+
+Function .onInit
+    
+    # Checking to see ifLAMS is installed 
+    call checkRegistry
+
+    # extract custom page display config
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "lams.ini"
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "lams2.ini"
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "mysql.ini"
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "wildfire.ini"
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "final.ini"
+    
+    # set jsmath exploded size (assumes 4KB cluster size on destination hdd)
+    SectionSetSize ${jsmathe} 81816
+    
+FunctionEnd
+
+
+################################################################################
+# USER INTERFACE CODE                                                          #
+################################################################################
+
+Function checkRegistry
+    # Check the current version installed (ifany)
+    ReadRegStr $0 HKLM "${REG_HEAD}" "version" 
+    
+    ${if} $0 == ""
+    ${else}
+        MessageBox MB_OK|MB_ICONSTOP "You already have LAMS $0 Installed on your computer. You must uninstall before continuing."
+        Abort
+
+    ${endif}
+FunctionEnd
+
+
+Function CheckJava
+    # check for JDK
+    ${If} $JDK_DIR == ""
+        ReadRegStr $JDK_DIR HKLM "SOFTWARE\JavaSoft\Java Development Kit\1.6" "JavaHome"
+        ${If} $JDK_DIR == ""
+            ReadRegStr $JDK_DIR HKLM "SOFTWARE\JavaSoft\Java Development Kit\1.5" "JavaHome"
+            ${if} $JDK_DIR == ""
+                MessageBox MB_OK|MB_ICONSTOP "Could not find a Java JDK 1.5 or 1.6 installation.  Please enter where you have java 5 or 6 installed."
+            ${EndIf}
+        ${EndIf}
+    ${endif}
+
+FunctionEnd
+
+Function Checkjava2    
+    # check java version using given dir
+    nsExec::ExecToStack '$JDK_DIR\bin\javac.exe -version'
+    Pop $0
+    Pop $1
+    ${StrStr} $0 $1 "1.6"
+    ${If} $0 == ""
+        ${StrStr} $0 $1 "1.5"
+        ${If} $0 == ""
+            MessageBox MB_OK|MB_ICONEXCLAMATION "Could not find a Java 5 or Java 6 installation in the given directory. $\r$\nPlease check your Java installation and try again.$\r$\n$\r$\n$JDK_DIR"
+            Abort
+        ${EndIf}
+    ${EndIf}
+FunctionEnd
+
+
+Function CheckMySQL  
+        # check mysql version is 5.0.x
+        Setoutpath "$TEMP\lams\"
+        File "${BUILD}\checkmysqlversion.class"
+        File "${BASE_DEV_DIR}\mysql-connector-java-3.1.12-bin.jar"
+        nsExec::ExecToStack '$JDK_DIR\bin\java.exe -cp ".;$TEMP\lams\mysql-connector-java-3.1.12-bin.jar" checkmysqlversion "jdbc:mysql://$MYSQL_HOST/?characterEncoding=utf8" root "$MYSQL_ROOT_PASS"'
+        Pop $0
+        Pop $1
+        ${If} $0 != 0
+            ${StrStr} $3 $1 "UnknownHostException"
+            ${if} $3 == "" 
+                MessageBox MB_OK|MB_ICONEXCLAMATION "An error occurred whilst checking your mysql configuration $\r$\n$\r$\nError: $1"
+            ${else}
+                MessageBox MB_OK|MB_ICONEXCLAMATION "An error occurred whilst checking your mysql configuration $\r$\n$\r$\nError: Could not connect to MySql host: $MYSQL_HOST. Please check your database configurations and try again."
+            ${endif}               
+            Abort
+        ${EndIf}
+        Delete "$TEMP\lams\checkmysqlversion.class"
+        Delete "$TEMP\mysql-connector-java-3.1.12-bin.jar"  
+FunctionEnd
+
+Function DirectoryLeave
+    # check for spaces in instdir
+    ${StrStr} $0 $INSTDIR " "
+    ${If} $0 != ""
+        MessageBox MB_OK|MB_ICONEXCLAMATION "Please choose a location without a space."
+        Abort
+    ${EndIf}
+    # check LAMS 1
+    ReadRegStr $0 HKLM "SOFTWARE\LAMS\Server" "install_dir"
+    ReadRegStr $1 HKLM "SOFTWARE\LAMS\Server" "install_status"
+    ReadRegStr $2 HKLM "SOFTWARE\LAMS\Server" "install_version"
+    ${If} $1 == "successful"
+        MessageBox MB_OK|MB_ICONINFORMATION "ifyou have LAMS $2 on your system, remember not to run it at the same time as LAMS ${VERSION} (unless you know what you're doing)."
+        ${If} $0 == $INSTDIR
+            MessageBox MB_OK|MB_ICONEXCLAMATION "There appears to be a LAMS $2 installation at $INSTDIR - please chose another location."
+            Abort
+        ${EndIf}
+    ${EndIf}
+    
+    Strcpy $RETAIN_FILES "0"
+
+    
+    IfFileExists "$INSTDIR\backup\backup.zip" backupExists end
+    backupExists:
+        ; CHECK ifthere are files retained from a previous uninstall
+        ; THEN after installation, overwrite retained files and free files from temp folder temp folder 
+        strcpy $6 ""
+        MessageBox MB_YESNO|MB_ICONQUESTION "Installer has detected database, repository and uploaded files retained from a previous install, do you wish to use them?" \
+                    IDYES retainFiles \
+                    IDNO noRetain
+        noRetain:
+            MessageBox MB_OK "Files will be backed up at $INSTDIR\backup"
+            goto end
+        retainFiles:
+            Strcpy $WINTEMP "C:\WINDOWS\Temp"
+            Strcpy $RETAIN_FILES "1"
+            #CopyFiles $INSTDIR $WINTEMP
+            #MessageBox MB_OK|MB_ICONEXCLAMATION "$RETAIN_FILES \n $RETAIN_REP $\n $RETAIN_CONF $\n $RETAIN_DB"
+    end:
+FunctionEnd
+
+
+Function PreMySQLConfig
+    #Call CheckMySQL
+    # check for MySQL in registry
+    ReadRegStr $MYSQL_DIR HKLM "SOFTWARE\MySQL AB\MySQL Server 5.0" "Location"
+    ${If} $MYSQL_DIR == ""
+        ReadRegStr $MYSQL_DIR HKLM "SOFTWARE\MySQL AB\MySQL Server 5.1" "Location"
+        ${If} $MYSQL_DIR == ""
+                #messageBox MB_OK|MB_ICONSTOP "Could not find a MySQL installation.  Please ensure you have MySQL 5.0 or 5.1 installed."
+        ${endif}
+    ${endif}
+    
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "mysql.ini" "Field 3" "State" "$MYSQL_DIR"
+    !insertmacro MUI_HEADER_TEXT "Setting Up MySQL Database Access (2/4)" "Choose a MySQL database and user account for LAMS.  if unsure, use the defaults."
+    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "mysql.ini"
+
+FunctionEnd
+
+Function PostMySQLConfig
+
+    !insertmacro MUI_INSTALLOPTIONS_READ $MYSQL_DIR "mysql.ini" "Field 3" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $MYSQL_ROOT_PASS "mysql.ini" "Field 5" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $DB_NAME "mysql.ini" "Field 7" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $DB_USER "mysql.ini" "Field 9" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $DB_PASS "mysql.ini" "Field 10" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $MYSQL_HOST "mysql.ini" "Field 14" "State"
+
+    call CheckMySQL 
+FunctionEnd
+
+
+Function PreLAMSConfig
+    Call CheckJava
+
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 2" "State" "$JDK_DIR"
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 4" "State" "$INSTDIR\repository"
+    !insertmacro MUI_HEADER_TEXT "Setting Up LAMS (1/4)" "Configure the LAMS Server.  if unsure, use the defaults."
+    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "lams.ini"
+
+FunctionEnd
+
+
+Function PostLAMSConfig
+    
+
+    !insertmacro MUI_INSTALLOPTIONS_READ $JDK_DIR "lams.ini" "Field 2" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_REPOSITORY "lams.ini" "Field 4" "State"
+    
+    # check java version using given dir
+    Call Checkjava2
+    
+FunctionEnd
+
+
+Function PreLAMS2Config
+        !insertmacro MUI_HEADER_TEXT "Setting Up LAMS (3/4)" "Configure the LAMS Server, and choose an admin username and password."
+        !insertmacro MUI_INSTALLOPTIONS_DISPLAY "lams2.ini"
+FunctionEnd
+
+
+Function PostLAMS2Config
+        !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_DOMAIN "lams2.ini" "Field 8" "State"
+        !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_PORT "lams2.ini" "Field 9" "State"
+        !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_LOCALE "lams2.ini" "Field 12" "State"
+        !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_USER "lams2.ini" "Field 2" "State"
+        !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_PASS "lams2.ini" "Field 5" "State"
+FunctionEnd
+
+
+Function PreWildfireConfig
+        !insertmacro MUI_HEADER_TEXT "Setting Up Wildfire Chat Server (4/4)" "Configure Wildfire, chat server for LAMS.  if unsure, use the default."
+        !insertmacro MUI_INSTALLOPTIONS_DISPLAY "wildfire.ini"
+FunctionEnd
+
+
+Function PostWildfireConfig
+
+    !insertmacro MUI_INSTALLOPTIONS_READ $WILDFIRE_DOMAIN "wildfire.ini" "Field 2" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $WILDFIRE_USER "wildfire.ini" "Field 5" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $WILDFIRE_PASS "wildfire.ini" "Field 7" "State"
+
+        # check wildfire is running by checking client connection port 5222
+    SetOutPath $TEMP
+    File "${BUILD}\LocalPortScanner.class"
+    nsExec::ExecToStack '$JDK_DIR\bin\java LocalPortScanner 5222'
+    Pop $0
+    Pop $1
+    ${If} $0 == 0
+        MessageBox MB_OKCANCEL|MB_ICONQUESTION "Wildfire does not appear to be running - LAMS will be OK, but chat rooms will be unavailable." IDOK noWildfire IDCANCEL cancel
+        cancel:
+            Abort
+        noWildfire:
+    ${EndIf}
+
+FunctionEnd
+
+Function PreFinal
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "final.ini" "Field 2" "Text" "Click 'Install' to commence installation of LAMS ${VERSION}"  
+    !insertmacro MUI_HEADER_TEXT "LAMS ${VERSION}" "Configuration Completed"
+    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "final.ini"
+FunctionEnd
+
+Function PostFinal
+
+    Call GetLocalTime
+    Pop "$0" ;Variable (for day)
+    Pop "$1" ;Variable (for month)
+    Pop "$2" ;Variable (for year)
+    Pop "$3" ;Variable (for day of week name)
+    Pop "$4" ;Variable (for hour)
+    Pop "$5" ;Variable (for minute)
+    Pop "$6" ;Variable (for second)
+    
+    strlen $7 $0
+    ${if} $7 == 1
+        strcpy $0 "0$0"
+    ${endif}
+    
+    strlen $7 $1
+    ${if} $7 == 1
+        strcpy $1 "0$1"
+    ${endif}
+    
+    strlen $7 $4
+    ${if} $7 == 1
+        strcpy $4 "0$4"
+    ${endif}
+    
+    strlen $7 $5
+    ${if} $7 == 1
+        strcpy $1 "0$5"
+    ${endif}
+    
+    
+    strcpy $TIMESTAMP "$2$1$0$4$5"
+    
+FunctionEnd
+
+################################################################################
+# END USER INTERFACE CODE                                                      #
+################################################################################
+
+
+
+
+
+################################################################################
+# CODE USED FOR INSTALLER                                                      #
+################################################################################    
+
+Function DeployConfig
+    # extract support files to write configuration
+    SetOutPath $INSTDIR
+    File /r "${BASE_DEV_DIR}\apache-ant-1.6.5"
+    File /r "${BASE_DEV_DIR}\zip"
+    SetOutPath $TEMP
+    File "build.xml"
+    File "..\templates\mysql-ds.xml"
+    File "..\templates\server.xml"
+    File "..\templates\run.bat"
+    File "..\templates\wrapper.conf"
+    File "..\templates\index.html"
+    File "..\templates\update_lams_configuration.sql"
+    File "..\conf\login-config.xml"
+      
+    # create installer.properties
+    ClearErrors
+    FileOpen $0 $TEMP\installer.properties w
+    IfErrors 0 +2
+        goto error
+        
+    # convert '\' to '/' for Ant's benefit
+    Push $TEMP
+    Push "\"
+    Call StrSlash
+    Pop $2
+    FileWrite $0 "TEMP=$2$\r$\n"
+            
+    Push $INSTDIR
+    Push "\"
+    Call StrSlash
+    Pop $2
+    FileWrite $0 "URL=http://$LAMS_DOMAIN:$LAMS_PORT/lams/$\r$\n"
+    FileWrite $0 "INSTDIR=$2/$\r$\n"
+    FileWrite $0 "TEMPDIR=$2/temp$\r$\n"
+    FileWrite $0 "DUMPDIR=$2/dump$\r$\n"
+    FileWrite $0 "EARDIR=$2/jboss-4.0.2/server/default/deploy/lams.ear$\r$\n"
+    FileWrite $0 "DEPLOYDIR=$2/jboss-4.0.2/server/default/deploy$\r$\n"
+    FileWrite $0 "TOMCATDIR=$2/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar$\r$\n"
+    FileWrite $0 "BINDIR=$2/jboss-4.0.2/bin$\r$\n"
+    
+    # Use unix slashes for config in wrapper.conf
+    Push $JDK_DIR
+    Push "\"
+    Call StrSlash
+    Pop $2
+    FileWrite $0 "JDK_DIR_UNIX_SLASH=$2$\r$\n"
+    
+    Push $LAMS_REPOSITORY
+    Push "\"
+    Call StrSlash
+    Pop $2
+    FileWrite $0 "REPOSITORYDIR=$2$\r$\n"
+        
+    StrCpy $LAMS_LOCALE $LAMS_LOCALE 5
+    FileWrite $0 "LOCALE=$LAMS_LOCALE$\r$\n"
+    ${If} $LAMS_LOCALE == "ar_JO"
+        FileWrite $0 "LOCALE_DIRECTION=RTL$\r$\n"
+    ${Else}
+        FileWrite $0 "LOCALE_DIRECTION=LTR$\r$\n"
+    ${EndIf}
+      
+    FileWrite $0 "WILDFIRE_DOMAIN=$WILDFIRE_DOMAIN$\r$\n"
+    FileWrite $0 "WILDFIRE_CONFERENCE=conference.$WILDFIRE_DOMAIN$\r$\n"
+    FileWrite $0 "WILDFIRE_USER=$WILDFIRE_USER$\r$\n"
+    FileWrite $0 "WILDFIRE_PASS=$WILDFIRE_PASS$\r$\n"
+    
+    FileWrite $0 "MYSQL_HOST=$MYSQL_HOST$\r$\n"
+    FileWrite $0 "DB_NAME=$DB_NAME$\r$\n"
+    FileWrite $0 "DB_USER=$DB_USER$\r$\n"
+    FileWrite $0 "DB_PASS=$DB_PASS$\r$\n"
+    
+    FileWrite $0 "LAMS_PORT=$LAMS_PORT$\r$\n"
+    FileWrite $0 "LAMS_USER=$LAMS_USER$\r$\n"
+    FileWrite $0 "LAMS_PASS=$LAMS_PASS$\r$\n"
+    FileClose $0
+    # for debugging purposes
+    CopyFiles "$TEMP\installer.properties" $INSTDIR
+        
+    # use Ant to write config to files
+    FileOpen $0 "$INSTDIR\apache-ant-1.6.5\bin\newAnt.bat" w
+    IfErrors 0 +2
+        goto error
+    FileWrite $0 "@echo off$\r$\nset JAVACMD=$JDK_DIR\bin\java$\r$\n"
+    FileClose $0
+    ${FileJoin} "$INSTDIR\apache-ant-1.6.5\bin\newAnt.bat" "$INSTDIR\apache-ant-1.6.5\bin\ant.bat" ""
+    DetailPrint '$INSTDIR\apache-ant-1.6.5\bin\newAnt.bat configure-deploy'
+   
+   
+   
+    nsExec::ExecToStack '$INSTDIR\apache-ant-1.6.5\bin\newAnt.bat -buildfile $TEMP\build.xml configure-deploy'
+    Pop $0 ; return code, 0=success, error=fail
+    Pop $1 ; console output
+    
+    
+    CreateDirectory "$INSTDIR\install_logs"
+    
+    FileOpen $R0 "$INSTDIR\install_logs\installer_ant.log" w
+    IfErrors 0 +2
+        goto error
+    FileWrite $R0 $1
+    FileClose $R0
+    
+    ${If} $0 == "error"
+        goto error
+    ${EndIf}
+    ${StrStr} $0 $1 "BUILD SUCCESSFUL"
+    ${If} $0 == ""
+        goto error
+    ${EndIf}
+    
+    # write my.ini ifexists, doesnt write READ-COMMITTED ifits already written
+    # TODO doesn't take effect until mysql server is restarted
+    DetailPrint "Setting MySQL transaction-isolation to READ-COMMITTED"
+    iffileexists "$MYSQL_DIR\my.ini" 0 difini
+        push "$MYSQL_DIR\my.ini"
+        push "transaction-isolation=READ-COMMITTED"
+        Call FileSearch
+        Pop $0 #Number of times found throughout
+        Pop $3 #Found at all? yes/no
+        Pop $2 #Number of lines found in
+        intcmp $0 0 0 done done
+            clearerrors
+            ${LineFind} "$MYSQL_DIR\my.ini" "" "1" "WriteMyINI"
+            IfErrors nomyini myini            
+    difini:
+    iffileexists "$WINDIR\my.ini" 0 nomyini
+        push "$WINDIR\my.ini"
+        push "transaction-isolation=READ-COMMITTED"
+        Call FileSearch
+        Pop $0 #Number of times found throughout
+        Pop $3 #Found at all? yes/no
+        Pop $2 #Number of lines found in
+        intcmp $0 0 0 done done
+            clearerrors
+            ${LineFind} "$WINDIR\my.ini" "" "1" "WriteMyINI"
+            IfErrors nomyini myini
+    nomyini:
+        MessageBox MB_OK|MB_ICONEXCLAMATION "Couldn't write to $MYSQL_DIR\my.ini.  Please write this text into your MySQL configuration file and restart MySQL:$\r$\n$\r$\n[mysqld]$\r$\ntransaction-isolation=READ-COMMITTED"       
+        goto done
+    myini:
+        DetailPrint "MySQL will need to be restarted for this to take effect."
+        goto done
+    error:
+        DetailPrint "Ant configure-deploy failed."
+        MessageBox MB_OK|MB_ICONSTOP "LAMS configuration failed.  Please check your LAMS configuration and try again.$\r$\nError:$\r$\n$\r$\n$1"
+        Abort "LAMS configuration failed."
+    done:
+FunctionEnd
+
+
+Function WriteMyINI
+    FileWrite $R4 "[mysqld]$\r$\n"
+    FileWrite $R4 "transaction-isolation=READ-COMMITTED$\r$\n"
+    Push $0
+FunctionEnd
+
+Function ImportDatabase
+    SetOutPath $TEMP
+    File "${BUILD}\dump.sql"
+    
+    FileOpen $R0 "$INSTDIR\install_logs\installer_db.log" w
+            IfErrors 0 +2
+        goto error
+    
+    # Only do this ifmysql is set up on local host 
+    #######################################################
+    ${If} $MYSQL_HOST == 'localhost'
+        # $9 == 0 for empty password
+        StrLen $9 $MYSQL_ROOT_PASS
+        StrCpy $0 '$MYSQL_DIR\bin\mysql -e "CREATE DATABASE $DB_NAME DEFAULT CHARACTER SET utf8" -u root'
+        DetailPrint $0
+        ${If} $9 != 0
+            StrCpy $0 '$MYSQL_DIR\bin\mysql -e "CREATE DATABASE $DB_NAME DEFAULT CHARACTER SET utf8" -u root -p$MYSQL_ROOT_PASS' 
+        ${EndIf}
+        nsExec::ExecToStack $0
+        Pop $0
+        Pop $1
+        FileWrite $R0 "$1$\n"
+        ${If} $0 == 1
+            goto error
+        ${EndIf}
+        
+        StrCpy $0 `$MYSQL_DIR\bin\mysql -e "GRANT ALL PRIVILEGES ON *.* TO $DB_USER@localhost IDENTIFIED BY '$DB_PASS'" -u root`
+        DetailPrint $0
+        ${If} $9 != 0
+            StrCpy $0 `$MYSQL_DIR\bin\mysql -e "GRANT ALL PRIVILEGES ON *.* TO $DB_USER@localhost IDENTIFIED BY '$DB_PASS'" -u root -p$MYSQL_ROOT_PASS`
+        ${EndIf}
+        nsExec::ExecToStack $0
+        Pop $0
+        Pop $1
+        FileWrite $R0 "$1$\n"
+        ${If} $0 == 1
+            goto error
+        ${EndIf}
+        
+        StrCpy $0 '$MYSQL_DIR\bin\mysql -e "REVOKE PROCESS,SUPER ON *.* from $DB_USER@localhost" -u root'
+        DetailPrint $0
+        ${If} $9 != 0
+            StrCpy $0 '$MYSQL_DIR\bin\mysql -e "REVOKE PROCESS,SUPER ON *.* from $DB_USER@localhost" -u root -p$MYSQL_ROOT_PASS' 
+        ${EndIf}
+        nsExec::ExecToStack $0
+        Pop $0
+        Pop $1
+        FileWrite $R0 "$1$\n"
+        ${If} $0 == 1
+            goto error
+        ${EndIf}
+        
+        StrCpy $0 '$MYSQL_DIR\bin\mysqladmin flush-privileges -u root'
+        DetailPrint $0
+        ${If} $9 != 0
+            StrCpy $0 '$MYSQL_DIR\bin\mysqladmin flush-privileges -u root -p$MYSQL_ROOT_PASS' 
+        ${EndIf}
+        nsExec::ExecToStack $0
+        Pop $0
+        Pop $1
+        FileWrite $R0 "$1$\n"
+        ${If} $0 == 1
+            goto error
+        ${EndIf}
+        
+         ${if} $RETAIN_FILES == '1'      
+            #unzip repository files
+            setoutpath "$INSTDIR\backup"
+            strcpy $4 '$INSTDIR\zip\7za.exe x -aoa "backup.zip"'
+            nsExec::ExecToStack $4
+            pop $5
+            pop $6
+            FileWrite $R0 "$6$\n"
+            ${if} $5 != 0
+                Detailprint  "7za Unzip error: $\r$\n$\r$\n$6"
+                MessageBox MB_OK|MB_ICONSTOP "7za Unzip error:$\r$\nError:$\r$\n$\r$\n$6"
+                Abort "Lams configuration failed"
+            ${endif}
+             
+            #replace the install dump with the retained dump    
+            #MessageBox MB_OK|MB_ICONEXCLAMATION "Rebuilding datbase"   
+            CopyFiles "$INSTDIR\backup\lamsDump.sql" "$TEMP\dump.sql"     
+            DetailPrint "Using retained database: $INSTDIR\backup\lamsDump.sql"
+            
+            RMdir /r  "$INSTDIR\backup\jboss-4.0.2"
+            RMdir /r  "$INSTDIR\backup\repository"
+            delete  "$INSTDIR\backup\lamsDump.sql"
+            
+            Detailprint  "finished copying lamsdump.sql"
+         ${endif}
+     ${endif}
+     #######################################################
+       
+    SetOutPath $TEMP
+    # use Ant to import database
+    DetailPrint '$INSTDIR\apache-ant-1.6.5\bin\ant.bat import-db'
+    nsExec::ExecToStack '$INSTDIR\apache-ant-1.6.5\bin\newAnt.bat import-db'
+    # MessageBox MB_OK|MB_ICONEXCLAMATION "Database has been filled"
+    Pop $0 ; return code, 0=success, error=fail
+    Pop $1 ; console output
+    FileWrite $R0 "$1$\n"
+    DetailPrint "DB import status: $0"
+    DetailPrint "DB import output: $1"
+    
+    FileClose $R0
+
+    goto done 
+    error:
+        MessageBox MB_OK|MB_ICONSTOP "Database setup failed.  Please check your MySQL configuration and try again.$\r$\nError:$\r$\n$\r$\n$1"
+        Abort "Database setup failed."
+    done:
+    
+FunctionEnd
+
+
+Function WriteRegEntries
+    WriteRegStr HKLM "${REG_HEAD}" "dir_jdk" $JDK_DIR
+    WriteRegStr HKLM "${REG_HEAD}" "dir_mysql" "$MYSQL_DIR\"
+    WriteRegStr HKLM "${REG_HEAD}" "mysql_host" "$MYSQL_HOST"
+    WriteRegStr HKLM "${REG_HEAD}" "dir_inst" $INSTDIR
+    WriteRegStr HKLM "${REG_HEAD}" "dir_repository" $LAMS_REPOSITORY
+    WriteRegStr HKLM "${REG_HEAD}" "version" "${VERSION}"
+    WriteRegStr HKLM "${REG_HEAD}" "server_version" "${SERVER_VERSION_NUMBER}"
+    WriteRegStr HKLM "${REG_HEAD}" "db_name" $DB_NAME
+    WriteRegStr HKLM "${REG_HEAD}" "db_user" $DB_USER
+    WriteRegStr HKLM "${REG_HEAD}" "db_pass" $DB_PASS
+    WriteRegStr HKLM "${REG_HEAD}" "lams_domain" $LAMS_DOMAIN
+    WriteRegStr HKLM "${REG_HEAD}" "lams_port" $LAMS_PORT
+    WriteRegStr HKLM "${REG_HEAD}" "lams_locale" $LAMS_LOCALE
+    WriteRegStr HKLM "${REG_HEAD}" "wildfire_domain" $WILDFIRE_DOMAIN
+    WriteRegStr HKLM "${REG_HEAD}" "wildfire_user" $WILDFIRE_USER
+    WriteRegStr HKLM "${REG_HEAD}" "wildfire_pass" $WILDFIRE_PASS
+FunctionEnd
+
+Function OverWriteRetainedFiles
+    # overwriting retain files (moved to windows/temp) to install directory files
+    ${if} $RETAIN_FILES == "1"
+        #MessageBox MB_OK|MB_ICONSTOP "repository files to be retained"
+        
+        #unzip repository files
+        setoutpath "$INSTDIR\backup"
+        strcpy $4 '$INSTDIR\zip\7za.exe x -aoa "backup.zip"'
+        nsExec::ExecToStack $4
+        #pop $0
+        #pop $1
+        #MessageBox MB_OK|MB_ICONSTOP "Extracting retained files: $0$\n$1"
+        
+        #copy repository and uploaded files to install directory
+        CopyFiles "$WINTEMP\lams\backup\repository" "$INSTDIR\" 
+        DetailPrint "$INSTDIR\repository"
+        CopyFiles "$WINTEMP\lams\backup\jboss-4.0.2\server\default\deploy\lams.ear\lams-www.war" "$INSTDIR\jboss-4.0.2\server\default\deploy\lams.ear\"
+        DetailPrint "Overwrite $INSTDIR\jboss-4.0.2\server\default\deploy\lams.ear\lams-www.war"
+    ${endif}
+    RMdir "$WINTEMP\lams"
+FunctionEnd
+
+Function SetupStartMenu
+    CreateDirectory "$SMPROGRAMS\LAMSv2"
+    CreateShortCut "$SMPROGRAMS\LAMSv2\Access LAMS.lnk" "http://$LAMS_DOMAIN:$LAMS_PORT/lams/"
+    CreateShortCut "$SMPROGRAMS\LAMSv2\LAMS Community.lnk" "http://www.lamscommunity.org"
+    CreateShortCut "$SMPROGRAMS\LAMSv2\Start LAMS.lnk" "$INSTDIR\lams-start.exe"
+    CreateShortCut "$SMPROGRAMS\LAMSv2\Stop LAMS.lnk" "$INSTDIR\lams-stop.exe"
+    CreateShortCut "$SMPROGRAMS\LAMSv2\Backup LAMS.lnk" "$INSTDIR\lams-backup.exe"
+    CreateShortCut "$SMPROGRAMS\LAMSv2\Restore previous LAMS version.lnk" "$INSTDIR\lams-restore.exe"
+    CreateShortCut "$SMPROGRAMS\LAMSv2\Uninstall LAMS.lnk" "$INSTDIR\lams-uninstall.exe"
+FunctionEnd
+
+
+# cleanup functions
+Function RemoveTempFiles
+    Delete "$TEMP\LocalPortScanner.class"
+    Delete "$TEMP\mysql-ds.xml"
+    Delete "$TEMP\server.xml"
+    Delete "$TEMP\run.bat"
+    Delete "$TEMP\wrapper.conf"
+    Delete "$TEMP\dump.sql"
+    Delete "$TEMP\build.xml"
+    Delete "$TEMP\installer.properties"
+    Delete "$INSTDIR\wrapper.conf"
+    Delete "$TEMP\index.html"
+    Delete "$TEMP\update_lams_configuration.sql"
+    Delete "$TEMP\login-config.xml"
+    Delete "$INSTDIR\update_lams_configuration.sql"
+    RMDIR /r "$WINTEMP\lams"
+FunctionEnd
+
+Function .onInstFailed 
+    ;remove all files from the instdir excluding the backed up files
+    RMDir /r "$INSTDIR\jboss-4.0.2"
+    RMDir /r "$INSTDIR\dump"
+    RMDir /r "$INSTDIR\repository"
+    RMDir /r "$INSTDIR\temp"
+    RMDir /r "$INSTDIR\build"
+    Delete "$INSTDIR\index.html"
+    Delete "$INSTDIR\installer.properties"
+    Delete "$INSTDIR\installer_ant.log"
+    Delete "$INSTDIR\lams-start.exe"
+    Delete "$INSTDIR\lams-stop.exe"
+    Delete "$INSTDIR\lams-backup.exe"
+    Delete "$INSTDIR\lams-restore.exe"
+    Delete "$INSTDIR\lams_uninstall.exe"
+    Delete "$INSTDIR\license.txt"
+    Delete "$INSTDIR\readme.txt"
+
+        strcpy $0 $MYSQL_DIR
+        strcpy $1 $DB_NAME
+        strcpy $2 $DB_USER
+        strcpy $3 $DB_PASS
+    
+        StrLen $9 $3
+        StrCpy $4 '$0\bin\mysql -e "DROP DATABASE $1" -u $2'
+    DetailPrint $4
+    ${If} $9 != 0
+        StrCpy $4 '$0\bin\mysql -e "DROP DATABASE $1" -u $2 -p$3' 
+    ${EndIf}
+    
+    ReadRegStr $MYSQL_HOST HKLM "${REG_HEAD}" "mysql_host"
+    ${If} $MYSQL_HOST == 'localhost'
+        nsExec::ExecToStack $4
+        Pop $0
+        Pop $1
+        ${If} $0 == 1
+            MessageBox MB_OK|MB_ICONEXCLAMATION "Couldn't remove LAMS database:$\r$\n$\r$\n$1"
+            DetailPrint "Failed to remove LAMS database."
+        ${EndIf}
+    ${EndIf}
+    
+    Call RemoveTempFiles
+    DeleteRegKey HKLM "${REG_HEAD}"
+FunctionEnd
+
+Function .onInstSuccess
+    DetailPrint "LAMS ${VERSION} configuration successful."
+    Call RemoveTempFiles
+    RMDir /r "$INSTDIR\apache-ant-1.6.5"
+    RMDir /r "$INSTDIR\zip"
+    RMDir /r "$INSTDIR\backup\repository"
+    RMDIR /r "$INSTDIR\backup\jboss-4.0.2"
+    Delete "$INSTDIR\backup\lamsDump.sql"
+FunctionEnd
+
+################################################################################
+# END CODE USED FOR INSTALLER                                                  #
+################################################################################
+
+
+
+
+################################################################################
+# CODE USED FOR UNINSTALLER                                                    #
+################################################################################
+# Uninstaller
+#
+Var UNINSTALL_RETAIN
+#Var UNINSTALL_DB
+#Var UNINSTALL_RP
+#Var UNINSTALL_CF
+
+Function un.onInit
+    ;!insertmacro MUI_LANGDLL_DISPLAY
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "uninstall.ini"
+    
+    # check ifLAMS is stopped
+    SetOutPath $TEMP
+    File "${BUILD}\LocalPortScanner.class"
+    ReadRegStr $0 HKLM "${REG_HEAD}" "lams_port"
+    ReadRegStr $1 HKLM "${REG_HEAD}" "dir_jdk"
+    Goto checklams
+    
+    checklams:
+        nsExec::ExecToStack "$1\bin\java LocalPortScanner $0"
+        Pop $2
+        ${If} $2 == 2
+            MessageBox MB_YESNO|MB_ICONQUESTION "LAMS appears to be running.  Do you wish to stop LAMS?" \
+                IDYES stoplams \
+                IDNO quit
+        ${EndIf}
+        Goto continue
+    stoplams:
+        nsExec::ExecToStack 'sc stop LAMSv2'
+        Pop $0
+        Pop $1
+        DetailPrint "Sent stop command to LAMS service."
+        sleep 10000
+        Goto checklams
+        # sleep for 10s to ensure that JBoss closes properly
+        
+    quit:
+        Delete "$TEMP\LocalPortScanner.class"
+        MessageBox MB_OK|MB_ICONSTOP "Uninstall cannot continue while LAMS is running."
+        Abort
+    
+    continue:
+        Delete "$TEMP\LocalPortScanner.class"
+FunctionEnd
+
+Function un.PreUninstall
+    !insertmacro MUI_HEADER_TEXT "Remove LAMS Database" "Choose whether to remove the LAMS database."
+    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "uninstall.ini"
+FunctionEnd
+
+Function un.PostUninstall      
+    !insertmacro MUI_INSTALLOPTIONS_READ $UNINSTALL_RETAIN "uninstall.ini" "Field 1" "State"
+    ReadRegStr $MYSQL_HOST HKLM "${REG_HEAD}" "mysql_host"
+    ${if} $UNINSTALL_RETAIN == 1
+        ${if} MYSQL_HOST != 'localhost'
+            MessageBox MB_YESNO|MB_ICONQUESTION "Unable to backup LAMS. MYSQL_HOST is not set to localhost. Manual backup required. $\r$\n$\r$\nWould you like to quit the uninstaller and backup LAMS manually? ifyou choose 'No', the unistallation will proceed and lams will not be backed up." IDYES quit IDNO continue
+                quit:
+                    Quit
+                continue:
+        ${endif}
+    ${endif}   
+FunctionEnd
+
+
+# http://nsis.sourceforge.net/StrStr
+#
+!define un.StrStr "!insertmacro un.StrStr"
+ 
+!macro un.StrStr ResultVar String SubString
+  Push `${String}`
+  Push `${SubString}`
+  Call un.StrStr
+  Pop `${ResultVar}`
+!macroend
+
+Function un.StrStr
+/*After this point:
+  ------------------------------------------
+  $R0 = SubString (input)
+  $R1 = String (input)
+  $R2 = SubStringLen (temp)
+  $R3 = StrLen (temp)
+  $R4 = StartCharPos (temp)
+  $R5 = TempStr (temp)*/
+ 
+  ;Get input from user
+  Exch $R0
+  Exch
+  Exch $R1
+  Push $R2
+  Push $R3
+  Push $R4
+  Push $R5
+ 
+  ;Get "String" and "SubString" length
+  StrLen $R2 $R0
+  StrLen $R3 $R1
+  ;Start "StartCharPos" counter
+  StrCpy $R4 0
+ 
+  ;Loop until "SubString" is found or "String" reaches its end
+  ${Do}
+    ;Remove everything before and after the searched part ("TempStr")
+    StrCpy $R5 $R1 $R2 $R4
+ 
+    ;Compare "TempStr" with "SubString"
+    ${IfThen} $R5 == $R0 ${|} ${ExitDo} ${|}
+    ;ifnot "SubString", this could be "String"'s end
+    ${IfThen} $R4 >= $R3 ${|} ${ExitDo} ${|}
+    ;ifnot, continue the loop
+    IntOp $R4 $R4 + 1
+  ${Loop}
+ 
+/*After this point:
+  ------------------------------------------
+  $R0 = ResultVar (output)*/
+ 
+  ;Remove part before "SubString" on "String" (ifthere has one)
+  StrCpy $R0 $R1 `` $R4
+ 
+  ;Return output to user
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Pop $R1
+  Exch $R0
+FunctionEnd
+
+
+Section "Uninstall"
+
+    strcpy $WINTEMP "C:\WINDOWS\Temp"
+    RMDir /r "$WINTEMP\lams\backup"
+    CreateDirectory "$WINTEMP\lams\backup"
+       
+    #strcpy $RETAIN_DIR "$INSTDIR\backup_$TIMESTAMP"
+    strcpy $RETAIN_DIR "$INSTDIR\backup"
+    CreateDirectory $RETAIN_DIR
+
+    ReadRegStr $MYSQL_HOST HKLM "${REG_HEAD}" "mysql_host"
+    ;Now copy files that are to be retained to the temp folder
+    ${If} $UNINSTALL_RETAIN == 1
+        #MessageBox MB_OK|MB_ICONEXCLAMATION "retaining repository"
+        ; KEEP repository and uploaded files
+        ; Copy repository and jboss-4.0.2\server\default\deploy\lams.ear\lams-www.war to backup
+        ReadRegStr $6 HKLM "${REG_HEAD}" "dir_repository"
+       
+        CreateDirectory "$RETAIN_DIR\repository"
+        CreateDirectory "$RETAIN_DIR\jboss-4.0.2\server\default\deploy\lams.ear\lams-www.war\"
+        
+        #MessageBox MB_OK|MB_ICONEXCLAMATION "Copying files to $RETAIN_DIR\jboss-4.0.2\server\default\deploy\lams.ear\lams-www.war\"
+        copyfiles /silent $6 "$RETAIN_DIR"
+        copyfiles /silent "$INSTDIR\jboss-4.0.2\server\default\deploy\lams.ear\lams-www.war\*" "$RETAIN_DIR\jboss-4.0.2\server\default\deploy\lams.ear\lams-www.war\"
+        
+        DetailPrint 'Saving repository and uploaded files to: $RETAIN_DIR'
+        #MessageBox MB_OK|MB_ICONEXCLAMATION "Copying files from instdir to temp"
+        copyfiles /silent "$RETAIN_DIR\*" "$WINTEMP\lams\backup"
+    ${EndIf}
+    
+    setoutpath $temp
+    RMdir /r "$INSTDIR\jboss-4.0.2\"
+    RMdir /r "$INSTDIR\"
+    #MessageBox MB_OK|MB_ICONEXCLAMATION "INSTDIR DELETED FFS!"
+    
+    ; NOT SURE ifTHIS SECTION OF CODE IS NECCESSARY
+    ReadRegStr $0 HKLM "${REG_HEAD}" "dir_conf"
+    RMDir /r $0
+    
+    ; RESTORE Retained folders to their original localtion then delete temp files
+    ; DUMP database into backup folder
+    ReadRegStr $0 HKLM "${REG_HEAD}" "dir_mysql"
+    ReadRegStr $1 HKLM "${REG_HEAD}" "db_name"
+    ReadRegStr $2 HKLM "${REG_HEAD}" "db_user"
+    ReadRegStr $3 HKLM "${REG_HEAD}" "db_pass"
+    ${If} $UNINSTALL_RETAIN == 1
+        #Messagebox MB_OK|MB_ICONEXCLAMATION "retaining db"
+        ; DUMP the database file into the retained install directory 
+           
+        CreateDirectory "$RETAIN_DIR" 
+        Strcpy $4 "$0\bin\mysqldump -r $WINTEMP\lams\backup\lamsDump.sql $1 -u $2 -p$3"
+        nsExec::ExecToStack $4
+        Pop $8
+        Pop $9
+        DetailPrint 'Dumping database to: $RETAIN_DIR'
+        
+        Setoutpath $INSTDIR
+        File /r "${BASE_DEV_DIR}\zip"
+        
+        #ZIP UP ALL RETAINED FILES 
+        IfFileExists "$WINTEMP\lams\backup\backup.zip" removeZip leaveFolder
+        removeZip:
+            delete "$WINTEMP\lams\backup\backup.zip"
+        leaveFolder:
+        
+        SetOutPath "$WINTEMP\lams\backup"
+        Strcpy $4 '$INSTDIR\zip\7za.exe a -r -tzip "$RETAIN_DIR\backup.zip" "*"'
+        nsExec::ExecToStack $4 
+        rmdir /r "$INSTDIR\zip"
+        #pop $5
+        #pop $6
+        #MessageBox MB_OK|MB_ICONEXCLAMATION "ZIP RESULT: $5$\n$6$\n"
+        rmdir $RETAIN_DIR
+    ${EndIf}
+    RMDir /r "$WINTEMP\lams"
+    
+    StrLen $9 $3
+    ${if} $MYSQL_HOST == 'localhost'
+        StrCpy $4 '$0\bin\mysql -e "DROP DATABASE $1" -u $2'
+        DetailPrint $4
+        ${If} $9 != 0
+            StrCpy $4 '$0\bin\mysql -e "DROP DATABASE $1" -u $2 -p$3' 
+        ${EndIf}
+        nsExec::ExecToStack $4
+        Pop $0
+        Pop $1
+        ${If} $0 == 1
+            MessageBox MB_OK|MB_ICONEXCLAMATION "Couldn't remove LAMS database:$\r$\n$\r$\n$1"
+            DetailPrint "Failed to remove LAMS database."
+        ${EndIf}        
+    ${endif}
+    
+    ; batch file doesn't want to work when called with ExecToStack
+    ; nsExec::ExecToStack '$INSTDIR\jboss-4.0.2\bin\UninstallLAMS-NT.bat'
+    nsExec::ExecToStack 'sc delete LAMSv2'
+    Pop $0
+    Pop $1
+    ; can't call StrStr from within uninstaller unless it's a un. function
+    ${un.StrStr} $2 $1 "SUCCESS"
+    ${If} $2 == ""
+        MessageBox MB_OK|MB_ICONEXCLAMATION "Couldn't remove LAMSv2 service.$\r$\n$\r$\n$1"
+        DetailPrint "Failed to remove LAMSv2 service."
+    ${Else}
+        DetailPrint "Removed LAMSv2 service."
+    ${EndIf}
+    /*StrCmp $1 "[SC] Delete Service SUCCESS$\r$\n" 0 +3
+    DetailPrint "Removed LAMSv2 service."
+    Goto +3
+    MessageBox MB_OK|MB_ICONSTOP "Couldn't remove LAMSv2 service.$\r$\n$\r$\n$1"
+    DetailPrint "Failed to remove LAMSv2 service."*/
+    
+    DeleteRegKey HKLM "${REG_HEAD}"
+    DetailPrint "Removed registry entries."
+    RMDir /r "$SMPROGRAMS\LAMSv2"
+    DetailPrint "Removed start menu entries."
+    DetailPrint "Uninstall complete."
+SectionEnd
+
+################################################################################
+# END CODE USED FOR UNINSTALLER                                                #
+################################################################################
\ No newline at end of file
Index: win_installer/installer/src/lams-update.ini
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/src/lams-update.ini,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/src/lams-update.ini	18 Dec 2007 02:01:48 -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/installer/src/lams.ini
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/src/lams.ini,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/src/lams.ini	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,52 @@
+[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=37
+Right=152
+Bottom=50
+
+[Field 3]
+Type=Label
+Left=7
+Top=26
+Right=152
+Bottom=35
+Text=Java JDK directory...
+
+[Field 4]
+Type=DirRequest
+Left=7
+Top=76
+Right=152
+Bottom=89
+State=
+MinLen=1
+ValidateText=Please specify a directory for the content repository.
+
+[Field 5]
+Type=Label
+Left=7
+Top=65
+Right=152
+Bottom=74
+Text=Content repository directory...
+
+[Field 6]
+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
Index: win_installer/installer/src/lams2.ini
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/src/lams2.ini,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/src/lams2.ini	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,107 @@
+[Settings]
+NumFields=12
+
+[Field 1]
+Type=GroupBox
+Left=0
+Top=1
+Right=299
+Bottom=137
+Text=Configure LAMS...
+
+[Field 2]
+Type=Text
+Left=8
+Top=82
+Right=130
+Bottom=94
+State=sysadmin
+Flags=
+
+[Field 3]
+Type=Label
+Left=8
+Top=71
+Right=130
+Bottom=79
+Text=Admin username...
+
+[Field 4]
+Type=Label
+Left=142
+Top=71
+Right=264
+Bottom=79
+Text=Admin password...
+
+[Field 5]
+Type=Text
+Left=142
+Top=82
+Right=264
+Bottom=93
+State=sysadmin
+Flags=
+
+[Field 6]
+Type=Link
+Left=8
+Top=116
+Right=135
+Bottom=126
+Text=Click to get online help for these options
+State=http://wiki.lamsfoundation.org/display/lamsdocs/Windows+Installer+Help#WindowsInstallerHelp-lams2
+
+[Field 7]
+Type=Label
+Left=8
+Top=22
+Right=127
+Bottom=30
+Text=Domain name...
+
+[Field 8]
+Type=Text
+Left=7
+Top=33
+Right=131
+Bottom=46
+State=localhost
+MinLen=1
+ValidateText=Please specify your server's domain name.
+
+[Field 9]
+Type=Text
+Left=137
+Top=33
+Right=172
+Bottom=46
+State=8080
+MaxLen=5
+MinLen=1
+ValidateText=Please specify a port number.
+
+[Field 10]
+Type=Label
+Left=138
+Top=22
+Right=174
+Bottom=30
+Text=Port...
+
+[Field 11]
+Type=Label
+Left=184
+Top=22
+Right=291
+Bottom=30
+Text=Default locale...
+
+[Field 12]
+Type=DropList
+Left=183
+Top=33
+Right=290
+Bottom=131
+State=en_AU - English (Australia)
+ListItems=en_AU - English (Australia)|ar_JO - Arabic (Jordan)|cy_GB - Cymraeg (Cymru)|da_DK - Dansk|de_DE - Deutsch|el_GR - Greek|es_ES - Espa�ol|fr_FR - Fran�ais|it_IT - Italiano|ko_KR - Korean|mi_NZ - Maori|no_NO - Norsk|pl_PL - Polski|pt_BR - Portugu�s (Brasil)|sv_SE - Svenska|vi_VN - Vietnamese|zh_CN - Chinese(Simplified)
Index: win_installer/installer/src/mysql.ini
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/src/mysql.ini,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/src/mysql.ini	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+[Settings]
+NumFields=15
+
+[Field 1]
+Type=GroupBox
+Left=0
+Top=0
+Right=-1
+Bottom=44
+Text=About your MySQL database...
+
+[Field 2]
+Type=GroupBox
+Left=0
+Top=48
+Right=-1
+Bottom=-4
+Text=Specify a database name and user account...
+
+[Field 3]
+Type=DirRequest
+Left=7
+Top=23
+Right=152
+Bottom=36
+ValidateText=Please specify your MySQL directory.
+Text=
+
+[Field 4]
+Type=Label
+Left=7
+Top=12
+Right=129
+Bottom=21
+Text=MySQL directory...
+
+[Field 5]
+Type=Password
+Left=169
+Top=23
+Right=291
+Bottom=36
+ValidateText=
+
+[Field 6]
+Type=Label
+Left=169
+Top=12
+Right=291
+Bottom=21
+Text=Root password...
+
+[Field 7]
+Type=Text
+Left=8
+Top=70
+Right=130
+Bottom=83
+State=lams2
+ValidateText=Please choose a database name.
+MinLen=1
+
+[Field 8]
+Type=Label
+Left=8
+Top=60
+Right=130
+Bottom=69
+Text=Database name...
+
+[Field 9]
+Type=Text
+Left=8
+Top=100
+Right=130
+Bottom=113
+State=lams2
+ValidateText=Please choose a username.
+MinLen=1
+
+[Field 10]
+Type=Text
+Left=169
+Top=100
+Right=291
+Bottom=113
+State=lamsdemo
+ValidateText=Please specify a password.
+MinLen=1
+
+[Field 11]
+Type=Label
+Left=8
+Top=90
+Right=130
+Bottom=99
+Text=MySQL Username...
+
+[Field 12]
+Type=Label
+Left=169
+Top=90
+Right=291
+Bottom=99
+Text=MySQL Password...
+
+[Field 13]
+Type=Link
+Left=8
+Top=121
+Right=153
+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/installer/src/uninstall.ini
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/src/uninstall.ini,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/src/uninstall.ini	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,19 @@
+[Settings]
+NumFields=2
+
+[Field 1]
+Type=CheckBox
+Left=17
+Top=50
+Right=239
+Bottom=60
+Text=Keep LAMS database, repository and uploaded files
+State=1
+
+[Field 2]
+Type=GroupBox
+Left=9
+Top=25
+Right=267
+Bottom=86
+Text=Do you wish to remove all LAMS files?
Index: win_installer/installer/src/wildfire.ini
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/src/wildfire.ini,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/src/wildfire.ini	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,66 @@
+[Settings]
+NumFields=8
+
+[Field 1]
+Type=GroupBox
+Left=0
+Top=0
+Right=-1
+Bottom=-4
+Text=About your Wildfire server...
+
+[Field 2]
+Type=Text
+Left=7
+Top=36
+Right=129
+Bottom=49
+State=localhost
+
+[Field 3]
+Type=Label
+Left=7
+Top=26
+Right=129
+Bottom=35
+Text=Domain name...
+
+[Field 4]
+Type=Label
+Left=7
+Top=65
+Right=129
+Bottom=74
+Text=Admin username...
+
+[Field 5]
+Type=Text
+Left=7
+Top=75
+Right=129
+Bottom=88
+State=admin
+
+[Field 6]
+Type=Label
+Left=157
+Top=65
+Right=279
+Bottom=74
+Text=Admin password...
+
+[Field 7]
+Type=Password
+Left=157
+Top=75
+Right=279
+Bottom=88
+
+[Field 8]
+Type=Link
+Left=7
+Top=116
+Right=134
+Bottom=126
+Text=Click to get online help for these options
+State=http://wiki.lamsfoundation.org/display/lamsdocs/Windows+Installer+Help#WindowsInstallerHelp-wildfire
Index: win_installer/installer/src/includes/Functions.nsh
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/src/includes/Functions.nsh,v
diff -u
Binary files differ
Index: win_installer/installer/templates/index.html
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/templates/index.html,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/templates/index.html	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,64 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en_au-">
+
+<head>
+	<title>LAMS :: Learning Activity Management System</title>
+	<meta http-equiv="refresh" content="60; url=@URL@" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta http-equiv="pragma" content="no-cache" />
+	<meta http-equiv="cache-control" content="no-cache" />
+	<link href="jboss-4.0.2/server/default/deploy/lams.ear/lams-central.war/css/defaultHTML.css" rel="stylesheet" type="text/css" />
+	<link rel="icon" href="jboss-4.0.2/server/default/deploy/lams.ear/lams-central.war/favicon.ico" type="image/x-icon" />
+
+	<link rel="shortcut icon" href="jboss-4.0.2/server/default/deploy/lams.ear/lams-central.war/favicon.ico" type="image/x-icon" />
+</head>
+
+<body class="stripes">
+	<div id="login-page"><!--main box 'page'-->
+	
+		<h1 class="no-tabs-below">&nbsp;</h1>
+		
+		<div id="login-header">
+		
+		</div><!--closes header-->
+	
+	
+	  <div id="login-content">	
+	  
+	  	<div style="padding-left:40px">
+		<h1><img src="jboss-4.0.2/server/default/deploy/lams.ear/lams-central.war/images/css/lams_login.gif" alt="LAMS - Learning Activity Management System" width="186" height="90" /></h1>
+
+<br />		
+<h1>Waiting for LAMS to finish starting...</h1>
+<br />
+<p>You will be redirected in 60 seconds.&nbsp;&nbsp;Click <a href="@URL@">here</a> to go to the login page.</p>
+
+<p></p>
+
+
+
+
+</div>
+	  <div class="clear"></div><!-- forces the CSS to display the columns-->
+
+	
+	  </div>  <!--closes content-->
+	   
+		
+		
+		
+		
+		<div id="footer">
+		
+		<p>&copy; 2002-2007 LAMS Foundation.</p>
+		
+	  </div><!--closes footer-->
+
+		
+	</div><!--closes page-->
+
+
+</body>
+
+</html>
+
Index: win_installer/installer/templates/mysql-ds.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/templates/mysql-ds.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/templates/mysql-ds.xml	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: mysql-ds.xml,v 1.1 2007/12/18 02:01:48 lfoxton Exp $ -->
+<!--  Datasource config for MySQL using 3.0.9 available from:
+http://www.mysql.com/downloads/api-jdbc-stable.html
+-->
+
+<datasources>
+  <!-- lams-ds datasource for use by LAMS Core and Services -->
+  <local-tx-datasource>
+    <jndi-name>jdbc/lams-ds</jndi-name>
+    <connection-url>jdbc:mysql://@MYSQL_HOST@:3306/@DB_NAME@</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
+    <!-- and convert MySQL zero times to null -->
+    <connection-property name="characterEncoding">utf8</connection-property>
+    <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>@DB_USER@</user-name>
+    <password>@DB_PASS@</password>
+    <!-- Set minimum adn maximum size of pool -->
+    <max-pool-size>32</max-pool-size>
+    <min-pool-size>0</min-pool-size>
+    <!-- Connections not used after 5 minutes will be closed and removed -->
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+  </local-tx-datasource>
+
+  <!-- tool-ds datasource for use by Tools -->
+  <local-tx-datasource>
+    <jndi-name>jdbc/tool-ds</jndi-name>
+    <connection-url>jdbc:mysql://@MYSQL_HOST@:3306/@DB_NAME@</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
+    <!-- and convert MySQL zero times to null -->
+    <connection-property name="characterEncoding">utf8</connection-property>
+    <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>@DB_USER@</user-name>
+    <password>@DB_PASS@</password>
+    <!-- Set minimum adn maximum size of pool -->
+    <max-pool-size>32</max-pool-size>
+    <min-pool-size>0</min-pool-size>
+    <!-- Connections not used after 5 minutes will be closed and removed -->
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+  </local-tx-datasource>
+  
+  <!-- quartz-ds datasource for use by Quartz -->
+  <local-tx-datasource>
+    <jndi-name>jdbc/quartz-ds</jndi-name>
+    <connection-url>jdbc:mysql://@MYSQL_HOST@:3306/@DB_NAME@</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>@DB_USER@</user-name>
+    <password>@DB_PASS@</password>
+    <!-- Set minimum adn maximum size of pool -->
+    <max-pool-size>32</max-pool-size>
+    <min-pool-size>0</min-pool-size>
+    <!-- Connections not used after 5 minutes will be closed and removed -->
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+  </local-tx-datasource>
+</datasources>
Index: win_installer/installer/templates/revert.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/templates/revert.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/templates/revert.xml	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="revert-db" basedir=".">
+
+	<property file="revert.properties" />
+	<target name="revert-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" 
+			userid="${DB_USER}" 
+			password="${DB_PASS}"
+			encoding="utf8">
+			<transaction src="${BACKUP_DIR}/dump.sql" />
+		</sql>
+	</target>
+	
+</project>
\ No newline at end of file
Index: win_installer/installer/templates/run.bat
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/templates/run.bat,v
diff -u
Binary files differ
Index: win_installer/installer/templates/server.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/templates/server.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/installer/templates/server.xml	18 Dec 2007 02:01:48 -0000	1.1
@@ -0,0 +1,128 @@
+<Server>
+
+   <!-- Use a custom version of StandardService that allows the
+   connectors to be started independent of the normal lifecycle
+   start to allow web apps to be deployed before starting the
+   connectors.
+   -->
+   <Service name="jboss.web"
+      className="org.jboss.web.tomcat.tc5.StandardService">
+
+      <!-- A HTTP/1.1 Connector on port 8080 -->
+      <Connector port="@LAMS_PORT@" address="${jboss.bind.address}"
+         maxThreads="250" strategy="ms" maxHttpHeaderSize="8192"
+         emptySessionPath="true"
+         enableLookups="false" redirectPort="8443" acceptCount="100"
+         connectionTimeout="20000" disableUploadTimeout="true"/>
+
+      <!-- A AJP 1.3 Connector on port 8009 -->
+      <Connector port="8009" address="${jboss.bind.address}"
+         emptySessionPath="true" enableLookups="false" redirectPort="8443" 
+         protocol="AJP/1.3"/>
+
+      <!-- SSL/TLS Connector configuration using the admin devl guide keystore
+      <Connector port="8443" address="${jboss.bind.address}"
+           maxThreads="100" strategy="ms" maxHttpHeaderSize="8192"
+           emptySessionPath="true"
+           scheme="https" secure="true" clientAuth="false" 
+           keystoreFile="${jboss.server.home.dir}/conf/chap8.keystore"
+           keystorePass="rmi+ssl" sslProtocol = "TLS" />
+      -->
+
+      <Engine name="jboss.web" defaultHost="localhost">
+
+         <!-- The JAAS based authentication and authorization realm implementation
+         that is compatible with the jboss 3.2.x realm implementation.
+         - certificatePrincipal : the class name of the
+         org.jboss.security.auth.certs.CertificatePrincipal impl
+         used for mapping X509[] cert chains to a Princpal.
+         -->
+         <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm"
+            certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+            />
+         <!-- A subclass of JBossSecurityMgrRealm that uses the authentication
+         behavior of JBossSecurityMgrRealm, but overrides the authorization
+         checks to use JACC permissions with the current java.security.Policy
+         to determine authorized access.
+         <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"
+            certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+            />
+         -->
+
+         <Host name="localhost"
+            autoDeploy="false" deployOnStartup="false" deployXML="false">
+
+            <!-- Uncomment to enable request dumper. This Valve "logs interesting 
+                 contents from the specified Request (before processing) and the 
+                 corresponding Response (after processing). It is especially useful 
+                 in debugging problems related to headers and cookies."
+            -->
+            <!--
+            <Valve className="org.apache.catalina.valves.RequestDumperValve" />
+            -->
+ 
+            <!-- Access logger -->
+            <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+                prefix="localhost_access_log." suffix=".log"
+                pattern="common" directory="${jboss.server.home.dir}/log" 
+                resolveHosts="false" />
+
+            <!-- Uncomment to enable single sign-on across web apps
+                deployed to this host. Does not provide SSO across a cluster.     
+            
+                If this valve is used, do not use the JBoss ClusteredSingleSignOn 
+                valve shown below. 
+             -->
+            <!--
+            <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+            -->
+
+            <!-- Uncomment to enable single sign-on across web apps
+               deployed to this host AND to all other hosts in the cluster
+               with the same virtual hostname.
+            
+               If this valve is used, do not use the standard Tomcat SingleSignOn
+               valve shown above.
+            
+               This valve uses JGroups to communicate across the cluster.  The 
+               JGroups Channel used for this communication can be configured
+               by editing the "sso-channel.xml" file found in the same folder
+               as this file.  If this valve is running on a machine with multiple
+               IP addresses, configuring the "bind_addr" property of the JGroups
+               UDP protocol may be necessary.  Another possible configuration 
+               change would be to enable encryption of intra-cluster communications.
+               See the sso-channel.xml file for more details.
+            
+               Besides the attributes supported by the standard Tomcat
+               SingleSignOn valve (see the Tomcat docs), this version also supports 
+               the following attribute:
+            
+               partitionName     the name of the cluster partition in which 
+                                 this node participates.  If not set, the default
+                                 value is "sso-partition/" + the value of the
+                                 "name" attribute of the Host element that
+                                 encloses this element (e.g. "sso-partition/localhost")
+            -->
+            <!--
+            <Valve className="org.jboss.web.tomcat.tc5.sso.ClusteredSingleSignOn" />
+            -->
+         
+            <!-- Uncomment to check for unclosed connections and transaction terminated checks
+                 in servlets/jsps.
+                 Important: You need to uncomment the dependency on the CachedConnectionManager
+                            in META-INF/jboss-service.xml
+            <Valve className="org.jboss.web.tomcat.tc5.jca.CachedConnectionValve"
+                cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager"
+                transactionManagerObjectName="jboss:service=TransactionManager" />
+            -->
+            <!-- LAMS Login Request Valve -->
+			<Valve className="org.lamsfoundation.lams.integration.security.LoginRequestValve" />
+			
+			<Valve className="org.lamsfoundation.lams.integration.security.SingleSignOn" debug="0"/>
+         </Host>
+
+      </Engine>
+
+   </Service>
+
+</Server>
Index: win_installer/installer/templates/update_lams_configuration.sql
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/templates/update_lams_configuration.sql,v
diff -u
Binary files differ
Index: win_installer/installer/templates/wrapper.conf
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/templates/Attic/wrapper.conf,v
diff -u
Binary files differ