Index: lams_tool_preview/.classpath
===================================================================
diff -u -ra93929c9c7f7f0df676412691f2f8f9d44d201a2 -r9fc998daa072351bbb64ed9d16a1c571c8136b64
--- lams_tool_preview/.classpath	(.../.classpath)	(revision a93929c9c7f7f0df676412691f2f8f9d44d201a2)
+++ lams_tool_preview/.classpath	(.../.classpath)	(revision 9fc998daa072351bbb64ed9d16a1c571c8136b64)
@@ -3,26 +3,27 @@
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
-	<classpathentry kind="var" path="JBOSS_HOME/common/lib/hibernate-core.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
 		<attributes>
-			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/3.3/api/" />
+			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="var" path="JBOSS_HOME/common/lib/servlet-api.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jbossweb">
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.8.3.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
 		<attributes>
-			<attribute name="javadoc_location" value="http://docs.oracle.com/cd/E17802_01/products/products/servlet/2.5/docs/servlet-2_5-mr2/"/>
+			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="var" path="JBOSS_HOME/server/default/deploy/jbossweb.sar/jbossweb.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jbossweb">
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-4.3.7.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
-			<attribute name="javadoc_location" value="http://www.jboss.org/file-access/default/members/jbossweb/freezone/docs/latest/api/"/>
+			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
-	<classpathentry kind="var" path="JBOSS_HOME/common/lib/log4j.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Fisheye: Tag 9fc998daa072351bbb64ed9d16a1c571c8136b64 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/BaseDAOHibernate.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java
===================================================================
diff -u -ra93929c9c7f7f0df676412691f2f8f9d44d201a2 -r9fc998daa072351bbb64ed9d16a1c571c8136b64
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java	(.../PeerreviewDAOHibernate.java)	(revision a93929c9c7f7f0df676412691f2f8f9d44d201a2)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java	(.../PeerreviewDAOHibernate.java)	(revision 9fc998daa072351bbb64ed9d16a1c571c8136b64)
@@ -25,6 +25,7 @@
 
 import java.util.List;
 
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.peerreview.dao.PeerreviewDAO;
 import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
 
@@ -34,11 +35,11 @@
  * 
  * @version $Revision$
  */
-public class PeerreviewDAOHibernate extends BaseDAOHibernate implements PeerreviewDAO{
+public class PeerreviewDAOHibernate extends LAMSBaseDAO implements PeerreviewDAO{
 	private static final String GET_RESOURCE_BY_CONTENTID = "from "+Peerreview.class.getName()+" as r where r.contentId=?";
 	
 	public Peerreview getByContentId(Long contentId) {
-		List list = getHibernateTemplate().find(GET_RESOURCE_BY_CONTENTID,contentId);
+		List list = find(GET_RESOURCE_BY_CONTENTID,contentId);
 		if(list.size() > 0)
 			return (Peerreview) list.get(0);
 		else
@@ -50,7 +51,7 @@
 	}
 
 	public void delete(Peerreview peerreview) {
-		this.getHibernateTemplate().delete(peerreview);
+		delete(peerreview);
 	}
 
 }
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewSessionDAOHibernate.java
===================================================================
diff -u -ra93929c9c7f7f0df676412691f2f8f9d44d201a2 -r9fc998daa072351bbb64ed9d16a1c571c8136b64
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewSessionDAOHibernate.java	(.../PeerreviewSessionDAOHibernate.java)	(revision a93929c9c7f7f0df676412691f2f8f9d44d201a2)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewSessionDAOHibernate.java	(.../PeerreviewSessionDAOHibernate.java)	(revision 9fc998daa072351bbb64ed9d16a1c571c8136b64)
@@ -25,30 +25,31 @@
 
 import java.util.List;
 
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.peerreview.dao.PeerreviewSessionDAO;
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewSession;
 
 
-public class PeerreviewSessionDAOHibernate extends BaseDAOHibernate implements PeerreviewSessionDAO{
+public class PeerreviewSessionDAOHibernate extends LAMSBaseDAO implements PeerreviewSessionDAO{
 	
 	private static final String FIND_BY_SESSION_ID = "from " + PeerreviewSession.class.getName() + " as p where p.sessionId=?";
 	private static final String FIND_BY_CONTENT_ID = "from " + PeerreviewSession.class.getName() + " as p where p.peerreview.contentId=?";
 	
 	public PeerreviewSession getSessionBySessionId(Long sessionId) {
-		List list = getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId);
+		List list = find(FIND_BY_SESSION_ID,sessionId);
 		if(list == null || list.size() == 0)
 			return null;
 		return (PeerreviewSession) list.get(0);
 	}
 	public List<PeerreviewSession> getByContentId(Long toolContentId) {
-		return getHibernateTemplate().find(FIND_BY_CONTENT_ID,toolContentId);
+		return find(FIND_BY_CONTENT_ID,toolContentId);
 	}
 	
 	public void delete(PeerreviewSession session) {
-		this.getHibernateTemplate().delete(session);
+		delete(session);
 	}
 	public void deleteBySessionId(Long toolSessionId) {
-		this.removeObject(PeerreviewSession.class,toolSessionId);
+		removeObject(PeerreviewSession.class,toolSessionId);
 	}
 
 }
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
===================================================================
diff -u -ra93929c9c7f7f0df676412691f2f8f9d44d201a2 -r9fc998daa072351bbb64ed9d16a1c571c8136b64
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java	(.../PeerreviewUserDAOHibernate.java)	(revision a93929c9c7f7f0df676412691f2f8f9d44d201a2)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java	(.../PeerreviewUserDAOHibernate.java)	(revision 9fc998daa072351bbb64ed9d16a1c571c8136b64)
@@ -25,11 +25,12 @@
 
 import java.util.List;
 
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants;
 import org.lamsfoundation.lams.tool.peerreview.dao.PeerreviewUserDAO;
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser;
 
-public class PeerreviewUserDAOHibernate extends BaseDAOHibernate implements PeerreviewUserDAO {
+public class PeerreviewUserDAOHibernate extends LAMSBaseDAO implements PeerreviewUserDAO {
 
     private static final String FIND_BY_USER_ID_CONTENT_ID = "FROM " + PeerreviewUser.class.getName()
 	    + " AS u WHERE u.userId =? AND u.peerreview.contentId=?";
@@ -51,39 +52,39 @@
 
     @Override
     public PeerreviewUser getUserByUserIDAndSessionID(Long userID, Long sessionId) {
-	List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId });
+	List list = find(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId });
 	if (list == null || list.size() == 0)
 	    return null;
 	return (PeerreviewUser) list.get(0);
     }
 
     @Override
     public PeerreviewUser getUserByUserIDAndContentID(Long userId, Long contentId) {
-	List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId });
+	List list = find(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId });
 	if (list == null || list.size() == 0)
 	    return null;
 	return (PeerreviewUser) list.get(0);
     }
 
     @Override
     public List<PeerreviewUser> getBySessionID(Long sessionId) {
-	return this.getHibernateTemplate().find(FIND_BY_SESSION_ID, sessionId);
+	return find(FIND_BY_SESSION_ID, sessionId);
     }
     
     @Override
     public List<Long> getUserIdsBySessionID(Long sessionId) {
-	return this.getHibernateTemplate().find(GET_USERIDS_BY_SESSION_ID, sessionId);
+	return find(GET_USERIDS_BY_SESSION_ID, sessionId);
     }
 
     @Override
     public List<PeerreviewUser> getByContentId(Long toolContentId) {
-	return this.getHibernateTemplate().find(FIND_BY_CONTENT_ID, toolContentId);
+	return find(FIND_BY_CONTENT_ID, toolContentId);
     }
 
     @Override
     public int getCountUsersBySession(final Long toolSessionId, final Long excludeUserId) {
 
-	List list = getHibernateTemplate().find(GET_COUNT_USERS_FOR_SESSION,
+	List list = find(GET_COUNT_USERS_FOR_SESSION,
 		new Object[] { toolSessionId, excludeUserId });
 	if (list == null || list.size() == 0) {
 	    return 0;
Fisheye: Tag 9fc998daa072351bbb64ed9d16a1c571c8136b64 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/IContentPackageConverter.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9fc998daa072351bbb64ed9d16a1c571c8136b64 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/IMSManifestException.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9fc998daa072351bbb64ed9d16a1c571c8136b64 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/ImscpApplicationException.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9fc998daa072351bbb64ed9d16a1c571c8136b64 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/OrganizationXMLDef.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9fc998daa072351bbb64ed9d16a1c571c8136b64 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/ims/SimpleContentPackageConverter.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml
===================================================================
diff -u -ra93929c9c7f7f0df676412691f2f8f9d44d201a2 -r9fc998daa072351bbb64ed9d16a1c571c8136b64
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml	(.../peerreviewApplicationContext.xml)	(revision a93929c9c7f7f0df676412691f2f8f9d44d201a2)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml	(.../peerreviewApplicationContext.xml)	(revision 9fc998daa072351bbb64ed9d16a1c571c8136b64)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-    "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
-
-	<bean id="peerreviewMessageService" class="org.lamsfoundation.lams.util.MessageService" >
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+           				   
+    <bean id="peerreviewMessageService" class="org.lamsfoundation.lams.util.MessageService" >
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.peerreview.ApplicationResources</value></property>
@@ -38,16 +39,16 @@
 	
     <bean id="peerreviewManagerTarget" class="org.lamsfoundation.lams.tool.peerreview.service.PeerreviewServiceImpl">
         <property name="peerreviewDao">
-            <ref local="peerreviewDao"/>
+            <ref bean="peerreviewDao"/>
         </property>
         <property name="peerreviewUserDao">
-            <ref local="peerreviewUserDao"/>
+            <ref bean="peerreviewUserDao"/>
         </property>
         <property name="peerreviewSessionDao">
-            <ref local="peerreviewSessionDao"/>
+            <ref bean="peerreviewSessionDao"/>
         </property>
         <property name="peerreviewToolContentHandler">
-            <ref local="peerreviewToolContentHandler"/>
+            <ref bean="peerreviewToolContentHandler"/>
         </property>
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
@@ -68,13 +69,13 @@
 
     <bean id="peerreviewService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="postInterceptors">
+		<property name="preInterceptors">
 			<list>		
 				<ref bean="transactionRetryInterceptor" /> 
 			</list>
 		</property>
 		<property name="target">
-            <ref local="peerreviewManagerTarget"/>
+            <ref bean="peerreviewManagerTarget"/>
         </property>
         <property name="proxyTargetClass">
             <value>false</value>
@@ -99,3 +100,4 @@
         </property>
     </bean>
 </beans>
+
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
===================================================================
diff -u -ra93929c9c7f7f0df676412691f2f8f9d44d201a2 -r9fc998daa072351bbb64ed9d16a1c571c8136b64
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision a93929c9c7f7f0df676412691f2f8f9d44d201a2)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 9fc998daa072351bbb64ed9d16a1c571c8136b64)
@@ -76,7 +76,6 @@
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser;
 import org.lamsfoundation.lams.tool.peerreview.util.PeerreviewToolContentHandler;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
-import org.lamsfoundation.lams.tool.service.LamsToolService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -520,6 +519,23 @@
     }
 
     @Override
+    public boolean isReadOnly(Long toolContentId) {
+	List<PeerreviewSession> list = peerreviewSessionDao.getByContentId(toolContentId);
+	Iterator<PeerreviewSession> iter = list.iterator();
+	while (iter.hasNext()) {
+	    PeerreviewSession session = (PeerreviewSession) iter.next();
+	    if ( peerreviewUserDao.getCountUsersBySession(session.getSessionId(), -1L) == 0) {
+		log.debug("Peer Review isReadOnly called. Returning true. Count of users for session id "+session.getSessionId()+" is "+peerreviewUserDao.getCountUsersBySession(session.getSessionId(), -1L));
+		return true;
+	    } else {
+		log.debug("Peer Review isReadOnly called. Count of users for session id "+session.getSessionId()+" is 0");
+	    }
+	}
+	log.debug("Peer Review isReadOnly called. Returning false.");
+	return false;
+    }
+
+    @Override
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
 	Peerreview peerreview = peerreviewDao.getByContentId(toolContentId);
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -ra93929c9c7f7f0df676412691f2f8f9d44d201a2 -r9fc998daa072351bbb64ed9d16a1c571c8136b64
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision a93929c9c7f7f0df676412691f2f8f9d44d201a2)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 9fc998daa072351bbb64ed9d16a1c571c8136b64)
@@ -220,7 +220,7 @@
 
   	<tag>
 		<name>STRUTS-textarea</name>
-		<tagclass>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tagclass>
+		<tag-class>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tag-class>
 		<body-content>empty</body-content>
 		<attribute>
 			<name>accesskey</name>
Index: lams_tool_preview/web/WEB-INF/web.xml
===================================================================
diff -u -ra93929c9c7f7f0df676412691f2f8f9d44d201a2 -r9fc998daa072351bbb64ed9d16a1c571c8136b64
--- lams_tool_preview/web/WEB-INF/web.xml	(.../web.xml)	(revision a93929c9c7f7f0df676412691f2f8f9d44d201a2)
+++ lams_tool_preview/web/WEB-INF/web.xml	(.../web.xml)	(revision 9fc998daa072351bbb64ed9d16a1c571c8136b64)
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
- <display-name>Peer Review</display-name>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+	version="3.1">
+<display-name>Peer Review</display-name>
 <description>
 	Peer Review tool
 </description>
 <context-param>
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 	<param-value>org.lamsfoundation.lams.tool.peerreview.ApplicationResources</param-value>
 </context-param>
-
-<context-param>
-    <param-name>contextClass</param-name>
-    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</param-value>
-</context-param> 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
 	<param-value>classpath:/org/lamsfoundation/lams/tool/peerreview/dbupdates/autopatchContext.xml</param-value>
@@ -27,22 +24,10 @@
 	<param-value>context.central</param-value>
 </context-param>
 
-<listener>
-	<listener-class>
-		org.springframework.web.context.ContextLoaderListener
-	</listener-class>
-</listener>	
-
-<listener>
-	<listener-class>
-		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
-	</listener-class>
-</listener>
-
 <filter>
 	<filter-name>hibernateFilter</filter-name>
 	<filter-class>
-		org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
+		org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter
 	</filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
@@ -80,45 +65,40 @@
 	<url-pattern>/*</url-pattern>
 </filter-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.
-    -->
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
 
-<servlet>
+	<servlet>
 		<servlet-name>exportPortfolio</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.tool.peerreview.web.servlet.ExportServlet</servlet-class>
-</servlet>
+	</servlet>
 
-<servlet>
-		<servlet-name>completeItem</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.tool.peerreview.web.servlet.CompleteItemServlet</servlet-class>
-</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>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>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>
-
-<servlet>
+	<servlet>
 		<servlet-name>Connector</servlet-name>
 		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
@@ -130,31 +110,31 @@
 			<param-value>false</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
-</servlet>
+	</servlet>
 
-	<!--  The download servlet, reused from the content repository jar -->
+	<!-- The download servlet, reused from the content repository jar -->
 	<servlet>
 		<description>Instructions Download</description>
 		<display-name>Instructions Download</display-name>
 		<servlet-name>download</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
-	    <init-param>
-	      <param-name>toolContentHandlerBeanName</param-name>
-	      <param-value>peerreviewToolContentHandler</param-value>
-	    </init-param>
-	    <load-on-startup>3</load-on-startup>
+		<init-param>
+			<param-name>toolContentHandlerBeanName</param-name>
+			<param-value>forumToolContentHandler</param-value>
+		</init-param>
+		<load-on-startup>3</load-on-startup>
 	</servlet>
 
-  <servlet-mapping>
-	<servlet-name>action</servlet-name>
-    <url-pattern>*.do</url-pattern>
+	<servlet-mapping>
+		<servlet-name>action</servlet-name>
+		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
-	
+
 	<servlet-mapping>
-	    <servlet-name>Connector</servlet-name>
-	    <url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+		<servlet-name>Connector</servlet-name>
+		<url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 	</servlet-mapping>
-	
+
 	<servlet-mapping>
 		<servlet-name>download</servlet-name>
 		<url-pattern>/download/*</url-pattern>
@@ -165,74 +145,93 @@
 		<url-pattern>/exportPortfolio</url-pattern>
 	</servlet-mapping>
 
-	<servlet-mapping>
-	    <servlet-name>completeItem</servlet-name>
-	    <url-pattern>/learning/completeItem</url-pattern>
-	</servlet-mapping>
-	
-  	<jsp-config>
-		<!--  ======================================================== -->	
+	<error-page>
+		<error-code>500</error-code>
+		<location>/error.jsp</location>
+	</error-page>
+	<error-page>
+		<error-code>403</error-code>
+		<location>/403.jsp</location>
+	</error-page>
+	<error-page>
+		<error-code>404</error-code>
+		<location>/404.jsp</location>
+	</error-page>
+
+	<jsp-config>
+
+		<!-- ======================================================== -->
 		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
+		<!-- ======================================================== -->
 		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
+			<taglib-uri>tags-bean</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
 		</taglib>
 		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
+			<taglib-uri>tags-html</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
 		</taglib>
 		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
+			<taglib-uri>tags-logic</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
 		</taglib>
 		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
+			<taglib-uri>tags-tiles</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
 		</taglib>
-				
 		<taglib>
-		    <taglib-uri>tags-bean-el</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
+			<taglib-uri>tags-bean-el</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
 		</taglib>
 		<taglib>
-		    <taglib-uri>tags-html-el</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
+			<taglib-uri>tags-html-el</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
 		</taglib>
 		<taglib>
-		    <taglib-uri>tags-logic-el</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
+			<taglib-uri>tags-logic-el</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
 		</taglib>
 		<taglib>
-		    <taglib-uri>tags-tiles-el</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
+			<taglib-uri>tags-tiles-el</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
 		</taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/jstl/fmt.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/jstl/c.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/jstl/fn.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/jstl/x.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--   Customized Tag Library -->
-		<!--  ======================================================== -->	
+		<!-- ======================================================== -->
+		<!-- JSTL 1.2 Tag Library -->
+		<!-- ======================================================== -->
 		<taglib>
-		   <taglib-uri>tags-lams</taglib-uri>
-		   <taglib-location>/WEB-INF/tlds/lams/lams.tld</taglib-location>
+			<taglib-uri>tags-fmt</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/jstl/fmt.tld</taglib-location>
 		</taglib>
+		<taglib>
+			<taglib-uri>tags-core</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/jstl/c.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>tags-function</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/jstl/fn.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>tags-xml</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/jstl/x.tld</taglib-location>
+		</taglib>
+		<!-- ======================================================== -->
+		<!-- JSTL 1.2 Tag Library: Apache implementation of TLV -->
+		<!-- ======================================================== -->
+		<taglib>
+			<taglib-uri>tags-permittedTaglibs</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/jstl/permittedTaglibs.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>tags-scriptfree</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/jstl/scriptfree.tld</taglib-location>
+		</taglib>
+		<!-- ======================================================== -->
+		<!-- Customized Tag Library -->
+		<!-- ======================================================== -->
+		<taglib>
+			<taglib-uri>tags-lams</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/lams/lams.tld</taglib-location>
+		</taglib>
 
 	</jsp-config>
 
@@ -307,27 +306,14 @@
 		<role-name>SYSADMIN</role-name>
 	</security-role>
 	
-	<!--  Login Configuration -->
-  	<login-config>
-   		<auth-method>FORM</auth-method>
+	<!-- Login Configuration -->
+	<login-config>
+		<auth-method>FORM</auth-method>
 		<realm-name>LAMS</realm-name>
-   		<form-login-config>
-    		<form-login-page>/login.jsp</form-login-page>
-			<form-error-page>/login.jsp?failed=y</form-error-page>    		
-   		</form-login-config>
-   	</login-config>
+		<form-login-config>
+			<form-login-page>/login.jsp</form-login-page>
+			<form-error-page>/login.jsp?failed=y</form-error-page>
+		</form-login-config>
+	</login-config>
    	
-    <error-page>
-        <error-code>500</error-code>
-        <location>/error.jsp</location>
-    </error-page>
-    <error-page>
-        <error-code>403</error-code>
-        <location>/403.jsp</location>
-    </error-page>
-    <error-page>
-        <error-code>404</error-code>
-        <location>/404.jsp</location>
-    </error-page>
-    
-</web-app>
+ </web-app>