Index: lams_tool_lamc/build.xml
===================================================================
diff -u -r74e45f782571e1740f0a8cfa54b91d39e8df80b3 -rca5b61179fb4a48b6d02a869fdcd515f0335ea3c
--- lams_tool_lamc/build.xml	(.../build.xml)	(revision 74e45f782571e1740f0a8cfa54b91d39e8df80b3)
+++ lams_tool_lamc/build.xml	(.../build.xml)	(revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c)
@@ -417,8 +417,8 @@
 					<formatter type="xml"/>
 					<batchtest todir="${build.report}">
 						<fileset dir="${src.test.dir}">
-							<include name="**/TestMcContent.java"/>
-
+						<!-- <include name="**/TestMcContent.java"/> -->
+							<include name="**/TestMcSession.java"/> 
 						</fileset>
 					</batchtest>
 					<classpath>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.java
===================================================================
diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -rca5b61179fb4a48b6d02a869fdcd515f0335ea3c
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.java	(.../McSession.java)	(revision 48c973dcec3754f35dce1f2468a5739067b47179)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.java	(.../McSession.java)	(revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c)
@@ -2,7 +2,9 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Set;
+
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 
@@ -34,16 +36,16 @@
     private Set mcQueUsers;
 
     /** full constructor */
-    public McSession(Long mcSessionId, Date session_start_date, Date session_end_date, String session_status, Long mcContentId, org.lamsfoundation.lams.tool.mc.McContent mcContent, Set mcQueUsers) {
+    public McSession(Long mcSessionId, Date session_start_date, Date session_end_date, String session_status, org.lamsfoundation.lams.tool.mc.McContent mcContent, Set mcQueUsers) {
         this.mcSessionId = mcSessionId;
         this.session_start_date = session_start_date;
         this.session_end_date = session_end_date;
         this.session_status = session_status;
-        this.mcContentId = mcContentId;
         this.mcContent = mcContent;
         this.mcQueUsers = mcQueUsers;
     }
-
+    
+    
     /** default constructor */
     public McSession() {
     }
@@ -111,6 +113,8 @@
     }
 
     public Set getMcQueUsers() {
+        if (this.mcQueUsers == null)
+            setMcQueUsers(new HashSet());
         return this.mcQueUsers;
     }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java
===================================================================
diff -u -rd19e9cf6efc92b212a276892cdbbc718518037da -rca5b61179fb4a48b6d02a869fdcd515f0335ea3c
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java	(.../McContentDAO.java)	(revision d19e9cf6efc92b212a276892cdbbc718518037da)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java	(.../McContentDAO.java)	(revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c)
@@ -115,7 +115,7 @@
 	 public void removeMcById(Long mcContentId)
 	    {
 	        String query = "from mc in class org.lamsfoundation.lams.tool.mc.McContent"
-	        + " where qa.mcContentId = ?";
+	        + " where mc.mcContentId = ?";
 	        this.getHibernateTemplate().delete(query,mcContentId,Hibernate.LONG);
 	    }
 	
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java
===================================================================
diff -u -r899f826e2aff2a1a624a0c4a212a284660fe4a60 -rca5b61179fb4a48b6d02a869fdcd515f0335ea3c
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java	(.../McDataAccessTestCase.java)	(revision 899f826e2aff2a1a624a0c4a212a284660fe4a60)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java	(.../McDataAccessTestCase.java)	(revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c)
@@ -13,20 +13,14 @@
 public class McDataAccessTestCase extends AbstractLamsTestCase
 {
 	//These both refer to the same entry in the db.
-	protected final long TEST_EXISTING_CONTENT_ID = 10;
-	protected final long DEFAULT_CONTENT_ID = 10;
-	 
-	protected final long TEST_NEW_CONTENT_ID = 11;
+	protected final Long DEFAULT_CONTENT_ID = new Long(10);
+	protected final Long TEST_CONTENT_ID = new Long(2);
+	protected final Long TEST_CONTENT_ID_OTHER = new Long(3);
 	
-	protected final long TEST_EXISTING_SESSION_ID = 101;
-	protected final long TEST_NEW_SESSION_ID = 102;
+	protected final Long TEST_SESSION_ID = new Long(20);
+	protected final Long TEST_SESSION_ID_OTHER = new Long(21);
 	
-	protected final long TEST_NEW_USER_ID = 700;
-	protected final long TEST_EXISTING_QUE_CONTENT_ID = 20;
-	protected final long TEST_NEW_QUE_CONTENT_ID = 23;
 	
-	protected final long TEST_NONEXISTING_CONTENT_ID=2475733396382404l;
-	
     protected final long ONE_DAY = 60 * 60 * 1000 * 24;
     
     public final String NOT_ATTEMPTED = "NOT_ATTEMPTED";
@@ -75,5 +69,9 @@
     	super.tearDown();
     }
     
+    public void testDummy()
+    {    
+    	System.out.println("dummy McDataAccessTestCase");
+    }
 
 }
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java
===================================================================
diff -u -r44ebdc79af2b77d9f5ae22774c552279633f866a -rca5b61179fb4a48b6d02a869fdcd515f0335ea3c
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java	(.../TestMcContent.java)	(revision 44ebdc79af2b77d9f5ae22774c552279633f866a)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java	(.../TestMcContent.java)	(revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c)
@@ -49,7 +49,7 @@
     {
     	//create new mc content
     	McContent mc = new McContent();
-		mc.setMcContentId(new Long(4));
+		mc.setMcContentId(TEST_CONTENT_ID);
 		mc.setTitle("New - Put Title Here");
 		mc.setInstructions("New - Put instructions here.");
 		mc.setQuestionsSequenced(false);
@@ -72,6 +72,66 @@
 	    mc.setMcSessions(new TreeSet());
 	    
 	    mcContentDAO.saveMcContent(mc);
+	    assertNotNull(mc);
    }
     
+   /* 
+    public void testCreateNewMcContentOther()
+    {
+    	//create new mc content
+    	McContent mc = new McContent();
+		mc.setMcContentId(TEST_CONTENT_ID_OTHER);
+		mc.setTitle("Other - Put Title Here");
+		mc.setInstructions("Other - Put instructions here.");
+		mc.setQuestionsSequenced(false);
+		mc.setUsernameVisible(false);
+		mc.setCreatedBy(0);
+		mc.setMonitoringReportTitle("Other-Monitoring Report title");
+		mc.setReportTitle("Other-Report title");
+		mc.setRunOffline(false);
+	    mc.setDefineLater(false);
+	    mc.setSynchInMonitor(false);
+	    mc.setOnlineInstructions("Other- online instructions");
+	    mc.setOfflineInstructions("Other- offline instructions");
+	    mc.setEndLearningMessage("Other- endLearningMessage");
+	    mc.setContentInUse(false);
+	    mc.setRetries(false);
+	    mc.setShowFeedback(false);
+	    mc.setShowTopUsers(false);
+		
+	    mc.setMcQueContents(new TreeSet());
+	    mc.setMcSessions(new TreeSet());
+	    
+	    mcContentDAO.saveMcContent(mc);
+	    assertNotNull(mc);
+   } 
+    
+    
+    public void testRetrieveMcContent()
+    {
+    	McContent mcContent = mcContentDAO.findMcContentById(TEST_CONTENT_ID);
+    	assertNotNull(mcContent);
+    	assertEquals(mcContent.getMcContentId(), new Long(2));
+    }
+ 
+    public void testRemoveMcContent()
+    {
+    	McContent mcContent = mcContentDAO.findMcContentById(TEST_CONTENT_ID);
+    	mcContentDAO.removeMc(mcContent);
+    	assertNull(mcContent);
+    }
+    
+
+    public void testRemoveMcContentById()
+    {
+    	mcContentDAO.removeMc(TEST_CONTENT_ID_OTHER);
+    }
+
+    
+    public void testRemoveMcContentByIdExplicit()
+    {
+    	mcContentDAO.removeMcById(TEST_CONTENT_ID);
+    }
+    
+    */
 }
\ No newline at end of file
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java
===================================================================
diff -u
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java	(revision 0)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java	(revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c)
@@ -0,0 +1,66 @@
+/* ********************************************************************************
+ *  Copyright Notice
+ *  =================
+ * This file contains propriety information of LAMS Foundation. 
+ * Copying or reproduction with prior written permission is prohibited.
+ * Copyright (c) 2004 
+ * Created on 2004-12-23
+ ******************************************************************************** */
+
+package org.lamsfoundation.lams.tool.mc;
+
+import java.util.Date;
+import java.util.HashSet;
+
+import org.lamsfoundation.lams.tool.service.ILamsToolService;
+
+
+
+/*
+ * 
+ * @author ozgurd
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+
+
+public class TestMcSession extends McDataAccessTestCase
+{
+	public org.lamsfoundation.lams.tool.dao.IToolDAO toolDAO;
+	public ILamsToolService lamsToolService;
+	
+	protected void setUp() throws Exception
+    {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    public TestMcSession(String name)
+    {
+        super(name);
+    }
+    
+  
+    public void testCreateNewMcSession()
+    {    
+	    McContent mcContent = mcContentDAO.findMcContentById(TEST_CONTENT_ID);
+	    
+	 
+	    McSession mcSession = new McSession(TEST_SESSION_ID_OTHER,
+                                   new Date(System.currentTimeMillis()),
+                                   new Date(System.currentTimeMillis()+ ONE_DAY),
+                                   this.NOT_ATTEMPTED, 
+                                   mcContent,
+                                   new HashSet());
+
+    
+	    mcSessionDAO.saveMcSession(mcSession);
+	    assertEquals(mcSession.getMcSessionId(),new Long(21));
+    }
+    
+}
\ No newline at end of file
Index: lams_tool_lamc/test/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -r653f0f0eff40af5e6891c22ef2b8efe9bf2f75af -rca5b61179fb4a48b6d02a869fdcd515f0335ea3c
--- lams_tool_lamc/test/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 653f0f0eff40af5e6891c22ef2b8efe9bf2f75af)
+++ lams_tool_lamc/test/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE tiles-definitions PUBLIC
+   "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+   "http://jakarta.apache.org/struts/dtds/tiles-config.dtd">
+ 
 <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
Index: lams_tool_lamc/test/web/WEB-INF/web.xml
===================================================================
diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -rca5b61179fb4a48b6d02a869fdcd515f0335ea3c
--- lams_tool_lamc/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 48c973dcec3754f35dce1f2468a5739067b47179)
+++ lams_tool_lamc/test/web/WEB-INF/web.xml	(.../web.xml)	(revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c)
@@ -24,7 +24,42 @@
 			org.springframework.web.context.ContextLoaderListener
 		</listener-class>
 	</listener>	
+<!-- 	
+	<filter>
+    <filter-name>contentFilter</filter-name>
+    <filter-class>org.lamsfoundation.lams.web.filter.ResponseCaptureFilter</filter-class>
+	</filter>
 
+	<filter-mapping>
+	    <filter-name>contentFilter</filter-name>
+	    <url-pattern>/portfolioExport</url-pattern>
+	</filter-mapping> -->
+   <!-- System session filter -->
+   <filter>
+       <filter-name>SystemSessionFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.session.SystemSessionFilter
+         </filter-class>
+     </filter>
+
+    <filter-mapping>
+ 	   <filter-name>SystemSessionFilter</filter-name>
+    	 <url-pattern>/*</url-pattern>
+   </filter-mapping>	
+   
+   <!--  Servlet defination -->
+	<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>exportPortfolio</servlet-name>
+		<url-pattern>/portfolioExport</url-pattern>
+  	</servlet-mapping>
+
     <!--
     To use non XDoclet filters, create a filters.xml file that
     contains the additional filters (eg Sitemesh) and place it in your