Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/GenericEntity.hbm.xml
===================================================================
diff -u
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/GenericEntity.hbm.xml	(revision 0)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/GenericEntity.hbm.xml	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.forum.persistence.GenericEntity"
+        table="tl_lafrum11_genericentity"
+        dynamic-update="false"
+        dynamic-insert="false"
+        select-before-update="false"
+        optimistic-lock="version"
+    >
+
+        <id
+            name="id"
+            column="ID"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-GenericEntity.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="created"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            access="property"
+            column="CREATED"
+        />
+
+        <property
+            name="updated"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            access="property"
+            column="UPDATED"
+        />
+
+        <property
+            name="createdBy"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            access="property"
+            column="CREATEDBY"
+        />
+
+        <property
+            name="modifiedBy"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            access="property"
+            column="MODIFIEDBY"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-GenericEntity.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+        <joined-subclass
+            name="org.lamsfoundation.lams.tool.forum.persistence.Message"
+            table="tl_lafrum11_message"
+            dynamic-update="false"
+            dynamic-insert="false"
+        >
+        <key
+            column="id"
+        />
+        <property
+            name="subject"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="SUBJECT"
+        />
+
+        <property
+            name="body"
+            type="text"
+            update="true"
+            insert="true"
+            access="property"
+            column="BODY"
+        />
+
+        <property
+            name="isAuthored"
+            type="boolean"
+            update="true"
+            insert="true"
+            access="property"
+            column="ISAUTHORED"
+        />
+
+        <property
+            name="isAnnonymous"
+            type="boolean"
+            update="true"
+            insert="true"
+            access="property"
+            column="ISANNONYMOUS"
+        />
+
+        <set
+            name="replies"
+            table="MESSAGE"
+            lazy="false"
+            inverse="false"
+            cascade="all"
+            sort="unsorted"
+        >
+
+              <key
+                  column="PARENT"
+              >
+              </key>
+
+              <one-to-many
+                  class="org.lamsfoundation.lams.tool.forum.persistence.Message"
+              />
+
+        </set>
+
+        <many-to-one
+            name="forum"
+            class="org.lamsfoundation.lams.tool.forum.persistence.Forum"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+            column="FORUM"
+        />
+
+        </joined-subclass>
+        <joined-subclass
+            name="org.lamsfoundation.lams.tool.forum.persistence.Forum"
+            table="tl_lafrum11_forum"
+            dynamic-update="false"
+            dynamic-insert="false"
+        >
+        <key
+            column="id"
+        />
+        <property
+            name="title"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="TITLE"
+        />
+
+        <property
+            name="allowAnnomity"
+            type="boolean"
+            update="true"
+            insert="true"
+            access="property"
+            column="ALLOWANNOMITY"
+        />
+
+        <property
+            name="forceOffline"
+            type="boolean"
+            update="true"
+            insert="true"
+            access="property"
+            column="FORCEOFFLINE"
+        />
+
+        <property
+            name="lockWhenFinished"
+            type="boolean"
+            update="true"
+            insert="true"
+            access="property"
+            column="LOCKWHENFINISHED"
+        />
+
+        <property
+            name="instructions"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="INSTRUCTIONS"
+        />
+
+        <property
+            name="onlineInstructions"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="ONLINEINSTRUCTIONS"
+        />
+
+        <property
+            name="offlineInstructions"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="OFFLINEINSTRUCTIONS"
+        />
+
+        <set
+            name="attachments"
+            table="ATTACHMENT"
+            lazy="false"
+            inverse="false"
+            cascade="none"
+            sort="unsorted"
+        >
+
+              <key
+                  column="FORUM"
+              >
+              </key>
+
+              <one-to-many
+                  class="org.lamsfoundation.lams.tool.forum.persistence.Attachment"
+              />
+
+        </set>
+
+        </joined-subclass>
+        <joined-subclass
+            name="org.lamsfoundation.lams.tool.forum.persistence.Attachment"
+            table="tl_lafrum11_attachment"
+            dynamic-update="false"
+            dynamic-insert="false"
+        >
+        <key
+            column="id"
+        />
+        <property
+            name="uuid"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            access="property"
+            column="UUID"
+        />
+
+        <property
+            name="version"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            access="property"
+            column="VERSION"
+        />
+
+        </joined-subclass>
+
+    </class>
+
+        <query name="all"><![CDATA[
+            from GenericEntity genericEntity
+        ]]></query>
+        <query name="allMessages"><![CDATA[
+            from Message message
+        ]]></query>
+        <query name="allAuthoredMessagesOfForum"><![CDATA[
+            from Message message where message.forum.id = ? AND message.isAuthored = true
+        ]]></query>
+        <query name="allMessagesByForum"><![CDATA[
+            from Message message where message.forum = ?
+        ]]></query>
+        <query name="allForums"><![CDATA[
+            from Forum forum
+        ]]></query>
+        <query name="allAttachments"><![CDATA[
+            from Attachment attachment
+        ]]></query>
+        <query name="getAttachmentbyType"><![CDATA[
+            from Attachment attachment where attachment.type = ?
+        ]]></query>
+
+</hibernate-mapping>
Index: lams_tool_forum/conf/war/META-INF/MANIFEST.MF
===================================================================
diff -u
--- lams_tool_forum/conf/war/META-INF/MANIFEST.MF	(revision 0)
+++ lams_tool_forum/conf/war/META-INF/MANIFEST.MF	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
@@ -0,0 +1 @@
+Class-Path: ./lams.jar ./lams-tool-lafrum11.jar ./lams-contentrepository.jar
Index: lams_tool_forum/conf/xdoclet/global-exceptions.xml
===================================================================
diff -u
--- lams_tool_forum/conf/xdoclet/global-exceptions.xml	(revision 0)
+++ lams_tool_forum/conf/xdoclet/global-exceptions.xml	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
@@ -0,0 +1,6 @@
+    <!-- B: global exceptions -->
+    <global-exceptions>
+	    <exception key="error.operation.failed"
+		    type="java.lang.Exception" path="tiles:/error"/>
+    </global-exceptions>
+    <!-- B: end of global exceptions -->
Index: lams_tool_forum/conf/xdoclet/global-forwards.xml
===================================================================
diff -u
--- lams_tool_forum/conf/xdoclet/global-forwards.xml	(revision 0)
+++ lams_tool_forum/conf/xdoclet/global-forwards.xml	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
@@ -0,0 +1,6 @@
+	<!-- B: global forwards -->
+	<global-forwards>
+        <forward   name="forum.error"	path="tiles:/error.jsp"/>
+	</global-forwards>
+	<!-- E: global forwards -->
+
Index: lams_tool_forum/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u
--- lams_tool_forum/conf/xdoclet/servlet-mappings.xml	(revision 0)
+++ lams_tool_forum/conf/xdoclet/servlet-mappings.xml	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
@@ -0,0 +1,5 @@
+	<servlet-mapping>
+		<servlet-name>action</servlet-name>
+	    <url-pattern>*.do</url-pattern>
+	</servlet-mapping>
+	
\ No newline at end of file
Index: lams_tool_forum/conf/xdoclet/servlets.xml
===================================================================
diff -u
--- lams_tool_forum/conf/xdoclet/servlets.xml	(revision 0)
+++ lams_tool_forum/conf/xdoclet/servlets.xml	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
@@ -0,0 +1,43 @@
+    <!--
+	  - 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>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>
+   
+    
+    
\ No newline at end of file
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(revision 0)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
@@ -0,0 +1,209 @@
+	 <!-- ========== Action Mapping Definitions ============================== -->
+
+    <action path="/index"
+		type="org.apache.struts.actions.ForwardAction" parameter="tiles:/layout" />
+
+	<action path="/error"
+		type="org.apache.struts.actions.ForwardAction"
+		parameter="tiles:/error" />
+
+	<action path="/blank"
+		type="org.apache.struts.actions.ForwardAction"
+		parameter="tiles:/blank" />
+
+      	<!-- Forum  related actions -->
+
+	    <action path="/authoring/forum/create"
+		    type="org.apache.struts.actions.ForwardAction" parameter="tiles:/authoring/forum/create" />
+
+	    <action path="/authoring/forum/edit"
+		    type="org.apache.struts.actions.ForwardAction" parameter="tiles:/authoring/forum/edit" />
+
+        <action    path="/authoring/forum/instructions"
+        	type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			name="forumForm"
+			validate="true"
+            input="/authoring/forum/create.do?selected=2"
+			parameter="instructions"
+			scope="session">
+            <forward name="success"		path="/authoring/forum/create.do?selected=2"/>
+        </action>
+
+
+        <action    path="/authoring/forum/editInstructions"
+            type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+            name="forumForm"
+            validate="true"
+            input="/authoring/forum/edit.do?selected=2"
+            parameter="instructions"
+            scope="session">
+            <forward name="success"		path="/authoring/forum/edit.do?selected=2"/>
+        </action>
+
+        <action    path="/authoring/forum/advanced"
+        	type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			name="forumForm"
+			validate="true"
+            input="/authoring/forum/create.do?selected=1"
+			parameter="advanced"
+			scope="session">
+            <forward name="success"		path="/authoring/forum/create.do?selected=1"/>
+        </action>
+
+        <action    path="/authoring/forum/editAdvanced"
+        	type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			name="forumForm"
+			validate="true"
+            input="/authoring/forum/edit.do?selected=1"
+			parameter="advanced"
+			scope="session">
+            <forward name="success"		path="/authoring/forum/edit.do?selected=1"/>
+        </action>
+
+        <action    path="/authoring/forum/createForum"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			name="forumForm"
+			validate="true"
+            input="tiles:/authoring/forum/create"
+			parameter="createForum"
+			scope="session">
+            <forward name="success"		path="tiles:/authoring/forum/edit"/>
+        </action>
+
+        <action    path="/authoring/forum/getForum"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			parameter="getForum"
+			scope="session">
+            <forward name="success"		path="tiles:/authoring/forum/edit"/>
+        </action>
+
+		<action    path="/authoring/forum/editForum"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			name="forumForm"
+			validate="true"
+            input="/authoring/forum/edit.do"
+			parameter="editForum"
+			scope="session">
+			<forward name="success"		path="/authoring/forum/edit.do"/>
+		</action>
+
+        <action    path="/authoring/forum/deleteAttachment"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			name="forumForm"
+			validate="true"
+			parameter="deleteAttachment"
+			scope="session">
+            <forward name="success"		path="/authoring/forum/create.do?selected=2"/>
+        </action>
+
+        <action    path="/authoring/forum/edit/deleteAttachment"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			name="forumForm"
+			validate="true"
+			parameter="deleteAttachment"
+			scope="session">
+            <forward name="success"		path="/authoring/forum/edit.do?selected=2"/>
+        </action>
+
+	    <action path="/authoring/forum/newTopic"
+		    type="org.apache.struts.actions.ForwardAction" parameter="tiles:/authoring/forum/newTopic" />
+
+		<action    path="/authoring/forum/createTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			name="messageForm"
+			validate="true"
+            input="tiles:/authoring/forum/newTopic"
+			parameter="createTopic"
+			scope="request">
+            <forward name="success"		path="tiles:/authoring/forum/create"/>
+		</action>
+
+        <action    path="/authoring/forum/deleteTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+            input="tiles:/authoring/forum/create"
+			parameter="deleteTopic"
+            scope="request">
+            <forward name="success"		path="tiles:/authoring/forum/create"/>
+        </action>
+
+        <action    path="/authoring/forum/edit/deleteTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+            input="tiles:/authoring/forum/create"
+			parameter="deleteTopic"
+            scope="request">
+            <forward name="success"		path="tiles:/authoring/forum/edit"/>
+        </action>
+
+        <action    path="/authoring/forum/getForum"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			validate="true"
+			parameter="getForum"
+			scope="request">
+			<forward name="success"		path="tiles:/authoring/forum/edit"/>
+		</action>
+
+		<action    path="/authoring/forum/delete"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			parameter="deleteForum"
+			scope="request">
+			<forward name="success"		path="titles:/authoring/forum/success"/>
+		</action>
+
+		<!-- Message related actions -->
+
+    	<action    path="/learning/forum/open"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			parameter="openForum"
+			scope="request">
+			<forward name="success"		path="tiles:/learning/forum/open"/>
+		</action>
+
+    	<action    path="/learning/message/openTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			parameter="openTopic"
+			scope="request">
+			<forward name="success"		path="tiles:/learning/message/open"/>
+		</action>
+
+    	<action    path="/learning/message/getMessage"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			parameter="getMessage"
+			scope="request">
+			<forward name="success"		path="tiles:/learning/message/getMessage"/>
+		</action>
+
+    	<action    path="/learning/message/post"
+		     type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			parameter="post"
+			scope="request">
+			<forward name="success"		path="tiles:/learning/message/post"/>
+		</action>
+
+		<action    path="/learning/message/reply"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			name="messageForm"
+			validate="true"
+			input="tiles:/learning/message/post"
+			parameter="reply"
+			scope="request">
+			<forward name="success"		path="/learning/message/openTopic.do"/>
+		</action>
+
+		<action    path="/learning/message/editMessage"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			name="messageForm"
+			validate="true"
+			input="tiles:/learning/message/getMessage"
+			parameter="editMessage"
+			scope="request">
+			<forward name="success"		path="/learning/message/openTopic.do"/>
+		</action>
+
+		<action    path="/learning/message/delete"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
+			parameter="deleteMessage"
+			scope="request">
+			<forward name="success"		path="/learing/message/open.do"/>
+		</action>
+
+
Index: lams_tool_forum/conf/xdoclet/struts-forms.xml
===================================================================
diff -u
--- lams_tool_forum/conf/xdoclet/struts-forms.xml	(revision 0)
+++ lams_tool_forum/conf/xdoclet/struts-forms.xml	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
@@ -0,0 +1,3 @@
+
+
+
Index: lams_tool_forum/conf/xdoclet/struts-message-resources.xml
===================================================================
diff -u
--- lams_tool_forum/conf/xdoclet/struts-message-resources.xml	(revision 0)
+++ lams_tool_forum/conf/xdoclet/struts-message-resources.xml	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
@@ -0,0 +1 @@
+<message-resources parameter="org.lamsfoundation.lams.tool.forum.web.ApplicationResources" />
Index: lams_tool_forum/conf/xdoclet/struts-plugins.xml
===================================================================
diff -u
--- lams_tool_forum/conf/xdoclet/struts-plugins.xml	(revision 0)
+++ lams_tool_forum/conf/xdoclet/struts-plugins.xml	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
@@ -0,0 +1,13 @@
+<!-- Put custom struts plugin here -->
+<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+	<set-property property="pathnames"
+		value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml" />
+</plug-in>
+<plug-in className="org.apache.struts.tiles.TilesPlugin">
+	<set-property property="definitions-config" value="/WEB-INF/struts/tiles-defs.xml"/>
+</plug-in>
+<!--
+<plug-in className="net.sf.struts.saif.SAIFPlugin">
+	<set-property property="interceptor-config" value="/WEB-INF/interceptor-config.xml" />
+</plug-in>
+-->
Index: lams_tool_forum/conf/xdoclet/taglibs.xml
===================================================================
diff -u
--- lams_tool_forum/conf/xdoclet/taglibs.xml	(revision 0)
+++ lams_tool_forum/conf/xdoclet/taglibs.xml	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
@@ -0,0 +1,30 @@
+      <!-- Struts Tag Library Descriptors -->
+
+  <taglib>
+    <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/struts-html.tld</taglib-uri>
+    <taglib-location>/WEB-INF/struts/struts-html.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/struts/struts-logic.tld</taglib-uri>
+    <taglib-location>/WEB-INF/struts/struts-logic.tld</taglib-location>
+  </taglib>
+
+    <taglib>
+        <taglib-uri>forum</taglib-uri>
+        <taglib-location>/WEB-INF/forum.tld</taglib-location>
+    </taglib>
+
+  <!-- Struts Tag Library Descriptors -->
+  <taglib>
+    <taglib-uri>datetime</taglib-uri>
+    <taglib-location>/WEB-INF/taglibs-datetime.tld</taglib-location>
+  </taglib>
+
+    
+    
\ No newline at end of file
Index: lams_tool_forum/conf/xdoclet/web-settings.xml
===================================================================
diff -u
--- lams_tool_forum/conf/xdoclet/web-settings.xml	(revision 0)
+++ lams_tool_forum/conf/xdoclet/web-settings.xml	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
@@ -0,0 +1,4 @@
+   <display-name>forum</display-name>
+    <description>
+		Forum tool
+    </description>