Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -reca9ea46fefb353002e27446469b7c406e9fa621 -r6582f99968f17e3e54b6f83230f6fe0b67b019e6
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision eca9ea46fefb353002e27446469b7c406e9fa621)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 6582f99968f17e3e54b6f83230f6fe0b67b019e6)
@@ -3,11 +3,11 @@
 <!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 >
+ <context-param>
+  	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+  	<param-value>org.lamsfoundation.lams.tool.qa.web.QaResources</param-value>
+</context-param>
 	<context-param>
-	  	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-	  	<param-value>org.lamsfoundation.lams.tool.qa.QaResources</param-value>
-	</context-param>
-	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
 			classpath:/org/lamsfoundation/lams/applicationContext.xml
@@ -18,14 +18,12 @@
 			classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
 		</param-value>
 	</context-param>
-
 	<listener>
 		<listener-class>
 			org.springframework.web.context.ContextLoaderListener
 		</listener-class>
 	</listener>	
 
-
     <filter>
     <filter-name>hibernateFilter</filter-name>
     <filter-class>
@@ -45,16 +43,14 @@
      </filter>
 
     <filter-mapping>
-    <filter-name>hibernateFilter</filter-name>
-     <url-pattern>*.do</url-pattern>
-  </filter-mapping>
+	    <filter-name>hibernateFilter</filter-name>
+    	 <url-pattern>/*</url-pattern>
+  	</filter-mapping>
     <filter-mapping>
-    <filter-name>SystemSessionFilter</filter-name>
-     <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    	<filter-name>SystemSessionFilter</filter-name>
+     	<url-pattern>/*</url-pattern>
+	 </filter-mapping>
 
-
-
 	<servlet>
 		<servlet-name>context</servlet-name>
 		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
@@ -81,7 +77,8 @@
 	    </init-param>
 	    <load-on-startup>2</load-on-startup>
     </servlet>
-    
+   
+ <!--    
     <servlet>
             <servlet-name>Connector</servlet-name>
             <servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
@@ -95,7 +92,9 @@
             </init-param>
             <load-on-startup>1</load-on-startup>
 	</servlet>
-	
+-->
+
+<!--  The download servlet, reused from the content repository jar -->
 	<servlet>
 		<servlet-name>download</servlet-name>
 		<display-name>Instructions Download</display-name>
@@ -107,81 +106,145 @@
 	    </init-param>
 	    <load-on-startup>3</load-on-startup>
 	</servlet>
-
-  	<servlet-mapping>
+	
+	<servlet>
+		<servlet-name>exportPortfolio</servlet-name>
+		<display-name>Export Portfolio</display-name>
+		<description>Export Portfolio</description>		
+		<servlet-class>org.lamsfoundation.lams.tool.qa.web.QaExportServlet</servlet-class>
+	</servlet>
+	
+	<servlet-mapping>
 		<servlet-name>action</servlet-name>
 	   	<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
-  	<servlet-mapping>
-	        <servlet-name>Connector</servlet-name>
-             <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
-	</servlet-mapping>   
-	
 	<servlet-mapping>
 		<servlet-name>download</servlet-name>
 		<url-pattern>/download/*</url-pattern>
-  	</servlet-mapping>          
+  	</servlet-mapping>
+
+  	<servlet-mapping>
+		<servlet-name>exportPortfolio</servlet-name>
+		<url-pattern>/portfolioExport</url-pattern>
+  	</servlet-mapping>
+  	
+
+<!--
+  	<servlet-mapping>
+	        <servlet-name>Connector</servlet-name>
+             <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	</servlet-mapping>             
+-->
               	
 
    <session-config>
       <session-timeout>120</session-timeout>
    </session-config>
    
      <error-page>
-	<error-code>403</error-code>
-	<location>/403.html</location>
-</error-page>
+		<error-code>403</error-code>
+		<location>/403.html</location>
+	</error-page>
 
-	<taglib>
-	   <taglib-uri>tags-lams</taglib-uri>
-	   <taglib-location>/WEB-INF/lams.tld</taglib-location>
-	</taglib>
-   
-   <taglib>
-    <taglib-uri>fck-editor</taglib-uri>
-    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-  </taglib>
+<!--  ======================================================== -->	
+<!-- Struts Tag Library Descriptors -->
+<!--  ======================================================== -->	
+<taglib>
+    <taglib-uri>tags-bean</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
+</taglib>
 
-   <!--
-   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:
+<taglib>
+    <taglib-uri>tags-html</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
+</taglib>
 
-   <!ELEMENT mime-mapping (extension, mime-type)>
-   -->
+<taglib>
+    <taglib-uri>tags-logic</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
+</taglib>
 
-   <!--
-   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:
+<taglib>
+    <taglib-uri>tags-tiles</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
+</taglib>
 
-   <!ELEMENT error-page ((error-code | exception-type), location)>
-   -->
+<taglib>
+    <taglib-uri>tags-bean-el</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-bean-el.tld</taglib-location>
+</taglib>
 
-  <!--
-  To add taglibs by xml, create a file called taglibs.xml and place it
-  in your merge dir.
-  -->
+<taglib>
+    <taglib-uri>tags-html-el</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-html-el.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:
+<taglib>
+    <taglib-uri>tags-logic-el</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-logic-el.tld</taglib-location>
+</taglib>
 
-   <!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)>
+<taglib>
+    <taglib-uri>tags-tiles-el</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-tiles-el.tld</taglib-location>
+</taglib>
 
-   <!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)>
-   -->
-   
+
+<!--  ======================================================== -->	
+<!--  JSTL Tag Library -->
+<!--  ======================================================== -->	
+  <taglib>
+    <taglib-uri>tags-fmt</taglib-uri>
+    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>tags-fmt-rt</taglib-uri>
+    <taglib-location>/WEB-INF/jstl/tlds/fmt-rt.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>tags-c</taglib-uri>
+    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>tags-core-rt</taglib-uri>
+    <taglib-location>/WEB-INF/jstl/tlds/c-rt.tld</taglib-location>
+  </taglib>
+  
+  
+  
+	<!--  ======================================================== -->	
+	<!--   LAMS Tag Library -->
+	<!--  ======================================================== -->	
+	<taglib>
+	   <taglib-uri>tags-lams</taglib-uri>
+	   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+	
+	<taglib>
+	    <taglib-uri>tags-fck-editor</taglib-uri>
+	    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
+	</taglib>
+
+  	<!--  Security Constraint -->
+	<security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
+			<url-pattern>/*</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>LEARNER</role-name>
+    		<role-name>TEACHER</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
+
    <!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
@@ -236,6 +299,7 @@
     	</auth-constraint>
     </security-constraint>
 
+
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>
@@ -244,6 +308,5 @@
     		<form-login-page>/login.jsp</form-login-page>
    		</form-login-config>
    	</login-config>
-   
 
 </web-app>