Index: lams_tool_forum/build.properties
===================================================================
diff -u -rc72463529de32a9c542b523ec78d55ed22937957 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/build.properties	(.../build.properties)	(revision c72463529de32a9c542b523ec78d55ed22937957)
+++ lams_tool_forum/build.properties	(.../build.properties)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -7,24 +7,35 @@
 ########################################################################################################################
 
 ### project properties ###
-project = forum
-#project.version = 2
+project=LAMS
+signature=lafrum11
+product=lams-tool-lafrum11
+project_version=1.1
 project.displayname = lams forum tool
-project.description = lams forum tool
 
-#appserver.deploy.dir= c:/orion/applications/auto
-appserver.deploy.dir = C:/resin-3.0.13/webapps
-#appserver.deploy.dir = C:/Program Files/tomcat 4.1/webapps
-#appserver.deploy.dir = C:/tomcat41/jakarta-tomcat-4.1.31/webapps
+# the URL used to access LAMS
+toolContext=/lams/tool/lafrum11
 
-db.name = lams
-db.driver=com.mysql.jdbc.Driver
-db.url=jdbc:mysql://localhost/${db.name}
-db.username=root
-db.password=root
-db.scripts=${basedir}/db/sql
+# xdoclet properties	
+xdoclet.version=1.2.2
 
-#jar files needed for building and running test cases
-build.lib = c:/jars/build
-#jar files needed for runnning this tool as a standalone application.
-shared.lib = c:/jars/
+# application properties 
+sessiontimeout=120
+	
+# path properties 
+lib=${basedir}/lib
+sharedlib=../lams_build/lib
+deploy.tool.dir=../lams_build/deploy-tool
+j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
+
+jboss.home=D:/jboss-3.2.6/
+jboss.deploy=${jboss.home}/server/default/deploy/lams.ear
+
+# database related properties 
+database.driver.file=${sharedlib}/mysql/mysql-connector-java-3.1.7-bin.jar
+database.driver.classpath=${database.driver.file}
+database.driver=com.mysql.jdbc.Driver
+database.url=jdbc:mysql://localhost/lams?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
+database.userid=lams
+database.password=lamsdemo
+
Index: lams_tool_forum/build.xml
===================================================================
diff -u -r14a4ddd75793d09a63e27fef3863a4771c64d37a -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/build.xml	(.../build.xml)	(revision 14a4ddd75793d09a63e27fef3863a4771c64d37a)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -10,61 +10,58 @@
 	<property file="build.properties"/>
 
 	<!-- fixed filesystem property structure /-->
+	<property name="sql.dir" value="${project.dir}/db/sql"/>
+	
 	<property name="src.dir" value="${project.dir}/src/java"/>
-    <property name="lib.build.dir" value="${build.lib}"/>
-	<property name="lib.dir" value="${shared.lib}"/>
-	<property name="dist.dir" value="${project.dir}/dist"/>
-	<property name="classes.dir" value="${project.dir}/classes"/>
+	<property name="lib.dir" value="${project.dir}/lib"/>
 	<property name="build.dir" value="${project.dir}/build"/>
+	<property name="build.lib.dir" value="${build.dir}/lib"/>
+	<property name="build.report.dir" value="${build.dir}/report"/>
+	<property name="build.deploy.dir" value="${build.dir}/deploy"/>
+	<property name="classes.dir" value="${build.dir}/classes"/>
   	<property name="deploy.dir" value="${project.dir}/deploy"/>
 
     <property name="test.src.dir" value="${project.dir}/test/java"/>
     <property name="test.lib.dir" value="${project.dir}/test/lib"/>
     <property name="test.classes.dir" value="${project.dir}/test/classes"/>
-    <property name="test.result" value="${project.dir}//test/testresult"/>
+    <property name="test.result" value="${project.dir}/test/testresult"/>
 
     <property name="web.dir" value="${project.dir}/web"/>
-    <property name="web.lib.dir" value="${project.dir}/web/WEB-INF/lib"/>
-    <!--
-    <property name="web.src.dir" value="${project.dir}/web/WEB-INF/classes"/>
-    <property name="web.classes.dir" value="${project.dir}/web/classes"/>
-    -->
+	<property name="webinf.dir" value="${project.dir}/web/WEB-INF"/>
+	 
+	<property name="conf.dir" value="${project.dir}/conf"/>
+	<property name="xdoclet.dir" value="${conf.dir}/xdoclet"/>
 
+	<property name="hibernate.mappings.dir" value="${conf.dir}/hibernate/mappings"/>
+
 	<!-- end properties *********************************************************************************************-->
 
 	<!-- begin path *************************************************************************************************-->
-	<!--
-    <path id="app.class.path">
-		<fileset dir="${lib.dir}">
+	<path id="all-libs">
+		<fileset dir="${lib}">
 			<include name="**/*.jar"/>
 		</fileset>
-	</path>
-    -->
-
-	<path id="build.class.path">
-		<fileset dir="${lib.dir}">
+		<fileset dir="${sharedlib}">
 			<include name="**/*.jar"/>
 		</fileset>
-       	<fileset dir="${lib.build.dir}">
+		<fileset dir="${j2eelibs}">
 			<include name="**/*.jar"/>
 		</fileset>
-    </path>
+	</path>
 
-    <!--
-    <path id="test.class.path">
-        <path refid="build.class.path"/>
-        <fileset dir="${test.lib.dir}">
-            <include name="*.jar"/>
-        </fileset>
+	<path id="project.classpath">
+		<path refid="all-libs"/>
+		<!-- Java CLASSPATH should be added as the last item -->
+		<!-- This property is supposed to be set in eclipse  -->
+		<pathelement location="${java.class.path}" />
+	</path>
 
+	<path id="build.class.path">
+		<fileset dir="${lib.dir}/build">
+			<include name="**/*.jar"/>
+		</fileset>
     </path>
-    -->
 
-	<path id="hibernate.build.class.path">
-		<pathelement path="${classes.dir}"/>
-		<pathelement path="${src.dir}"/>
-		<path refid="build.class.path"/>
-    </path>
 	<!-- end path ***************************************************************************************************-->
 
 	<!-- begin tasks ***********************************************************************************************/-->
@@ -86,14 +83,13 @@
 		<!-- build filesystem structure /-->
 		<mkdir dir="${classes.dir}"/>
 		<mkdir dir="${lib.dir}"/>
-		<mkdir dir="${dist.dir}"/>
         <mkdir dir="${build.dir}"/>
+        <mkdir dir="${build.report.dir}"/>
+        <mkdir dir="${build.lib.dir}"/>
+        <mkdir dir="${build.deploy.dir}"/>
         <mkdir dir="${test.classes.dir}"/>
         <mkdir dir="${test.result}"/>
-        <!--
-        <mkdir dir="${web.classes.dir}"/>
-        -->
-        <mkdir dir="${deploy.dir}"/>
+         <mkdir dir="${deploy.dir}"/>
 	</target>
 
 
@@ -103,17 +99,16 @@
 		<echo>+------------------------------------------+</echo>
 
 		<delete dir="${classes.dir}"/>
-		<delete dir="${dist.dir}"/>
 		<delete dir="${build.dir}"/>
+		<delete dir="${build.report.dir}"/>
+		<delete dir="${build.lib.dir}"/>
+		<delete dir="${build.deploy.dir}"/>
         <delete dir="${test.classes.dir}"/>
         <delete dir="${test.result}"/>
-        <!--
-        <delete dir="${web.classes.dir}"/>
-        -->
         <delete dir="${deploy.dir}"/>
 
 	</target>
-
+			
 	<target name="compile" description="Compiles the Task" depends="init">
 		<echo>+------------------------------------------+</echo>
 		<echo>| compile                                  |</echo>
@@ -123,7 +118,7 @@
             source="1.4"
             debug="on"
             compiler="modern"
-            classpathref="build.class.path"
+            classpathref="project.classpath"
             destdir="${classes.dir}"/>
 	</target>
 
@@ -132,44 +127,22 @@
 		<echo>| generating hibernate metadata            |</echo>
 		<echo>+------------------------------------------+</echo>
 
-		<taskdef name="hibernateDoclet"
-            classname="xdoclet.modules.hibernate.HibernateDocletTask"
-            classpathref="build.class.path"/>
+		<taskdef name="hibernatedoclet"
+			classname="xdoclet.modules.hibernate.HibernateDocletTask"
+			classpathref="all-libs"/>
 
-		<hibernateDoclet
-            destdir="${classes.dir}"
-            excludedtags="@version,@author"
-            force="true"
-            verbose="true">
+		<echo>Building hbm.xml files using XDoclet to ${hibernate.mappings.dir} from ${src.dir}</echo>
 
-			<fileset dir="${src.dir}">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="${lib.dir}">
-				<include name="propertyset-1.3-25Dec03.jar"/>
-			</fileset>
+		<hibernatedoclet
+			destdir="${hibernate.mappings.dir}"
+			excludedtags="@version,@author,@todo"
+			force="true">
+				<fileset dir="${src.dir}">
+					<include name="**/*.java"/>
+				</fileset>
 			<hibernate version="2.0"/>
-		</hibernateDoclet>
+		</hibernatedoclet>
 
-
-		<taskdef name="schemaexport"
-            classname="net.sf.hibernate.tool.hbm2ddl.SchemaExportTask"
-            classpathref="hibernate.build.class.path"/>
-
-	    <schemaexport properties="${project.dir}/mysql-hibernate.properties"
-            quiet="no"
-            text="yes"
-            drop="no"
-            delimiter=";"
-            output="${classes.dir}/mysql-schema-export.ddl">
-			<fileset dir="${classes.dir}">
-				<include name="**/*.hbm.xml"/>
-			</fileset>
-			<fileset dir="${lib.dir}">
-				<include name="propertyset-1.3*.jar"/>
-			</fileset>
-		</schemaexport>
-
     </target>
 
     <target name="compiletest" description="Compiles the test classes" depends="clean, compile, hibernate">
@@ -194,10 +167,45 @@
             source="1.4"
             debug="on"
             compiler="modern"
-            classpathref="build.class.path"
+            classpathref="project.classpath"
             destdir="${test.classes.dir}"/>
     </target>
 	
+	
+	<!-- =================================================================== -->
+	<!-- Forum Database tasks                                               -->
+	<!-- =================================================================== -->
+	<target name="clean-db"	description="clean forum database.">
+		<sql driver="${database.driver}" url="${database.url}" userid="${database.userid}"
+				password="${database.password}">
+			<classpath>
+				<pathelement location="${database.driver.file}"/>
+			</classpath>
+			<transaction src="${sql.dir}/cleanup_lams_tool_forum.sql"/>
+		</sql>
+	</target>
+	
+	<target name="init-db"	description="drop and create forum database.">
+		<sql driver="${database.driver}" url="${database.url}" userid="${database.userid}"
+				password="${database.password}">
+			<classpath>
+				<pathelement location="${database.driver.file}"/>
+			</classpath>
+			<transaction src="${sql.dir}/drop_lams_tool_forum.sql"/>
+			<transaction src="${sql.dir}/create_lams_tool_forum.sql"/>
+		</sql>
+	</target>
+	
+	<target name="build-db"	depends="init-db" 
+							description="build qa tool database.">
+		<sql driver="${database.driver}" url="${database.url}" userid="${database.userid}"
+				password="${database.password}">
+			<classpath>
+				<pathelement location="${database.driver.file}"/>
+			</classpath>
+			<transaction src="${sql.dir}/insert_lams_tool_forum_data.sql"/>
+		</sql>
+	</target>
 
     <target name="junit" depends="compiletest, init-db">
         <echo>+-------------------------------------------+</echo>
@@ -218,7 +226,7 @@
 
          <classpath id="junit.class.path">
              <path location="${test.classes.dir}"/>
-             <path refid="build.class.path"/>
+             <path refid="project.classpath"/>
          </classpath>
 
          <formatter type="xml"/>
@@ -240,9 +248,10 @@
 		<echo>| merge stuff into jar file                |</echo>
 		<echo>+------------------------------------------+</echo>
 
-		<copy todir="${classes.dir}">
+	 	<copy overwrite="yes" todir="${classes.dir}">
 			<fileset dir="${src.dir}">
 				<include name="**/*.xml"/>
+				<include name="**/*.properties"/>
 			</fileset>
 		</copy>
 	</target>
@@ -251,126 +260,163 @@
 		<echo>+------------------------------------------+</echo>
 		<echo>| create jar file                          |</echo>
 		<echo>+------------------------------------------+</echo>
-
-		<jar destfile="${build.dir}/${project}.jar"
-            basedir="${classes.dir}"/>
-
-		<copy file="${build.dir}/${project}.jar"
-            todir="${dist.dir}"/>
+		<delete file="${build.lib.dir}/${product}.jar"/>
+		<jar destfile="${build.lib.dir}/${product}.jar">
+			<fileset dir="${classes.dir}">
+			</fileset>
+			<fileset dir="${hibernate.mappings.dir}">
+			</fileset>
+		</jar> 
 	</target>
 
-    <!-- =================================================================== -->
-    <!-- Forum Database tasks                                               -->
-    <!-- =================================================================== -->
-    <target name="clean-db"	description="clean forum database.">
-        <sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-                password="${db.password}">
-
-         <classpath id="junit.class.path">
-             <path refid="build.class.path"/>
-         </classpath>
-
-            <transaction src="${db.scripts}/cleanup_lams_tool_forum.sql"/>
-        </sql>
-    </target>
-
-    <target name="init-db"	description="drop and create forum database.">
-        <sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-                password="${db.password}">
-            <classpath>
-                <path refid="build.class.path"/>
-            </classpath>
-            <transaction src="${db.scripts}/drop_lams_tool_forum.sql"/>
-            <transaction src="${db.scripts}/create_lams_tool_forum.sql"/>
-        </sql>
-    </target>
-
-    <target name="build-db"	depends="init-db"
-                            description="build qa tool database.">
-        <sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-                password="${db.password}">
-            <classpath>
-                <path refid="build.class.path"/>
-            </classpath>
-            <transaction src="${db.scripts}/insert_lams_tool_forum_data.sql"/>
-        </sql>
-    </target>
-
     <target name="web"  description="generates xdoclet for web">
 	    <taskdef
 	        name="webdoclet"
 	        classname="xdoclet.modules.web.WebDocletTask"
-	        classpathref="build.class.path"
+	        classpathref="project.classpath"
 	    />
-		<webdoclet destdir="${web.dir}/WEB-INF">
-	        <fileset dir="${src.dir}" />
-			<strutsconfigxml validatexml="true" version="1.1" mergeDir="${web.dir}/WEB-INF/struts/config"  />
-			<!-- <jsptaglib shortname="spirit taglibs" filename="spirit.tld" /> -->
-		</webdoclet>
-        <copy todir="${web.dir}/WEB-INF">
-			<fileset dir="${web.dir}/WEB-INF/struts" includes="*.xml"/>
-		</copy>
+		<webdoclet destdir="${webinf.dir}" force="${xdoclet.force}" 
+			mergedir="${xdoclet.dir}" >
+			
+         <fileset dir="${src.dir}">
+            <include name="**/*Action.java" />
+            <include name="**/*Form.java" />
+         </fileset>
+
+         <deploymentdescriptor servletspec="2.3" sessiontimeout="${sessiontimeout}"/>
+			
+         <strutsconfigxml validatexml="true" version="1.2"/>
+      </webdoclet>
+
 	</target>
 
-	<target name="copyweb" description="Copy " depends="_build, web">
-        <mkdir dir="${deploy.dir}/WEB-INF" />
-		<copy todir="${deploy.dir}/WEB-INF">
-			<fileset dir="${web.dir}/WEB-INF/struts" includes="**/*.tld"/>
-            <fileset dir="${web.dir}/WEB-INF" excludes="**/struts/"/>
+	<target name="build-war" depends="web,jar" description="creates war file">
+		<echo>+------------------------------------------+</echo>
+		<echo>| build jar file                           |</echo>
+		<echo>+------------------------------------------+</echo>
+		<delete file="${build.lib.dir}/${product}.war"/>
+		<war warfile="${build.lib.dir}/${product}.war" 
+  				webxml="${webinf.dir}/web.xml" manifest="${conf.dir}/war/META-INF/MANIFEST.MF">
+			<webinf dir="${webinf.dir}">
+				<include name="*.tld"/>
+				<include name="*.xml"/>
+				<include name="struts/*"/>
+				<exclude name="web.xml"/>
+			</webinf>
+			<fileset dir="${web.dir}">
+				<include name="*"/>
+				<include name="includes/**"/>
+				<include name="jsps/**"/> 
+			</fileset>
+		</war>
+	</target>
 
-        </copy>
+	<!-- =================================================================== -->
+	<!-- Deploy the jar and war                               				 -->
+	<!-- =================================================================== -->
+	<target name="deploy-war" depends="build-war" description="Deploy the IMS Content Package tool war file and jar file">
+		<copy file="${build.lib.dir}/${product}.jar"
+				todir="${jboss.deploy}"/> 
+		<copy file="${build.lib.dir}/${product}.war"
+				todir="${jboss.deploy}"/> 
+	</target>
 
-		<mkdir dir="${deploy.dir}/WEB-INF/lib" />
-		<copy todir="${deploy.dir}/WEB-INF/lib">
-			<fileset dir="${lib.dir}" includes="*.jar"/>
-            <fileset dir="${build.dir}" includes="*.jar"/>
+	<!-- =================================================================== -->
+	<!-- Generate the deploy package                                         -->
+	<!-- =================================================================== -->
+	<target name="create-deploy-package" depends="build-war" 
+		description="Generate the deployment package.">
+
+		<echo>+------------------------------------------+</echo>
+		<echo>| Generate the deployment package.         |</echo>
+		<echo>+------------------------------------------+</echo>
+		<path id="deploy.lib.classpath">
+			<fileset dir="${deploy.tool.dir}">
+				<include name="lib/*.jar"/>
+			</fileset>
+		</path> 
+			  
+		<mkdir dir="${build.deploy.dir}"/>
+		<mkdir dir="${build.deploy.dir}/lib"/> 
+		<mkdir dir="${build.deploy.dir}/sql"/> 
+		 
+		<copy overwrite="yes" todir="${build.deploy.dir}/sql">
+			<fileset dir="${sql.dir}/">
+				<include name="create_lams_tool_forum.sql"/>
+				<include name="drop_lams_tool_forum.sql"/>
+				<include name="activity_insert.sql"/>
+				<include name="library_insert.sql"/>
+				<include name="tool_insert.sql"/>
+			</fileset>
 		</copy>
 
-		<mkdir dir="${deploy.dir}/jsps" />
-		<copy todir="${deploy.dir}/jsps">
-              <fileset dir="${web.dir}/jsps" includes="**/*.jsp"/>
-        </copy>
+		<copy overwrite="yes" todir="${build.deploy.dir}/">
+			<fileset dir="${deploy.tool.dir}">
+				<include name="*.*"/>
+			</fileset>
+		</copy>
 
-        <mkdir dir="${deploy.dir}/includes" />
-          <copy todir="${deploy.dir}/includes">
-              <fileset dir="${web.dir}/includes" excludes="**/*.txt,**/*.java"/>
-          </copy>
+		<copy overwrite="yes" todir="${build.deploy.dir}/lib">
+			<fileset dir="${deploy.tool.dir}/lib">
+				<include name="*.jar"/>
+			</fileset>
+		</copy>
 
-        <mkdir dir="${deploy.dir}/images" />
-          <copy todir="${deploy.dir}/images">
-              <fileset dir="${web.dir}/images" includes="**/*.png,**/*.gif"/>
-          </copy>
+		<taskdef name="generateDeployProperties" 
+			classname="org.lamsfoundation.lams.tool.deploy.CreatePackageTask">
+		    <classpath refid="deploy.lib.classpath"/>
+		</taskdef>
 
+		<generateDeployProperties depends="compile" 
+			mode="development" 
+			outputPath="${build.deploy.dir}"
+			dbPassword="${database.password}"
+			dbUsername="${database.userid}"
+			dbDriverUrl="${database.url}"
+			dbDriverClass="com.mysql.jdbc.Driver"
+			deployFiles="${build.lib.dir}/${product}.war,${build.lib.dir}/${product}.jar"
+			toolSignature="${signature}"
+			toolTablesScriptPath="${sql.dir}/create_lams_tool_forum.sql"
+			toolTablesDeleteScriptPath="${sql.dir}/drop_lams_tool_forum.sql"
+			toolActivityInsertScriptPath="${sql.dir}/activity_insert.sql"
+			toolLibraryInsertScriptPath="${sql.dir}/library_insert.sql"
+			toolInsertScriptPath="${sql.dir}/tool_insert.sql"
+			lamsEarPath="${jboss.deploy}"
+			toolContext="${toolContext}"
+			toolWebUri="${product}.war"
+			/>
 	</target>
 
+	<target name="deploy-tool" depends="create-deploy-package" 
+		description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
 
+		<path id="deploy.classpath">
+			<fileset dir="${build.deploy.dir}">
+				<include name="lib/*.jar"/>
+			</fileset>
+		</path> 
+
+		<echo>Deploying the ISMCP tool</echo>
+	
+		<java
+			classname="org.lamsfoundation.lams.tool.deploy.Deploy"
+			classpathref="deploy.classpath"
+			fork="true">
+				<arg file="${build.deploy.dir}/deploy.properties"/>
+				<arg value="True"/> <!-- forcedb -->
+		</java>
+					
+	</target>
+
 	<!-- begin navigation tasks *************************************************************************************-->
 	<target
         name="_build"
-        depends="init, clean, mkdirs, compile, merge, hibernate, jar">
+        depends="init, clean, mkdirs, compile, merge, jar, web">
 		<echo>+------------------------------------------+</echo>
 		<echo>| built war file                           |</echo>
 		<echo>+------------------------------------------+</echo>
 	</target>
 
-
-    <target name="war" depends="copyweb">
-            <war destfile="${deploy.dir}/${project}.war"
-                webxml="${deploy.dir}/WEB-INF/web.xml" basedir="${deploy.dir}" />
-    </target>
-
-    <!-- EAR Related Targets -->
-
-	<target
-        name="_deploy"
-        depends="war">
-		<echo>+------------------------------------------+</echo>
-		<echo>| deployed war file                        |</echo>
-		<echo>+------------------------------------------+</echo>
-         <copy todir="${appserver.deploy.dir}">
-            <fileset dir="${deploy.dir}" includes="${project}.war"/>
-        </copy>
-	</target>
-	<!-- end navigation tasks ***************************************************************************************-->
+ 	<!-- end navigation tasks ***************************************************************************************-->
 	<!-- end tasks **************************************************************************************************-->
 </project>
Index: lams_tool_forum/db/sql/activity_insert.sql
===================================================================
diff -u
--- lams_tool_forum/db/sql/activity_insert.sql	(revision 0)
+++ lams_tool_forum/db/sql/activity_insert.sql	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -0,0 +1,84 @@
+# Connection: ROOT LOCAL
+# Host: localhost
+# Saved: 2005-04-07 11:08:32
+# 
+INSERT INTO lams_learning_activity
+(
+activity_ui_id
+, description
+, title
+, help_text
+, xcoord
+, ycoord
+, parent_activity_id
+, parent_ui_id
+, learning_activity_type_id
+, grouping_support_type_id
+, apply_grouping_flag
+, grouping_id
+, grouping_ui_id
+, order_id
+, define_later_flag
+, learning_design_id
+, learning_library_id
+, create_date_time
+, run_offline_flag
+, offline_instructions
+, online_instructions
+, max_number_of_options
+, min_number_of_options
+, options_instructions
+, tool_id
+, tool_content_id
+, activity_category_id
+, gate_activity_level_id
+, gate_open_flag
+, gate_start_time_offset
+, gate_end_time_offset
+, gate_start_date_time
+, gate_end_date_time
+, library_activity_ui_image
+, create_grouping_id
+, create_grouping_ui_id
+, library_activity_id
+)
+VALUES
+(
+NULL
+, 'Forum/Message Board'
+, 'Forum'
+, 'Put some help text here.'
+, NULL
+, NULL
+, NULL
+, NULL
+, 1
+, 1
+, 0
+, NULL
+, NULL
+, NULL
+, 0
+, NULL
+, ${learning_library_id}
+, NOW()
+, 0
+, 'Do it yourself'
+, 'Do it in LAMS'
+, NULL
+, NULL
+, NULL
+, ${tool_id}
+, NULL
+, 4
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, '/tool/lafrum11/images/icon_forum.gif'
+, NULL
+, NULL
+, NULL
+)
Index: lams_tool_forum/db/sql/drop_lams_tool_forum.sql
===================================================================
diff -u -r8f714bc2a298cad42acd47e9c5df932b23555eb7 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/db/sql/drop_lams_tool_forum.sql	(.../drop_lams_tool_forum.sql)	(revision 8f714bc2a298cad42acd47e9c5df932b23555eb7)
+++ lams_tool_forum/db/sql/drop_lams_tool_forum.sql	(.../drop_lams_tool_forum.sql)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -1,16 +1,11 @@
-alter table tl_lafrum11_attachment drop foreign key FK389AD9A23FF9501;
-alter table tl_lafrum11_attachment drop foreign key FK389AD9A2D1B;
-alter table tl_lafrum11_forum drop foreign key FK87917942D1B;
-alter table tl_lafrum11_message drop foreign key FK4A6067E83FF9501;
-alter table tl_lafrum11_message drop foreign key FK4A6067E88C3DFCAA;
-alter table tl_lafrum11_message drop foreign key FK4A6067E8D1B;
+SET FOREIGN_KEY_CHECKS=0;
 drop table if exists tl_lafrum11_attachment;
 drop table if exists tl_lafrum11_forum;
 drop table if exists tl_lafrum11_genericentity;
 drop table if exists tl_lafrum11_message;
+SET FOREIGN_KEY_CHECKS=1;
 
 
 
 
 
-
Index: lams_tool_forum/db/sql/library_insert.sql
===================================================================
diff -u
--- lams_tool_forum/db/sql/library_insert.sql	(revision 0)
+++ lams_tool_forum/db/sql/library_insert.sql	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -0,0 +1,18 @@
+# Connection: ROOT LOCAL
+# Host: localhost
+# Saved: 2005-04-07 10:50:55
+# 
+INSERT INTO lams_learning_library
+(
+description,
+title,
+valid_flag,
+create_date_time
+)
+VALUES
+(
+'Forum, also known Message Board',
+'Forum',
+0,
+NOW()
+)
Index: lams_tool_forum/db/sql/tool_insert.sql
===================================================================
diff -u
--- lams_tool_forum/db/sql/tool_insert.sql	(revision 0)
+++ lams_tool_forum/db/sql/tool_insert.sql	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -0,0 +1,50 @@
+# Connection: ROOT LOCAL
+# Host: localhost
+# Saved: 2005-04-07 10:42:43
+# 
+INSERT INTO lams_tool
+(
+tool_signature,
+service_name,
+tool_display_name,
+description,
+learning_library_id,
+default_tool_content_id,
+valid_flag,
+grouping_support_type_id,
+supports_define_later_flag,
+supports_run_offline_flag,
+supports_moderation_flag,
+supports_contribute_flag,
+learner_url,
+author_url,
+define_later_url,
+export_portfolio_url,
+monitor_url,
+contribute_url,
+moderation_url,
+create_date_time
+)
+VALUES
+(
+'lafrum11',
+'ForumManager',
+'Forum',
+'Forum / Message Boards',
+NULL,
+NULL,
+0,
+1,
+1,
+1,
+1,
+0,
+'/tool/lafrum11/learning/forum/open.do',
+'/tool/lafrum11/authoring/forum/create.do',
+'/tool/lafrum11/definelater.do',
+'/tool/lafrum11/export.do',
+'/tool/lafrum11/monitor.do',
+'/tool/lafrum11/contribute.do',
+'/tool/lafrum11/moderate.do',
+NOW()
+)
Index: lams_tool_forum/src/java/forumApplicationContext.xml
===================================================================
diff -u -r0be591a3e0a3c8bc6564ea2728f3c0d42b8e4f03 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/src/java/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 0be591a3e0a3c8bc6564ea2728f3c0d42b8e4f03)
+++ lams_tool_forum/src/java/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -51,10 +51,10 @@
             <value>jdbc:mysql://localhost/lams</value>
         </property>
         <property name="username">
-            <value>root</value>
+            <value>lams</value>
         </property>
         <property name="password">
-            <value>root</value>
+            <value>lamsdemo</value>
         </property>
     </bean>
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -0,0 +1,61 @@
+appName  = forum
+
+## errors
+errors.header=<b class="error">
+errors.footer=</b>
+
+#error.title = System Error!
+error.valueReqd = Value Required
+error.inputFileTooLarge = Input File size is too large!
+error.uploading = error uploading
+
+#General Messages
+message.msg.maxFileSize = Max 250K
+
+## Forum
+
+title.forum.add = Add Forum
+title.forum.edit = Edit Forum
+title.forum.open = Open Forum
+title.forum.delete = Delete Forum
+
+forum.label.title = Tile
+forum.label.instructions = Instructions
+forum.label.onlineInstructions  = Online Instructions
+forum.label.offlineInstructions = Offline Instructions
+forum.label.onlineFile = Online Attachments
+forum.label.offlineFile = Offline Attachments
+forum.label.lockWhenFinished = Lock When Finished
+forum.label.forceOffline = Force Offline
+forum.label.allowAnnomity = Allow Annomity
+forum.attachment.label.delete = Delete Attachment
+forum.topic.label.delete = Delete Topic
+forum.link.createTopic = New Topic
+
+##Topic
+topic.label.subject = Topic: 
+
+##Message
+title.messageTopic.open = Topic Details
+
+title.message.add = Add Message
+title.message.open = View Message
+title.message.reply = Reply Message
+title.message.edit = Edit Message
+message.label.subject = Subject
+message.label.body = Body
+message.label.postedOn = Posted On:
+message.label.threadReplies  = Thread Replies
+message.link.reply = Reply
+
+##Labels
+label.open = Open
+label.delete = Delete
+
+##Buttons
+button.upload = upload
+button.done = done
+button.submit = submit
+button.on = On
+button.off = Off
+
Fisheye: Tag 4296cc24afab0a22b2075656b93b7bad7578e32f refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/classes/ApplicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4296cc24afab0a22b2075656b93b7bad7578e32f refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/classes/log4j.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ab7a303a254941ceb559ea8aa56039befa9017a1 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4296cc24afab0a22b2075656b93b7bad7578e32f refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/struts/config/global-exceptions.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4296cc24afab0a22b2075656b93b7bad7578e32f refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/struts/config/global-forwards.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4296cc24afab0a22b2075656b93b7bad7578e32f refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/struts/config/struts-actions.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4296cc24afab0a22b2075656b93b7bad7578e32f refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/struts/config/struts-forms.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4296cc24afab0a22b2075656b93b7bad7578e32f refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/struts/config/struts-message-resources.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4296cc24afab0a22b2075656b93b7bad7578e32f refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/struts/config/struts-plugins.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/WEB-INF/struts/struts-bean.tld
===================================================================
diff -u -rd60e290ca8ab892199ca56aefd387b8f080fb270 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/web/WEB-INF/struts/struts-bean.tld	(.../struts-bean.tld)	(revision d60e290ca8ab892199ca56aefd387b8f080fb270)
+++ lams_tool_forum/web/WEB-INF/struts/struts-bean.tld	(.../struts-bean.tld)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -8,10 +8,10 @@
 
 <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
 <taglib>
-<tlibversion>1.0</tlibversion>
+<tlibversion>1.2</tlibversion>
 <jspversion>1.1</jspversion>
 <shortname>bean</shortname>
-<uri>http://jakarta.apache.org/struts/tags-bean</uri>
+<uri>http://struts.apache.org/tags-bean</uri>
 <tag>
 <name>cookie</name>
 <tagclass>org.apache.struts.taglib.bean.CookieTag</tagclass>
Index: lams_tool_forum/web/WEB-INF/struts/struts-html.tld
===================================================================
diff -u -rd60e290ca8ab892199ca56aefd387b8f080fb270 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/web/WEB-INF/struts/struts-html.tld	(.../struts-html.tld)	(revision d60e290ca8ab892199ca56aefd387b8f080fb270)
+++ lams_tool_forum/web/WEB-INF/struts/struts-html.tld	(.../struts-html.tld)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -8,10 +8,10 @@
 
 <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
 <taglib>
-<tlibversion>1.0</tlibversion>
+<tlibversion>1.2</tlibversion>
 <jspversion>1.1</jspversion>
 <shortname>html</shortname>
-<uri>http://jakarta.apache.org/struts/tags-html</uri>
+<uri>http://struts.apache.org/tags-html</uri>
 <tag>
 <name>base</name>
 <tagclass>org.apache.struts.taglib.html.BaseTag</tagclass>
@@ -46,6 +46,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -180,6 +185,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -309,11 +319,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -439,6 +474,16 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>footer</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>header</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>locale</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -449,10 +494,20 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>prefix</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>property</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
+<attribute>
+<name>suffix</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
 </tag>
 <tag>
 <name>file</name>
@@ -478,11 +533,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -618,6 +698,16 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>acceptCharset</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>disabled</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>enctype</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -638,22 +728,22 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
-<name>name</name>
+<name>onreset</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
-<name>onreset</name>
+<name>onsubmit</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
-<name>onsubmit</name>
+<name>readonly</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
-<name>scope</name>
+<name>scriptLanguage</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
@@ -677,21 +767,26 @@
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
-<attribute>
-<name>type</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
 </tag>
 <tag>
 <name>frame</name>
 <tagclass>org.apache.struts.taglib.html.FrameTag</tagclass>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>action</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>module</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>anchor</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -832,6 +927,16 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>disabled</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -952,6 +1057,11 @@
 <tagclass>org.apache.struts.taglib.html.HtmlTag</tagclass>
 <bodycontent>JSP</bodycontent>
 <attribute>
+<name>lang</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>locale</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1166,6 +1276,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>contextRelative</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>height</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1266,6 +1381,16 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>action</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>module</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>paramName</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1326,6 +1451,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>useLocalEncoding</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>usemap</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1371,6 +1501,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>scriptLanguage</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>src</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1385,6 +1520,11 @@
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
+<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
 </tag>
 <tag>
 <name>link</name>
@@ -1400,6 +1540,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>module</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>anchor</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1425,6 +1570,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>linkName</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1569,6 +1719,11 @@
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
+<attribute>
+<name>useLocalEncoding</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
 </tag>
 <tag>
 <name>messages</name>
@@ -1635,11 +1790,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>name</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1898,11 +2078,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -2057,11 +2262,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -2201,6 +2431,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -2316,6 +2551,16 @@
 <tagclass>org.apache.struts.taglib.html.RewriteTag</tagclass>
 <bodycontent>empty</bodycontent>
 <attribute>
+<name>action</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>module</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>anchor</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -2375,6 +2620,11 @@
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
+<attribute>
+<name>useLocalEncoding</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
 </tag>
 <tag>
 <name>select</name>
@@ -2391,11 +2641,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -2540,6 +2815,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -2674,11 +2954,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -2828,6 +3133,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>cols</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -2838,6 +3148,26 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
Index: lams_tool_forum/web/WEB-INF/struts/struts-logic.tld
===================================================================
diff -u -rd60e290ca8ab892199ca56aefd387b8f080fb270 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/web/WEB-INF/struts/struts-logic.tld	(.../struts-logic.tld)	(revision d60e290ca8ab892199ca56aefd387b8f080fb270)
+++ lams_tool_forum/web/WEB-INF/struts/struts-logic.tld	(.../struts-logic.tld)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -7,10 +7,10 @@
 
 <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
 <taglib>
-<tlibversion>1.0</tlibversion>
+<tlibversion>1.2</tlibversion>
 <jspversion>1.1</jspversion>
 <shortname>logic</shortname>
-<uri>http://jakarta.apache.org/struts/tags-logic</uri>
+<uri>http://struts.apache.org/tags-logic</uri>
 <tag>
 <name>empty</name>
 <tagclass>org.apache.struts.taglib.logic.EmptyTag</tagclass>
@@ -576,6 +576,11 @@
 <name>redirect</name>
 <tagclass>org.apache.struts.taglib.logic.RedirectTag</tagclass>
 <attribute>
+<name>action</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>anchor</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -635,6 +640,11 @@
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
+<attribute>
+<name>useLocalEncoding</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
 </tag>
 </taglib>
 
Index: lams_tool_forum/web/WEB-INF/struts/struts-nested.tld
===================================================================
diff -u -rd60e290ca8ab892199ca56aefd387b8f080fb270 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/web/WEB-INF/struts/struts-nested.tld	(.../struts-nested.tld)	(revision d60e290ca8ab892199ca56aefd387b8f080fb270)
+++ lams_tool_forum/web/WEB-INF/struts/struts-nested.tld	(.../struts-nested.tld)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -7,10 +7,10 @@
 
 <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
 <taglib>
-<tlibversion>1.0</tlibversion>
+<tlibversion>1.2</tlibversion>
 <jspversion>1.1</jspversion>
 <shortname>nested</shortname>
-<uri>http://jakarta.apache.org/struts/tags-nested</uri>
+<uri>http://struts.apache.org/tags-nested</uri>
 <tag>
 <name>nest</name>
 <tagclass>org.apache.struts.taglib.nested.NestedPropertyTag</tagclass>
@@ -24,13 +24,19 @@
 <tag>
 <name>writeNesting</name>
 <tagclass>org.apache.struts.taglib.nested.NestedWriteNestingTag</tagclass>
+<teiclass>org.apache.struts.taglib.nested.NestedWriteNestingTei</teiclass>
 <bodycontent>JSP</bodycontent>
 <attribute>
 <name>property</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>id</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>filter</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -247,11 +253,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -377,6 +408,16 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>footer</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>header</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>locale</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -387,10 +428,20 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>prefix</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>property</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
+<attribute>
+<name>suffix</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
 </tag>
 <tag>
 <name>file</name>
@@ -416,11 +467,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -556,6 +632,16 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>acceptCharset</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>disabled</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>enctype</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -566,12 +652,12 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
-<name>method</name>
+<name>focusIndex</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
-<name>name</name>
+<name>method</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
@@ -586,11 +672,16 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
-<name>scope</name>
+<name>readonly</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>scriptLanguage</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>style</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -610,11 +701,6 @@
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
-<attribute>
-<name>type</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-</attribute>
 </tag>
 <tag>
 <name>hidden</name>
@@ -655,10 +741,25 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>styleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>styleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>value</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
+<attribute>
+<name>write</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
 </tag>
 <tag>
 <name>image</name>
@@ -929,6 +1030,16 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>action</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>module</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>paramName</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -989,6 +1100,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>useLocalEncoding</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>usemap</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1018,6 +1134,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>module</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>anchor</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1043,6 +1164,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>linkName</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1187,6 +1313,11 @@
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
+<attribute>
+<name>useLocalEncoding</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
 </tag>
 <tag>
 <name>messages</name>
@@ -1253,11 +1384,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>name</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1378,6 +1534,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>filter</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>labelName</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1413,6 +1574,11 @@
 <tagclass>org.apache.struts.taglib.nested.html.NestedOptionsCollectionTag</tagclass>
 <bodycontent>empty</bodycontent>
 <attribute>
+<name>filter</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>label</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1462,11 +1628,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1621,11 +1812,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1720,6 +1936,11 @@
 <required>true</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
+<attribute>
+<name>idName</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
 </tag>
 <tag>
 <name>select</name>
@@ -1741,11 +1962,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -1890,6 +2136,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -2024,11 +2275,36 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>disabled</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -2178,6 +2454,11 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>cols</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
@@ -2188,6 +2469,26 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 <attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
 <name>indexed</name>
 <required>false</required>
 <rtexprvalue>true</rtexprvalue>
Index: lams_tool_forum/web/WEB-INF/struts/struts-tiles.tld
===================================================================
diff -u -rd60e290ca8ab892199ca56aefd387b8f080fb270 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/web/WEB-INF/struts/struts-tiles.tld	(.../struts-tiles.tld)	(revision d60e290ca8ab892199ca56aefd387b8f080fb270)
+++ lams_tool_forum/web/WEB-INF/struts/struts-tiles.tld	(.../struts-tiles.tld)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+
+
+
+
+
+
 <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
 <taglib>
-<tlibversion>1.0</tlibversion>
+<tlibversion>1.2</tlibversion>
 <jspversion>1.1</jspversion>
 <shortname>tiles</shortname>
-<uri>http://jakarta.apache.org/struts/tags-tiles</uri>
+<uri>http://struts.apache.org/tags-tiles</uri>
 <tag>
 <name>insert</name>
 <tagclass>org.apache.struts.taglib.tiles.InsertTag</tagclass>
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -rc1e4f28dd6c984016bc99a1b7f3869c1e8ef5bf8 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision c1e4f28dd6c984016bc99a1b7f3869c1e8ef5bf8)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -27,7 +27,7 @@
        	<put name="pageTitleKey" value="title.forum.add"/>
         <put name="selectedIndex" value="0" />
         <put name="parameterName" value="selected" />
-        <put name="actionName" value="/forum/authoring/forum/create.do" />
+        <put name="actionName" value="/authoring/forum/create.do" />
         <put name="header" value="/includes/header.jsp"/>
         <put name="footer" value="/includes/footer.jsp"/>
         <putList name="tabList" >
@@ -42,7 +42,7 @@
        	<put name="pageTitleKey" value="title.forum.edit"/>
         <put name="selectedIndex" value="0" />
         <put name="parameterName" value="selected" />
-        <put name="actionName" value="/forum/authoring/forum/edit.do" />
+        <put name="actionName" value="/authoring/forum/edit.do" />
         <put name="header" value="/includes/header.jsp"/>
         <put name="footer" value="/includes/footer.jsp"/>
         <putList name="tabList" >
Index: lams_tool_forum/web/WEB-INF/struts/validator-rules.xml
===================================================================
diff -u -rd60e290ca8ab892199ca56aefd387b8f080fb270 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/web/WEB-INF/struts/validator-rules.xml	(.../validator-rules.xml)	(revision d60e290ca8ab892199ca56aefd387b8f080fb270)
+++ lams_tool_forum/web/WEB-INF/struts/validator-rules.xml	(.../validator-rules.xml)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -1,7 +1,8 @@
 <!DOCTYPE form-validation PUBLIC
-          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.0//EN"
-          "http://jakarta.apache.org/commons/dtds/validator_1_0.dtd">
+          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN"
+          "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
 <!--
+  $Id$
 
    This file contains the default Struts Validator pluggable validator
    definitions.  It should be placed somewhere under /WEB-INF and
@@ -37,6 +38,11 @@
    errors.creditcard={0} is an invalid credit card number.
    errors.email={0} is an invalid e-mail address.
 
+   Note: Starting in Struts 1.2.0 the default javascript definitions have
+         been consolidated to commons-validator. The default can be overridden
+         by supplying a <javascript> element with a CDATA section, just as
+         in struts 1.1.
+
 -->
 
 <form-validation>
@@ -49,458 +55,127 @@
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
-                  msg="errors.required">
+                  msg="errors.required"/>
 
-         <javascript><![CDATA[
-            function validateRequired(form) {
-                var isValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oRequired = new required();
-                for (x in oRequired) {
-                	var field = form[oRequired[x][0]];
-                	
-                    if (field.type == 'text' ||
-                        field.type == 'textarea' ||
-                        field.type == 'file' ||
-                        field.type == 'select-one' ||
-                        field.type == 'radio' ||
-                        field.type == 'password') {
-                        
-                        var value = '';
-						// get field's value
-						if (field.type == "select-one") {
-							var si = field.selectedIndex;
-							if (si >= 0) {
-								value = field.options[si].value;
-							}
-						} else {
-							value = field.value;
-						}
-                        
-                        if (trim(value).length == 0) {
-                        
-	                        if (i == 0) {
-	                            focusField = field;
-	                        }
-	                        fields[i++] = oRequired[x][1];
-	                        isValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return isValid;
-            }
-            
-            // Trim whitespace from left and right sides of s.
-            function trim(s) {
-                return s.replace( /^\s*/, "" ).replace( /\s*$/, "" );
-            }
-            
-            ]]>
-         </javascript>
-
-      </validator>
-
       <validator name="requiredif"
                  classname="org.apache.struts.validator.FieldChecks"
                  method="validateRequiredIf"
                  methodParams="java.lang.Object,
                                org.apache.commons.validator.ValidatorAction,
                                org.apache.commons.validator.Field,
-                               org.apache.struts.action.ActionErrors,
+                               org.apache.struts.action.ActionMessages,
                                org.apache.commons.validator.Validator,
                                javax.servlet.http.HttpServletRequest"
-                 msg="errors.required">
-      </validator>
+                 msg="errors.required"/>
 
+      <validator name="validwhen"
+          msg="errors.required"
+                 classname="org.apache.struts.validator.validwhen.ValidWhen"
+                 method="validateValidWhen"
+                 methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"/>
+
+
       <validator name="minlength"
             classname="org.apache.struts.validator.FieldChecks"
                method="validateMinLength"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends=""
-                  msg="errors.minlength">
+                  msg="errors.minlength"
+           jsFunction="org.apache.commons.validator.javascript.validateMinLength"/>
 
-         <javascript><![CDATA[
-            function validateMinLength(form) {
-                var isValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oMinLength = new minlength();
-                for (x in oMinLength) {
-                    var field = form[oMinLength[x][0]];
-                    
-                    if (field.type == 'text' ||
-                        field.type == 'textarea') {
-                        
-                        var iMin = parseInt(oMinLength[x][2]("minlength"));
-                        if ((trim(field.value).length > 0) && (field.value.length < iMin)) {
-                            if (i == 0) {
-                                focusField = field;
-                            }
-                            fields[i++] = oMinLength[x][1];
-                            isValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return isValid;
-            }]]>
-         </javascript>
 
-      </validator>
-
-
       <validator name="maxlength"
             classname="org.apache.struts.validator.FieldChecks"
                method="validateMaxLength"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends=""
-                  msg="errors.maxlength">
+                  msg="errors.maxlength"
+           jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/>
 
-         <javascript><![CDATA[
-            function validateMaxLength(form) {
-                var isValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oMaxLength = new maxlength();
-                for (x in oMaxLength) {
-                    var field = form[oMaxLength[x][0]];
-                    
-                    if (field.type == 'text' ||
-                        field.type == 'textarea') {
-                        
-                        var iMax = parseInt(oMaxLength[x][2]("maxlength"));
-                        if (field.value.length > iMax) {
-                            if (i == 0) {
-                                focusField = field;
-                            }
-                            fields[i++] = oMaxLength[x][1];
-                            isValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return isValid;
-            }]]>
-         </javascript>
 
-      </validator>
 
-
       <validator name="mask"
             classname="org.apache.struts.validator.FieldChecks"
                method="validateMask"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends=""
-                  msg="errors.invalid">
+                  msg="errors.invalid"/>
 
-         <javascript><![CDATA[
-            function validateMask(form) {
-                var isValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oMasked = new mask();
-                for (x in oMasked) {
-                    var field = form[oMasked[x][0]];
-                    
-                    if ((field.type == 'text' || 
-                         field.type == 'textarea') && 
-                         (field.value.length > 0)) {
-                        
-                        if (!matchPattern(field.value, oMasked[x][2]("mask"))) {
-                            if (i == 0) {
-                                focusField = field;
-                            }
-                            fields[i++] = oMasked[x][1];
-                            isValid = false;
-                        }
-                    }
-                }
-                
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return isValid;
-            }
 
-            function matchPattern(value, mask) {
-               return mask.exec(value);
-            }]]>
-         </javascript>
-
-      </validator>
-
-
       <validator name="byte"
             classname="org.apache.struts.validator.FieldChecks"
                method="validateByte"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends=""
                   msg="errors.byte"
-       jsFunctionName="ByteValidations">
+       jsFunctionName="ByteValidations"/>
 
-         <javascript><![CDATA[
-            function validateByte(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oByte = new ByteValidations();
-                for (x in oByte) {
-                	var field = form[oByte[x][0]];
-                	
-                    if (field.type == 'text' ||
-                        field.type == 'textarea' ||
-                        field.type == 'select-one' ||
-						field.type == 'radio') {
 
-						var value = '';
-						// get field's value
-						if (field.type == "select-one") {
-							var si = field.selectedIndex;
-							if (si >= 0) {
-								value = field.options[si].value;
-							}
-						} else {
-							value = field.value;
-						}
-                        
-                        if (value.length > 0) {
-                            if (!isAllDigits(value)) {
-                                bValid = false;
-                                if (i == 0) {
-                                    focusField = field;
-                                }
-                                fields[i++] = oByte[x][1];
-
-                            } else {
-
-	                            var iValue = parseInt(value);
-	                            if (isNaN(iValue) || !(iValue >= -128 && iValue <= 127)) {
-	                                if (i == 0) {
-	                                    focusField = field;
-	                                }
-	                                fields[i++] = oByte[x][1];
-	                                bValid = false;
-	                            }
-                            }
-						}
-						
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return bValid;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
       <validator name="short"
             classname="org.apache.struts.validator.FieldChecks"
                method="validateShort"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends=""
                   msg="errors.short"
-       jsFunctionName="ShortValidations">
+       jsFunctionName="ShortValidations"/>
 
-         <javascript><![CDATA[
-            function validateShort(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oShort = new ShortValidations();
-                for (x in oShort) {
-                	var field = form[oShort[x][0]];
-                	
-                    if (field.type == 'text' ||
-                        field.type == 'textarea' ||
-                        field.type == 'select-one' ||
-                        field.type == 'radio') {
-                        
-                        var value = '';
-						// get field's value
-						if (field.type == "select-one") {
-							var si = field.selectedIndex;
-							if (si >= 0) {
-								value = field.options[si].value;
-							}
-						} else {
-							value = field.value;
-						}
-                        
-                        if (value.length > 0) {
-                            if (!isAllDigits(value)) {
-                                bValid = false;
-                                if (i == 0) {
-                                    focusField = field;
-                                }
-                                fields[i++] = oShort[x][1];
 
-                            } else {
-                        
-	                            var iValue = parseInt(value);
-	                            if (isNaN(iValue) || !(iValue >= -32768 && iValue <= 32767)) {
-	                                if (i == 0) {
-	                                    focusField = field;
-	                                }
-	                                fields[i++] = oShort[x][1];
-	                                bValid = false;
-	                            }
-	                       }
-                       }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return bValid;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
       <validator name="integer"
             classname="org.apache.struts.validator.FieldChecks"
                method="validateInteger"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends=""
                   msg="errors.integer"
-       jsFunctionName="IntegerValidations">
+       jsFunctionName="IntegerValidations"/>
 
-         <javascript><![CDATA[
-            function validateInteger(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oInteger = new IntegerValidations();
-                for (x in oInteger) {
-                	var field = form[oInteger[x][0]];
 
-                    if (field.type == 'text' ||
-                        field.type == 'textarea' ||
-                        field.type == 'select-one' ||
-                        field.type == 'radio') {
-                        
-                        var value = '';
-						// get field's value
-						if (field.type == "select-one") {
-							var si = field.selectedIndex;
-						    if (si >= 0) {
-							    value = field.options[si].value;
-						    }
-						} else {
-							value = field.value;
-						}
-                        
-                        if (value.length > 0) {
-                        
-                            if (!isAllDigits(value)) {
-                                bValid = false;
-                                if (i == 0) {
-	                                focusField = field;
-	                            }
-						        fields[i++] = oInteger[x][1];
-						        
-                            } else {
-	                            var iValue = parseInt(value);
-	                            if (isNaN(iValue) || !(iValue >= -2147483648 && iValue <= 2147483647)) {
-	                                if (i == 0) {
-	                                    focusField = field;
-	                                }
-	                                fields[i++] = oInteger[x][1];
-	                                bValid = false;
-	                           }
-                           }
-                       }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return bValid;
-            }
 
-            function isAllDigits(argvalue) {
-                argvalue = argvalue.toString();
-                var validChars = "0123456789";
-                var startFrom = 0;
-                if (argvalue.substring(0, 2) == "0x") {
-                   validChars = "0123456789abcdefABCDEF";
-                   startFrom = 2;
-                } else if (argvalue.charAt(0) == "0") {
-                   validChars = "01234567";
-                   startFrom = 1;
-                } else if (argvalue.charAt(0) == "-") {
-                    startFrom = 1;
-                }
-                
-                for (var n = startFrom; n < argvalue.length; n++) {
-                    if (validChars.indexOf(argvalue.substring(n, n+1)) == -1) return false;
-                }
-                return true;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
       <validator name="long"
             classname="org.apache.struts.validator.FieldChecks"
                method="validateLong"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends=""
                   msg="errors.long"/>
@@ -512,81 +187,21 @@
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends=""
                   msg="errors.float"
-       jsFunctionName="FloatValidations">
+       jsFunctionName="FloatValidations"/>
 
-         <javascript><![CDATA[
-            function validateFloat(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oFloat = new FloatValidations();
-                for (x in oFloat) {
-                	var field = form[oFloat[x][0]];
-                	
-                    if (field.type == 'text' ||
-                        field.type == 'textarea' ||
-                        field.type == 'select-one' ||
-                        field.type == 'radio') {
-                        
-                    	var value = '';
-						// get field's value
-						if (field.type == "select-one") {
-							var si = field.selectedIndex;
-							if (si >= 0) {
-							    value = field.options[si].value;
-							}
-						} else {
-							value = field.value;
-						}
-                        
-                        if (value.length > 0) {
-                            // remove '.' before checking digits
-                            var tempArray = value.split('.');
-                            var joinedString= tempArray.join('');
-
-                            if (!isAllDigits(joinedString)) {
-                                bValid = false;
-                                if (i == 0) {
-                                    focusField = field;
-                                }
-                                fields[i++] = oFloat[x][1];
-
-                            } else {
-	                            var iValue = parseFloat(value);
-	                            if (isNaN(iValue)) {
-	                                if (i == 0) {
-	                                    focusField = field;
-	                                }
-	                                fields[i++] = oFloat[x][1];
-	                                bValid = false;
-	                            }
-                            }
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                   focusField.focus();
-                   alert(fields.join('\n'));
-                }
-                return bValid;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
       <validator name="double"
             classname="org.apache.struts.validator.FieldChecks"
                method="validateDouble"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends=""
                   msg="errors.double"/>
@@ -598,504 +213,101 @@
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends=""
                   msg="errors.date"
-       jsFunctionName="DateValidations">
+       jsFunctionName="DateValidations"/>
 
-         <javascript><![CDATA[
-            function validateDate(form) {
-               var bValid = true;
-               var focusField = null;
-               var i = 0;
-               var fields = new Array();
-               oDate = new DateValidations();
-               for (x in oDate) {
-                   var value = form[oDate[x][0]].value;
-                   var datePattern = oDate[x][2]("datePatternStrict");
-                   if ((form[oDate[x][0]].type == 'text' ||
-                        form[oDate[x][0]].type == 'textarea') &&
-                       (value.length > 0) &&
-                       (datePattern.length > 0)) {
-                     var MONTH = "MM";
-                     var DAY = "dd";
-                     var YEAR = "yyyy";
-                     var orderMonth = datePattern.indexOf(MONTH);
-                     var orderDay = datePattern.indexOf(DAY);
-                     var orderYear = datePattern.indexOf(YEAR);
-                     if ((orderDay < orderYear && orderDay > orderMonth)) {
-                         var iDelim1 = orderMonth + MONTH.length;
-                         var iDelim2 = orderDay + DAY.length;
-                         var delim1 = datePattern.substring(iDelim1, iDelim1 + 1);
-                         var delim2 = datePattern.substring(iDelim2, iDelim2 + 1);
-                         if (iDelim1 == orderDay && iDelim2 == orderYear) {
-                            dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$");
-                         } else if (iDelim1 == orderDay) {
-                            dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$");
-                         } else if (iDelim2 == orderYear) {
-                            dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$");
-                         } else {
-                            dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$");
-                         }
-                         var matched = dateRegexp.exec(value);
-                         if(matched != null) {
-                            if (!isValidDate(matched[2], matched[1], matched[3])) {
-                               if (i == 0) {
-                                   focusField = form[oDate[x][0]];
-                               }
-                               fields[i++] = oDate[x][1];
-                               bValid =  false;
-                            }
-                         } else {
-                            if (i == 0) {
-                                focusField = form[oDate[x][0]];
-                            }
-                            fields[i++] = oDate[x][1];
-                            bValid =  false;
-                         }
-                     } else if ((orderMonth < orderYear && orderMonth > orderDay)) {
-                         var iDelim1 = orderDay + DAY.length;
-                         var iDelim2 = orderMonth + MONTH.length;
-                         var delim1 = datePattern.substring(iDelim1, iDelim1 + 1);
-                         var delim2 = datePattern.substring(iDelim2, iDelim2 + 1);
-                         if (iDelim1 == orderMonth && iDelim2 == orderYear) {
-                             dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$");
-                         } else if (iDelim1 == orderMonth) {
-                             dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$");
-                         } else if (iDelim2 == orderYear) {
-                             dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$");
-                         } else {
-                             dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$");
-                         }
-                         var matched = dateRegexp.exec(value);
-                         if(matched != null) {
-                             if (!isValidDate(matched[1], matched[2], matched[3])) {
-                                 if (i == 0) {
-                                     focusField = form[oDate[x][0]];
-                                 }
-                                 fields[i++] = oDate[x][1];
-                                 bValid =  false;
-                              }
-                         } else {
-                             if (i == 0) {
-                                 focusField = form[oDate[x][0]];
-                             }
-                             fields[i++] = oDate[x][1];
-                             bValid =  false;
-                         }
-                     } else if ((orderMonth > orderYear && orderMonth < orderDay)) {
-                         var iDelim1 = orderYear + YEAR.length;
-                         var iDelim2 = orderMonth + MONTH.length;
-                         var delim1 = datePattern.substring(iDelim1, iDelim1 + 1);
-                         var delim2 = datePattern.substring(iDelim2, iDelim2 + 1);
-                         if (iDelim1 == orderMonth && iDelim2 == orderDay) {
-                             dateRegexp = new RegExp("^(\\d{4})(\\d{2})(\\d{2})$");
-                         } else if (iDelim1 == orderMonth) {
-                             dateRegexp = new RegExp("^(\\d{4})(\\d{2})[" + delim2 + "](\\d{2})$");
-                         } else if (iDelim2 == orderDay) {
-                             dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})(\\d{2})$");
-                         } else {
-                             dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{2})$");
-                         }
-                         var matched = dateRegexp.exec(value);
-                         if(matched != null) {
-                             if (!isValidDate(matched[3], matched[2], matched[1])) {
-                                 if (i == 0) {
-                                     focusField = form[oDate[x][0]];
-                                  }
-                                  fields[i++] = oDate[x][1];
-                                  bValid =  false;
-                              }
-                          } else {
-                              if (i == 0) {
-                                  focusField = form[oDate[x][0]];
-                              }
-                              fields[i++] = oDate[x][1];
-                              bValid =  false;
-                          }
-                     } else {
-                         if (i == 0) {
-                             focusField = form[oDate[x][0]];
-                         }
-                         fields[i++] = oDate[x][1];
-                         bValid =  false;
-                     }
-                  }
-               }
-               if (fields.length > 0) {
-                  focusField.focus();
-                  alert(fields.join('\n'));
-               }
-               return bValid;
-            }
 
-	    function isValidDate(day, month, year) {
-	        if (month < 1 || month > 12) {
-                    return false;
-                }
-                if (day < 1 || day > 31) {
-                    return false;
-                }
-                if ((month == 4 || month == 6 || month == 9 || month == 11) &&
-                    (day == 31)) {
-                    return false;
-                }
-                if (month == 2) {
-                    var leap = (year % 4 == 0 &&
-                               (year % 100 != 0 || year % 400 == 0));
-                    if (day>29 || (day == 29 && !leap)) {
-                        return false;
-                    }
-                }
-                return true;
-            }]]>
-         </javascript>
-
-      </validator>
-
-<!-- range is deprecated use intRange instead -->
-      <validator name="range"
+      <validator name="intRange"
             classname="org.apache.struts.validator.FieldChecks"
                method="validateIntRange"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends="integer"
-                  msg="errors.range">
+                  msg="errors.range"/>
 
-         <javascript><![CDATA[
-            function validateRange(form) {
-                return validateIntRange(form);
-            }]]>
-         </javascript>
 
-      </validator>
-
-      <validator name="intRange"
+      <validator name="floatRange"
             classname="org.apache.struts.validator.FieldChecks"
-               method="validateIntRange"
+               method="validateFloatRange"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
-              depends="integer"
-                  msg="errors.range">
+              depends="float"
+                  msg="errors.range"/>
 
-         <javascript><![CDATA[
-            function validateIntRange(form) {
-                var isValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oRange = new intRange();
-                for (x in oRange) {
-                    var field = form[oRange[x][0]];
-                    
-                    if ((field.type == 'text' ||
-                         field.type == 'textarea') &&
-                        (field.value.length > 0)) {
-                        
-                        var iMin = parseInt(oRange[x][2]("min"));
-                        var iMax = parseInt(oRange[x][2]("max"));
-                        var iValue = parseInt(field.value);
-                        if (!(iValue >= iMin && iValue <= iMax)) {
-                            if (i == 0) {
-                                focusField = field;
-                            }
-                            fields[i++] = oRange[x][1];
-                            isValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                    focusField.focus();
-                    alert(fields.join('\n'));
-                }
-                return isValid;
-            }]]>
-         </javascript>
-
-      </validator>
-
-      <validator name="floatRange"
+      <validator name="doubleRange"
             classname="org.apache.struts.validator.FieldChecks"
-               method="validateFloatRange"
+               method="validateDoubleRange"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
-              depends="float"
-                  msg="errors.range">
+              depends="double"
+                  msg="errors.range"/>
 
-         <javascript><![CDATA[
-            function validateFloatRange(form) {
-                var isValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oRange = new floatRange();
-                for (x in oRange) {
-                    var field = form[oRange[x][0]];
-                    
-                    if ((field.type == 'text' ||
-                         field.type == 'textarea') &&
-                        (field.value.length > 0)) {
-                        
-                        var fMin = parseFloat(oRange[x][2]("min"));
-                        var fMax = parseFloat(oRange[x][2]("max"));
-                        var fValue = parseFloat(field.value);
-                        if (!(fValue >= fMin && fValue <= fMax)) {
-                            if (i == 0) {
-                                focusField = field;
-                            }
-                            fields[i++] = oRange[x][1];
-                            isValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                    focusField.focus();
-                    alert(fields.join('\n'));
-                }
-                return isValid;
-            }]]>
-         </javascript>
 
-      </validator>
-
       <validator name="creditCard"
             classname="org.apache.struts.validator.FieldChecks"
                method="validateCreditCard"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends=""
-                  msg="errors.creditcard">
+                  msg="errors.creditcard"/>
 
-         <javascript><![CDATA[
-            function validateCreditCard(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oCreditCard = new creditCard();
-                for (x in oCreditCard) {
-                    if ((form[oCreditCard[x][0]].type == 'text' ||
-                         form[oCreditCard[x][0]].type == 'textarea') &&
-                        (form[oCreditCard[x][0]].value.length > 0)) {
-                        if (!luhnCheck(form[oCreditCard[x][0]].value)) {
-                            if (i == 0) {
-                                focusField = form[oCreditCard[x][0]];
-                            }
-                            fields[i++] = oCreditCard[x][1];
-                            bValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                    focusField.focus();
-                    alert(fields.join('\n'));
-                }
-                return bValid;
-            }
 
-            /**
-             * Reference: http://www.ling.nwu.edu/~sburke/pub/luhn_lib.pl
-             */
-            function luhnCheck(cardNumber) {
-                if (isLuhnNum(cardNumber)) {
-                    var no_digit = cardNumber.length;
-                    var oddoeven = no_digit & 1;
-                    var sum = 0;
-                    for (var count = 0; count < no_digit; count++) {
-                        var digit = parseInt(cardNumber.charAt(count));
-                        if (!((count & 1) ^ oddoeven)) {
-                            digit *= 2;
-                            if (digit > 9) digit -= 9;
-                        };
-                        sum += digit;
-                    };
-                    if (sum == 0) return false;
-                    if (sum % 10 == 0) return true;
-                };
-                return false;
-            }
-
-            function isLuhnNum(argvalue) {
-                argvalue = argvalue.toString();
-                if (argvalue.length == 0) {
-                    return false;
-                }
-                for (var n = 0; n < argvalue.length; n++) {
-                    if ((argvalue.substring(n, n+1) < "0") ||
-                        (argvalue.substring(n,n+1) > "9")) {
-                        return false;
-                    }
-                }
-                return true;
-            }]]>
-         </javascript>
-
-      </validator>
-
-
       <validator name="email"
             classname="org.apache.struts.validator.FieldChecks"
                method="validateEmail"
          methodParams="java.lang.Object,
                        org.apache.commons.validator.ValidatorAction,
                        org.apache.commons.validator.Field,
-                       org.apache.struts.action.ActionErrors,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
               depends=""
-                  msg="errors.email">
+                  msg="errors.email"/>
 
-         <javascript><![CDATA[
-            function validateEmail(form) {
-                var bValid = true;
-                var focusField = null;
-                var i = 0;
-                var fields = new Array();
-                oEmail = new email();
-                for (x in oEmail) {
-                    if ((form[oEmail[x][0]].type == 'text' ||
-                         form[oEmail[x][0]].type == 'textarea') &&
-                        (form[oEmail[x][0]].value.length > 0)) {
-                        if (!checkEmail(form[oEmail[x][0]].value)) {
-                            if (i == 0) {
-                                focusField = form[oEmail[x][0]];
-                            }
-                            fields[i++] = oEmail[x][1];
-                            bValid = false;
-                        }
-                    }
-                }
-                if (fields.length > 0) {
-                    focusField.focus();
-                    alert(fields.join('\n'));
-                }
-                return bValid;
-            }
+      <validator name="url"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateUrl"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.url"/>
 
-            /**
-             * Reference: Sandeep V. Tamhankar (stamhankar@hotmail.com),
-             * http://javascript.internet.com
-             */
-            function checkEmail(emailStr) {
-               if (emailStr.length == 0) {
-                   return true;
-               }
-               var emailPat=/^(.+)@(.+)$/;
-               var specialChars="\\(\\)<>@,;:\\\\\\\"\\.\\[\\]";
-               var validChars="\[^\\s" + specialChars + "\]";
-               var quotedUser="(\"[^\"]*\")";
-               var ipDomainPat=/^(\d{1,3})[.](\d{1,3})[.](\d{1,3})[.](\d{1,3})$/;
-               var atom=validChars + '+';
-               var word="(" + atom + "|" + quotedUser + ")";
-               var userPat=new RegExp("^" + word + "(\\." + word + ")*$");
-               var domainPat=new RegExp("^" + atom + "(\\." + atom + ")*$");
-               var matchArray=emailStr.match(emailPat);
-               if (matchArray == null) {
-                   return false;
-               }
-               var user=matchArray[1];
-               var domain=matchArray[2];
-               if (user.match(userPat) == null) {
-                   return false;
-               }
-               var IPArray = domain.match(ipDomainPat);
-               if (IPArray != null) {
-                   for (var i = 1; i <= 4; i++) {
-                      if (IPArray[i] > 255) {
-                         return false;
-                      }
-                   }
-                   return true;
-               }
-               var domainArray=domain.match(domainPat);
-               if (domainArray == null) {
-                   return false;
-               }
-               var atomPat=new RegExp(atom,"g");
-               var domArr=domain.match(atomPat);
-               var len=domArr.length;
-               if ((domArr[domArr.length-1].length < 2) ||
-                   (domArr[domArr.length-1].length > 3)) {
-                   return false;
-               }
-               if (len < 2) {
-                   return false;
-               }
-               return true;
-            }]]>
-         </javascript>
+     <!--
+       This simply allows struts to include the validateUtilities into a page, it should
+       not be used as a validation rule.
+     -->
+     <validator name="includeJavaScriptUtilities"
+            classname=""
+               method=""
+         methodParams=""
+              depends=""
+                  msg=""
+           jsFunction="org.apache.commons.validator.javascript.validateUtilities"/>
 
-      </validator>
-
-	<validator name="twofields" 
-    classname="com.aurigalogic.gowestvision.spirit.util.ValidationUtil" method="validateTwoFields" 
-    methodParams="java.lang.Object,
-                  org.apache.commons.validator.ValidatorAction,
-                  org.apache.commons.validator.Field,
-                  org.apache.struts.action.ActionErrors,
-                  javax.servlet.http.HttpServletRequest" 
-   depends="required" msg="errors.twofields">
-    <javascript><![CDATA[
-        function validateTwoFields(form) {
-            var bValid = true;
-            var focusField = null;
-            var i = 0;
-            var fields = new Array();
-            oTwoFields = new twofields();
-            for (x in oTwoFields) {
-                var field = form[oTwoFields[x][0]];
-                var secondField = form[oTwoFields[x][2]("secondProperty")];
-            
-                if (field.type == 'text' ||
-                    field.type == 'textarea' ||
-                    field.type == 'select-one' ||
-                    field.type == 'radio' ||
-                    field.type == 'password') {
-            
-                    var value;
-                    var secondValue;
-                    // get field's value
-                    if (field.type == "select-one") {
-                        var si = field.selectedIndex;
-                        value = field.options[si].value;
-                        secondValue = secondField.options[si].value;
-                    } else {
-                        value = field.value;
-                        secondValue = secondField.value;
-                    }
-                
-                    if (value != secondValue) {
-                    
-                        if (i == 0) {
-                            focusField = field;
-                        }
-                        fields[i++] = oTwoFields[x][1];
-                        bValid = false;
-                    }
-                }
-            }
-            
-            if (fields.length > 0) {
-                focusField.focus();
-                alert(fields.join('\n'));
-            }
-            
-            return bValid;
-        }]]></javascript>
-	</validator>
-
    </global>
 
 </form-validation>
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r60e959797a6a90110b1982e86a7a2cd3e42eaba7 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 60e959797a6a90110b1982e86a7a2cd3e42eaba7)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -1,93 +1,112 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 
-<web-app>
-
+<web-app >
     <display-name>forum</display-name>
     <description>
 		Forum tool
     </description>
 
-  <!-- Action Servlet Configuration -->
-  <servlet>
-    <servlet-name>action</servlet-name>
-    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-    <init-param>
-      <param-name>config</param-name>
-      <param-value>/WEB-INF/struts-config.xml</param-value>
-    </init-param>
-    <init-param>
-      <param-name>debug</param-name>
-      <param-value>1</param-value>
-    </init-param>
-    <init-param>
-      <param-name>detail</param-name>
-      <param-value>1</param-value>
-    </init-param>
-    <init-param>
-      <param-name>validate</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <load-on-startup>2</load-on-startup>
-  </servlet>
+    <!--
+    To use non XDoclet filters, create a filters.xml file that
+    contains the additional filters (eg Sitemesh) and place it in your
+    project's merge dir.  Don't include filter-mappings in this file,
+    include them in a file called filter-mappings.xml and put that in
+    the same directory.
+    -->
 
+    <!--
+    To use non XDoclet filter-mappings, create a filter-mappings.xml file that
+    contains the additional filter-mappings and place it in your
+    project's merge dir.
+    -->
 
-  <servlet-mapping>
-    <servlet-name>action</servlet-name>
-    <url-pattern>*.do</url-pattern>
-  </servlet-mapping>
+    <!--
+    To use non XDoclet listeners, create a listeners.xml file that
+    contains the additional listeners and place it in your
+    project's merge dir.
+    -->
 
-	<session-config>
-		<session-timeout>20</session-timeout>    <!-- 20 minutes -->
-	</session-config>
+     <!--
+	  - Loads the root application context of this web app at startup,
+	  - by default from "/WEB-INF/applicationContext.xml".
+		- Note that it is preferable to use ContextLoaderListener in a servlet container
+		- that follows the Servlet 2.4 initialization order (most Servlet 2.3 containers do).
+		-
+	  - Use WebApplicationContextUtils.getWebApplicationContext(servletContext)
+	  - to access it anywhere in the web application, outside of the framework.
+	  -
+	  - The root context is the parent of all servlet-specific contexts.
+	  - This means that its beans are automatically available in these child contexts,
+	  - both for getBean(name) calls and (external) bean references.
+	-->
+	<servlet>
+		<servlet-name>context</servlet-name>
+		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
 
-    <!--
-    <servlet>
-            <servlet-name>Connector</servlet-name>
-            <servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-            <init-param>
-                  <param-name>baseDir</param-name>
-                  <param-value>/UserFiles/</param-value>
-            </init-param>
-            <init-param>
-                  <param-name>debug</param-name>
-                  <param-value>false</param-value>
-            </init-param>
-            <load-on-startup>1</load-on-startup>
+	<servlet>
+	    <servlet-name>action</servlet-name>
+	    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+	    <init-param>
+	      <param-name>config</param-name>
+	      <param-value>/WEB-INF/struts-config.xml</param-value>
+	    </init-param>
+	    <init-param>
+	      <param-name>debug</param-name>
+	      <param-value>999</param-value>
+	    </init-param>
+	    <init-param>
+	      <param-name>detail</param-name>
+	      <param-value>2</param-value>
+	    </init-param>
+	    <init-param>
+	      <param-name>validate</param-name>
+	      <param-value>true</param-value>
+	    </init-param>
+	    <load-on-startup>2</load-on-startup>
     </servlet>
 
+  	<servlet-mapping>
+		<servlet-name>action</servlet-name>
+	    <url-pattern>*.do</url-pattern>
+	</servlet-mapping>
 
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
 
-    <servlet-mapping>
-          <servlet-name>Connector</servlet-name>
-          <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
-    </servlet-mapping>
-    -->
+   <!--
+   To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
+   Organize mime-mappings.xml following this DTD slice:
 
-  <!-- The Usual Welcome File List -->
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-    <welcome-file>index.html</welcome-file>
-  </welcome-file-list>
+   <!ELEMENT mime-mapping (extension, mime-type)>
+   -->
 
-  <!-- Struts Tag Library Descriptors -->
+   <!--
+   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
+   Organize error-pages.xml following this DTD slice:
 
+   <!ELEMENT error-page ((error-code | exception-type), location)>
+   -->
+
+        <!-- Struts Tag Library Descriptors -->
+
   <taglib>
-    <taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
-    <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
+    <taglib-uri>/WEB-INF/struts/struts-bean.tld</taglib-uri>
+    <taglib-location>/WEB-INF/struts/struts-bean.tld</taglib-location>
   </taglib>
 
   <taglib>
-    <taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
-    <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
+    <taglib-uri>/WEB-INF/struts/struts-html.tld</taglib-uri>
+    <taglib-location>/WEB-INF/struts/struts-html.tld</taglib-location>
   </taglib>
 
   <taglib>
-    <taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
-    <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
+    <taglib-uri>/WEB-INF/struts/struts-logic.tld</taglib-uri>
+    <taglib-location>/WEB-INF/struts/struts-logic.tld</taglib-location>
   </taglib>
 
     <taglib>
@@ -101,7 +120,24 @@
     <taglib-location>/WEB-INF/taglibs-datetime.tld</taglib-location>
   </taglib>
 
+   <!--
+   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
+   Organize web-security.xml following this DTD slice:
 
+   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
+   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
+   <!ELEMENT web-resource-name (#PCDATA)>
+   <!ELEMENT url-pattern (#PCDATA)>
+   <!ELEMENT http-method (#PCDATA)>
+   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
+   <!ELEMENT transport-guarantee (#PCDATA)>
 
-</web-app>
+   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
+   <!ELEMENT auth-method (#PCDATA)>
+   <!ELEMENT realm-name (#PCDATA)>
+   <!ELEMENT form-login-config (form-login-page, form-error-page)>
+   <!ELEMENT form-login-page (#PCDATA)>
+   <!ELEMENT form-error-page (#PCDATA)>
+   -->
 
+</web-app>
Index: lams_tool_forum/web/images/icon_forum.swf
===================================================================
diff -u
Binary files differ
Index: lams_tool_forum/web/includes/layout.jsp
===================================================================
diff -u -r8e2dfda803051c4619c62a27b5d4dcef3324e5f3 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/web/includes/layout.jsp	(.../layout.jsp)	(revision 8e2dfda803051c4619c62a27b5d4dcef3324e5f3)
+++ lams_tool_forum/web/includes/layout.jsp	(.../layout.jsp)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -1,5 +1,5 @@
 <%@ include file="/includes/taglibs.jsp" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %>
 <html>
 <tiles:insert attribute="header"/>
 <body>
Index: lams_tool_forum/web/includes/style.jsp
===================================================================
diff -u -r1d21eeb1aabe95f46289e7a1bf84e8d0876a6abf -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/web/includes/style.jsp	(.../style.jsp)	(revision 1d21eeb1aabe95f46289e7a1bf84e8d0876a6abf)
+++ lams_tool_forum/web/includes/style.jsp	(.../style.jsp)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -1,5 +1,5 @@
 <%@ page language="java" contentType="text/css" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %>
 body {
 	behavior:url("<html:rewrite page="/includes/csshover.htc" />");
 	font-family: Verdana, Helvetica;
Index: lams_tool_forum/web/includes/tabsLayout.jsp
===================================================================
diff -u -r8e2dfda803051c4619c62a27b5d4dcef3324e5f3 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/web/includes/tabsLayout.jsp	(.../tabsLayout.jsp)	(revision 8e2dfda803051c4619c62a27b5d4dcef3324e5f3)
+++ lams_tool_forum/web/includes/tabsLayout.jsp	(.../tabsLayout.jsp)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -76,7 +76,7 @@
 			// enf if
 			index++;
 		%>
-		<td class="<%=styleClass%>"><a href="<%=href%>" /><%=tab.getValue()%></a></td>
+		<td class="<%=styleClass%>"><a href='<html:rewrite page="<%=href%>"/>'/><%=tab.getValue()%></a></td>
 		<td width="1" ></td>
 		</logic:iterate>
 		</tr>
Index: lams_tool_forum/web/includes/taglibs.jsp
===================================================================
diff -u -r8e2dfda803051c4619c62a27b5d4dcef3324e5f3 -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/web/includes/taglibs.jsp	(.../taglibs.jsp)	(revision 8e2dfda803051c4619c62a27b5d4dcef3324e5f3)
+++ lams_tool_forum/web/includes/taglibs.jsp	(.../taglibs.jsp)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -1,5 +1,5 @@
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %>