Index: lams_tool_sbmt/conf/xdoclet/filter-mappings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/filter-mappings.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/conf/xdoclet/filter-mappings.xml	27 Sep 2005 01:23:45 -0000	1.2
+++ lams_tool_sbmt/conf/xdoclet/filter-mappings.xml	7 Dec 2005 05:52:32 -0000	1.3
@@ -1,6 +1,6 @@
   <filter-mapping>
     <filter-name>hibernateFilter</filter-name>
-     <url-pattern>*.do</url-pattern>
+     <url-pattern>/*</url-pattern>
   </filter-mapping>
     <filter-mapping>
     <filter-name>SystemSessionFilter</filter-name>
Index: lams_tool_sbmt/conf/xdoclet/servlet-mappings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/servlet-mappings.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/conf/xdoclet/servlet-mappings.xml	1 Aug 2005 01:27:28 -0000	1.3
+++ lams_tool_sbmt/conf/xdoclet/servlet-mappings.xml	7 Dec 2005 05:52:32 -0000	1.4
@@ -9,8 +9,13 @@
 </servlet-mapping>
 
 	
-	<servlet-mapping>
-		<servlet-name>download</servlet-name>
-		<url-pattern>/download/*</url-pattern>
-  	</servlet-mapping>
+<servlet-mapping>
+	<servlet-name>download</servlet-name>
+	<url-pattern>/download/*</url-pattern>
+</servlet-mapping>
+
+<servlet-mapping>
+	<servlet-name>exportPortfolio</servlet-name>
+	<url-pattern>/exportPortfolio</url-pattern>
+</servlet-mapping>
     
\ No newline at end of file
Index: lams_tool_sbmt/conf/xdoclet/servlets.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/servlets.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/conf/xdoclet/servlets.xml	21 Nov 2005 23:17:27 -0000	1.4
+++ lams_tool_sbmt/conf/xdoclet/servlets.xml	7 Dec 2005 05:52:32 -0000	1.5
@@ -27,6 +27,11 @@
 </servlet>
 
 <servlet>
+		<servlet-name>exportPortfolio</servlet-name>
+		<servlet-class>org.lamsfoundation.lams.tool.sbmt.web.ExportServlet</servlet-class>
+</servlet>
+
+<servlet>
 		<servlet-name>Connector</servlet-name>
 		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
Index: lams_tool_sbmt/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/tool_insert.sql,v
diff -u -r1.8 -r1.9
--- lams_tool_sbmt/db/sql/tool_insert.sql	17 Nov 2005 06:27:15 -0000	1.8
+++ lams_tool_sbmt/db/sql/tool_insert.sql	7 Dec 2005 05:52:32 -0000	1.9
@@ -46,10 +46,10 @@
 'tool/lasbmt11/learner.do',
 'tool/lasbmt11/authoring.do',
 'tool/lasbmt11/definelater.do',
-'tool/lasbmt11/export.do',
+'tool/lasbmt11/exportPortfolio',
 'tool/lasbmt11/monitoring.do',
-'tool/lasbmt11/monitoring.do',
-'tool/lasbmt11/monitoring.do',
+'tool/lasbmt11/contribute.do',
+'tool/lasbmt11/moderation.do',
 NOW()
 );
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java	7 Dec 2005 05:52:32 -0000	1.1
@@ -0,0 +1,128 @@
+/*
+ *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ *
+ *This program is free software; you can redistribute it and/or modify
+ *it under the terms of the GNU General Public License as published by
+ *the Free Software Foundation; either version 2 of the License, or
+ *(at your option) any later version.
+ *
+ *This program is distributed in the hope that it will be useful,
+ *but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *GNU General Public License for more details.
+ *
+ *You should have received a copy of the GNU General Public License
+ *along with this program; if not, write to the Free Software
+ *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *USA
+ *
+ *http://www.gnu.org/licenses/gpl.txt
+ */
+package org.lamsfoundation.lams.tool.sbmt.web;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.sbmt.Learner;
+import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
+import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
+import org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException;
+import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
+import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
+import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
+
+public class ExportServlet  extends AbstractExportPortfolioServlet {
+	private static final long serialVersionUID = -4529093489007108143L;
+	private static Logger logger = Logger.getLogger(ExportServlet.class);
+	private final String FILENAME = "sbmt_main.html";
+	
+	
+	public String doExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
+	{
+		if (StringUtils.equals(mode,ToolAccessMode.LEARNER.toString())){
+			learner(request,response,directoryName,cookies);
+		}else if (StringUtils.equals(mode,ToolAccessMode.TEACHER.toString())){
+			teacher(request,response,directoryName,cookies);
+		}
+		
+		String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath();
+		writeResponseToFile(basePath+"/export/exportportfolio.jsp",directoryName,FILENAME,cookies);
+		
+		return FILENAME;
+	}
+    public void learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
+    {
+        
+        ISubmitFilesService sbmtService = SubmitFilesServiceProxy.getSubmitFilesService(getServletContext());
+        
+        if (userID == null || toolSessionID == null)
+        {
+            String error = "Tool session Id or user Id is null. Unable to continue";
+            logger.error(error);
+            throw new SubmitFilesException(error);
+        }
+        
+        Learner learner = sbmtService.getLearner(toolSessionID,userID);
+        
+        if (learner == null)
+        {
+            String error="The user with user id " + userID + " does not exist in this session or session may not exist.";
+            logger.error(error);
+            throw new SubmitFilesException(error);
+        }
+        
+       SubmitFilesContent content = sbmtService.getSubmitFilesContent(toolSessionID);
+        
+        if (content == null)
+        {
+            String error="The content for this activity has not been defined yet.";
+            logger.error(error);
+            throw new SubmitFilesException(error);
+        }
+       
+    }
+    
+    public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
+    {
+    	ISubmitFilesService sbmtService = SubmitFilesServiceProxy.getSubmitFilesService(getServletContext());
+       
+        //check if toolContentId exists in db or not
+        if (toolContentID==null)
+        {
+            String error="Tool Content Id is missing. Unable to continue";
+            logger.error(error);
+            throw new SubmitFilesException(error);
+        }
+
+        SubmitFilesContent content = sbmtService.getSubmitFilesContent(toolContentID);
+        
+        if (content == null)
+        {
+            String error="Data is missing from the database. Unable to Continue";
+            logger.error(error);
+            throw new SubmitFilesException(error);
+        }
+		//return FileDetailsDTO list according to the given sessionID
+        Set sessionList = content.getToolSession();
+        Iterator iter = sessionList.iterator();
+        Map userFilesMap = new HashMap();
+        while(iter.hasNext()){
+        	SubmitFilesSession session = (SubmitFilesSession) iter.next();
+        	userFilesMap.putAll(sbmtService.getFilesUploadedBySession(session.getSessionID()));
+        }
+		request.getSession().setAttribute("report",userFilesMap);
+		
+
+  
+    }
+
+}
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/Attic/web.xml,v
diff -u -r1.10 -r1.11
--- lams_tool_sbmt/web/WEB-INF/web.xml	21 Nov 2005 23:17:27 -0000	1.10
+++ lams_tool_sbmt/web/WEB-INF/web.xml	7 Dec 2005 05:52:32 -0000	1.11
@@ -43,7 +43,7 @@
 
     <filter-mapping>
     <filter-name>hibernateFilter</filter-name>
-     <url-pattern>*.do</url-pattern>
+     <url-pattern>/*</url-pattern>
   </filter-mapping>
     <filter-mapping>
     <filter-name>SystemSessionFilter</filter-name>
@@ -85,6 +85,11 @@
 </servlet>
 
 <servlet>
+		<servlet-name>exportPortfolio</servlet-name>
+		<servlet-class>org.lamsfoundation.lams.tool.sbmt.web.ExportServlet</servlet-class>
+</servlet>
+
+<servlet>
 		<servlet-name>Connector</servlet-name>
 		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
@@ -121,11 +126,16 @@
     <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-name>download</servlet-name>
+	<url-pattern>/download/*</url-pattern>
+</servlet-mapping>
 
+<servlet-mapping>
+	<servlet-name>exportPortfolio</servlet-name>
+	<url-pattern>/exportPortfolio</url-pattern>
+</servlet-mapping>
+
    <session-config>
       <session-timeout>120</session-timeout>
    </session-config>
Index: lams_tool_sbmt/web/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/export/exportportfolio.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/export/exportportfolio.jsp	7 Dec 2005 05:52:32 -0000	1.1
@@ -0,0 +1,96 @@
+<%@include file="../sharing/share.jsp" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+  <head>    
+    <title>All Learner Submission Details</title>
+    <html:base/>
+  	<link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
+	<script type="text/javascript" src="<%=LAMS_WEB_ROOT%>/includes/javascript/common.js"></script>
+  	
+  </head>  
+  <body>
+
+		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+		<c:forEach items="${report}"  var ="user" >		
+			<c:set var="filesUploaded" value="${user.value}"/>
+			<c:set var="first" value="true"/>
+			<c:forEach items="${filesUploaded}"  var ="details" >			
+				<span><p>			
+					<c:if test="${first}">
+						<c:set var="first" value="false"/>
+					    <tr>
+					    	<td colspan="2">
+					    	<c:out value="${details.userDTO.firstName}"/> <c:out value="${details.userDTO.lastName}"/>,
+					    	<c:out value="${details.userDTO.login}"/>, provides following submisstion:
+					    	</td>
+					    <tr>
+				    </c:if>
+				<tr>
+					<td>File Path: </td>
+						<td>
+						File Path: </td><td><c:out value="${details.filePath}" /> 
+						<c:set var="viewURL">
+							<html:rewrite page="/download/?uuid=${details.uuID}&versionID=${details.versionID}&preferDownload=false"/>
+						</c:set>
+						<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="label.view"/>
+						</a>&nbsp;
+						<c:set var="downloadURL">
+							<html:rewrite page="/download/?uuid=${details.uuID}&versionID=${details.versionID}&preferDownload=true"/>
+						</c:set>
+						<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="label.download"/>
+						</a>
+						</td>					
+					
+				</tr>
+				<tr>
+					<td>File Description: </td><td><c:out value="${details.fileDescription}"  escapeXml="false"/></td>
+				</tr>
+				<tr>
+					<td>Date of Submission: </td><td><c:out value="${details.dateOfSubmission}" /></td>
+				</tr>
+				<tr>
+					<td>Marks:</td>
+					<td> 		<c:choose>
+										<c:when test="${empty details.marks}">
+											<c:out value="Not Available"/>
+										</c:when>
+										<c:otherwise>
+											<c:out value="${details.marks}" escapeXml="false"/>
+										</c:otherwise>
+									</c:choose>
+					</td>
+				</tr>			
+				<tr>
+					<td>Comments:</td>
+					<td>
+									<c:choose>
+										<c:when test="${empty details.comments}">
+											<c:out value="Not Available"/>								
+										</c:when>
+										<c:otherwise>
+											<c:out value="${details.comments}" escapeXml="false"/>
+										</c:otherwise>
+									</c:choose>
+					</td>
+				</tr>
+		
+				<tr>
+					<td colspan="2">
+					<form action="<html:rewrite page='/monitoring.do?method=markFile'/>" method="post">
+							<input type="hidden" name="detailID" value=<c:out value='${details.submissionID}' /> >
+							<input type="hidden" name="reportID" value=<c:out value='${details.reportID}' /> >
+							<input type="hidden" name="userID" value=<c:out value='${details.userID}' /> >
+							<input type="hidden" name="toolSessionID" value=<c:out value='${toolSessionID}' /> >
+							<input type="submit" value="Update Marks"/>
+					</form>
+					</td>
+				</tr>
+				</span>
+			</c:forEach>
+		</c:forEach>
+		</table>						
+  </body>
+</html:html>
+