Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml,v
diff -u -r1.16 -r1.17
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	18 Jun 2006 04:55:53 -0000	1.16
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	18 Jun 2006 18:05:38 -0000	1.17
@@ -61,7 +61,7 @@
 				<property name="activityDAO"><ref bean="activityDAO"/></property>
 				<property name="learnerService"><ref bean="learnerService"/></property>			
 				<property name="lessonDAO"><ref bean="lessonDAO"/></property>
-				<property name="userDAO"><ref bean="userDAO"/></property>
+				<property name="baseDAO"><ref bean="baseDAO"/></property>
 				<property name="messageService"><ref bean="learningMessageService"/></property>
 			</bean>
 		</property>
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java,v
diff -u -r1.18 -r1.19
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java	18 Jun 2006 04:55:52 -0000	1.18
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java	18 Jun 2006 18:10:27 -0000	1.19
@@ -36,9 +36,9 @@
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.learning.export.ActivityPortfolio;
 import org.lamsfoundation.lams.learning.export.ExportPortfolioConstants;
 import org.lamsfoundation.lams.learning.export.ExportPortfolioException;
@@ -52,16 +52,13 @@
 import org.lamsfoundation.lams.tool.exception.LamsToolServiceException;
 import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.usermanagement.User;
-import org.lamsfoundation.lams.usermanagement.dao.IUserDAO;
-import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.FileUtilException;
 import org.lamsfoundation.lams.util.HttpUrlConnectionUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtil;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
-import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
 
@@ -83,8 +80,8 @@
     
 	private ILamsCoreToolService lamsCoreToolService;
 	private IActivityDAO activityDAO;
-	private IUserDAO userDAO;
     private ILearnerService learnerService;
+    private IBaseDAO baseDAO;
     private ILessonDAO lessonDAO;
     protected MessageService messageService;
     
@@ -110,20 +107,17 @@
         this.lessonDAO = lessonDAO;
     }
     
+	public void setBaseDAO(IBaseDAO baseDAO) {
+		this.baseDAO = baseDAO;
+	}
+
 	/**
 	 * @param lamsCoreToolService The lamsCoreToolService to set.
 	 */
 	public void setLamsCoreToolService(ILamsCoreToolService lamsCoreToolService) {
 		this.lamsCoreToolService = lamsCoreToolService;
 	}
 
-	/**
-     * @param userDAO The userDAO to set.
-     */
-    public void setUserDAO(IUserDAO userDAO) {
-        this.userDAO = userDAO;
-    }
-		
 	public void setMessageService(MessageService messageService) {
 		this.messageService = messageService;
 	}
@@ -178,7 +172,7 @@
 		ArrayList<ActivityPortfolio> portfolios = null;
 	    Portfolio exports = null;
 		
-	    User learner = userDAO.getUserById(userId);
+	    User learner = (User)baseDAO.find(User.class,userId);
 	    Lesson lesson = lessonDAO.getLesson(lessonID);
 	
 	    if (learner != null && lesson != null)