Index: win_installer/updater/conf/context.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/conf/Attic/context.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/updater/conf/context.xml	19 Nov 2008 00:35:42 -0000	1.1
@@ -0,0 +1,5 @@
+<!-- The contents of this file will be loaded for each web application -->
+<Context cookies="true" crossContext="true">
+		<Valve className="org.lamsfoundation.lams.web.session.LoginFormAuthenticator"
+			disableProxyCaching="false" />
+</Context>
\ No newline at end of file
Index: win_installer/updater/conf/wrapper.conf
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/conf/Attic/wrapper.conf,v
diff -u
Binary files differ
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `win_installer/updater/documents/news-2.0.4.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: win_installer/updater/src/updater.nsi
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/updater.nsi,v
diff -u -r1.7 -r1.8
Binary files differ
Index: win_installer/updater/src/ant/build.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/ant/build.xml,v
diff -u -r1.1 -r1.2
--- win_installer/updater/src/ant/build.xml	21 Apr 2008 06:44:23 -0000	1.1
+++ win_installer/updater/src/ant/build.xml	19 Nov 2008 00:35:42 -0000	1.2
@@ -73,22 +73,6 @@
 				<filter token="URL" value="${URL}" />
 			</filterset>
 		</copy>
-		<copy overwrite="yes" todir="${INSTDIR}/jboss-4.0.2/server/default/conf">
-			<fileset dir="${TEMP}">
-				<include name="lamsauthentication.xml" />
-			</fileset>
-			<filterset>
-				<filter token="confdir" value="${INSTDIR}/jboss-4.0.2/server/default/conf" />
-			</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">
@@ -100,6 +84,7 @@
 			encoding="utf8">
 			<transaction src="${TEMP}/dump.sql" />
 			<transaction src="${TEMP}/lams/update_lams_configuration.sql" />
+			<transaction src="${TEMP}/lams/removeConfigs.sql" />
 		</sql>
 	</target>	
 </project>
\ No newline at end of file
Index: win_installer/updater/src/ant/update-2.2-specific.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/ant/Attic/update-2.2-specific.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/updater/src/ant/update-2.2-specific.xml	19 Nov 2008 00:35:42 -0000	1.1
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="update-2.2-specific" basedir="."> 
+    
+    <property file="update-2.2-specific.properties" />
+
+    <target name="copy-wrapper.conf" description="Updates wrapper.conf to have the newest configuration">
+      
+        <copy failonerror="false" file="${INSTDIR}/jboss-4.0.2/conf/wrapper.conf" tofile="${INSTDIR}/jboss-4.0.2/conf/wrapper.conf.bak"/>
+        
+        <copy overwrite="yes" todir="${INSTDIR}/jboss-4.0.2/conf/">
+            <fileset dir="${TEMP}/lams/">
+                <include name="wrapper.conf" />
+            </fileset>
+            <filterset>
+                <filter token="JAVA_HOME" value="${JDK_DIR_UNIX_SLASH}" />
+            </filterset>
+        </copy>
+    </target>
+    
+	<target name="add-autopatch-table" description="Updates wrapper.conf to have the newest configuration">        
+		<sql driver="com.mysql.jdbc.Driver" 
+			classpath="${INSTDIR}/jboss-4.0.2/server/default/deploy/lams.ear/mysql-connector-java-3.1.12-bin.jar" 
+			url="${db.url}" 
+			userid="${db.username}" 
+			password="${db.password}"
+			encoding="utf8"
+			onerror="abort">
+	            <transaction src="${TEMP}/lams/addAutoPatchTable.sql" />
+		</sql>
+	</target>
+    
+</project>
\ No newline at end of file
Index: win_installer/updater/src/ant/update-core-database.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/ant/update-core-database.xml,v
diff -u -r1.2 -r1.3
--- win_installer/updater/src/ant/update-core-database.xml	12 Jun 2008 23:40:40 -0000	1.2
+++ win_installer/updater/src/ant/update-core-database.xml	19 Nov 2008 00:35:42 -0000	1.3
@@ -14,22 +14,8 @@
 			encoding="utf8"
 			onerror="abort">
 			<transaction src="${temp}/lams/sql/updateConfiguration.sql" />
-			<transaction src="${temp}/lams/sql/alter_21_branching.sql" />
-			<transaction src="${temp}/lams/sql/alter_21_groupings_fckeditor.sql" />
 			<transaction src="${temp}/lams/sql/updateLocales.sql" />
+			<transaction src="${temp}/lams/sql/removeConfigs.sql" />
 		</sql>
-		
-		<!-- REMOVE BELOW FOR 2.2 -->
-		<echo></echo>
-		<echo>The below script will fail if the database tables are already INNODB, this will not affect the update.</echo>
-		<sql driver="com.mysql.jdbc.Driver" 
-            classpath="${jboss.deploy}/mysql-connector-java-3.1.12-bin.jar" 
-            url="${db.url}" 
-            userid="${db.username}" 
-            password="${db.password}"
-            encoding="utf8"
-            onerror="continue">
-            <transaction src="${temp}/lams/sql/alter_21_engine.sql" />
-        </sql>
 	</target>
 </project>
\ No newline at end of file
Index: win_installer/updater/src/ant/update-deploy-tools.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/ant/update-deploy-tools.xml,v
diff -u -r1.4 -r1.5
--- win_installer/updater/src/ant/update-deploy-tools.xml	12 Jun 2008 23:36:15 -0000	1.4
+++ win_installer/updater/src/ant/update-deploy-tools.xml	19 Nov 2008 00:35:42 -0000	1.5
@@ -3,7 +3,7 @@
 	<!-- begin properties *******************************************************************************************-->
 	<!-- import properties from the specified file -->
 	
-	<property file="${prop.path}/build.properties" />
+	<!-- <property file="${prop.path}/build.properties" /> -->
 	<property file="tools.properties"/>
 
 	
@@ -119,13 +119,30 @@
 			</fileset>
 		</path>
 		
-		<echo>Updating application.xml ###2.1 SPECIFIC###</echo>
+		<!-- 2.2 SPECIFIC UPDATE!!!!!!!!!!!! -->
+        <echo>BEGIN Updating application.xml</echo>
+        <java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+            <arg value="${jboss.deploy}" />
+            <arg value="transform.jar" />
+        </java>
+        <java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+            <arg value="${jboss.deploy}" />
+            <arg value="translate.jar" />
+        </java>
+        <java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+            <arg value="${jboss.deploy}" />
+            <arg value="JabberHTTPBind-1.1.1.jar" />
+        </java>
+        <java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+            <arg value="${jboss.deploy}" />
+            <arg value="tk-autopatch-1.2.0-b2-cvs.jar" />
+        </java>
+        <java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+            <arg value="${jboss.deploy}" />
+            <arg value="tk-discovery-1.0.0.jar" />
+        </java>
+        <!-- END 2.2 SPECIFIC UPDATE!!!!!!!!!!!! -->
 		
-		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
-			<arg value="${jboss.deploy}" />
-			<arg value="commons-io-1.4.jar" />
-		</java>
-		
 	</target>
 	
 	<target name="explode-wars" description="explodes lams_learning.war and lams-monitoring.war">
Index: win_installer/updater/src/ant/update-mysql-ds-xml-2.1.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/ant/Attic/update-mysql-ds-xml-2.1.xml,v
diff -u -r1.1 -r1.2
--- win_installer/updater/src/ant/update-mysql-ds-xml-2.1.xml	20 May 2008 00:52:55 -0000	1.1
+++ win_installer/updater/src/ant/update-mysql-ds-xml-2.1.xml	19 Nov 2008 00:35:42 -0000	1.2
@@ -17,4 +17,6 @@
             </filterset>
         </copy>
     </target>
+	
+	
 </project>
\ No newline at end of file
Index: win_installer/updater/src/sql/addAutoPatchTable.sql
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/sql/Attic/addAutoPatchTable.sql,v
diff -u
Binary files differ
Index: win_installer/updater/src/sql/removeConfigs.sql
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/sql/removeConfigs.sql,v
diff -u
Binary files differ
Index: win_installer/updater/templates/login-config.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/templates/login-config.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/updater/templates/login-config.xml	19 Nov 2008 00:35:42 -0000	1.1
@@ -0,0 +1,171 @@
+<?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/updater/templates/wrapper.conf
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/templates/wrapper.conf,v
diff -u -r1.1 -r1.2
Binary files differ