Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/Portfolio.java
===================================================================
diff -u -r6bb84208de1efc1e950e197e08aace3fc3abe653 -r9387f17d57210582ca2b47e635e4507e91a7e2ce
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/Portfolio.java	(.../Portfolio.java)	(revision 6bb84208de1efc1e950e197e08aace3fc3abe653)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/Portfolio.java	(.../Portfolio.java)	(revision 9387f17d57210582ca2b47e635e4507e91a7e2ce)
@@ -33,18 +33,12 @@
 public class Portfolio {
 	
 	private Long activityId;
-	private Long toolSessionId;
-	private Long userId;
 	private String activityDescription;
 	private String activityName;
 	private String exportUrl;
-	private String exportContent; //the html content of the export
-	private Long toolContentId;
-	private String mainFileName;
-	private String directoryName; //includes the parent path
+	/* The link to the tool page from the main export page */
 	private String toolLink;
-	
-	
+		
 	/**
 	 * @return Returns the toolLink.
 	 */
@@ -57,29 +51,14 @@
 	public void setToolLink(String toolLink) {
 		this.toolLink = toolLink;
 	}
-	/**
-	 * @return Returns the directoryName.
-	 */
-	public String getDirectoryName() {
-		return directoryName;
-	}
-	/**
-	 * @param directoryName The directoryName to set.
-	 */
-	public void setDirectoryName(String directoryName) {
-		this.directoryName = directoryName;
-	}
+
 	public Portfolio()
 	{
-		this.activityId = null;
-		this.toolSessionId = null;
-		this.userId = null;
+		this.activityId = null;	
 		this.activityDescription = null;
 		this.activityName = null;
 		this.exportUrl = null;
-		this.exportContent = null;
-		this.toolContentId = null;
-		this.mainFileName = null;
+		this.toolLink = null;
 	}
 	
 	
@@ -96,19 +75,8 @@
 	public void setActivityName(String activityName) {
 		this.activityName = activityName;
 	}
+	
 	/**
-	 * @return Returns the content.
-	 */
-	public String getExportContent() {
-		return exportContent;
-	}
-	/**
-	 * @param content The content to set.
-	 */
-	public void setContent(String exportContent) {
-		this.exportContent = exportContent;
-	}
-	/**
 	 * @return Returns the exportUrl.
 	 */
 	public String getExportUrl() {
@@ -120,21 +88,8 @@
 	public void setExportUrl(String exportUrl) {
 		this.exportUrl = exportUrl;
 	}
-	
-	
+		
 	/**
-	 * @return Returns the toolSessionId.
-	 */
-	public Long getToolSessionId() {
-		return toolSessionId;
-	}
-	/**
-	 * @param toolSessionId The toolSessionId to set.
-	 */
-	public void setToolSessionId(Long toolSessionId) {
-		this.toolSessionId = toolSessionId;
-	}
-	/**
 	 * @return Returns the activityId.
 	 */
 	public Long getActivityId() {
@@ -146,25 +101,8 @@
 	public void setActivityId(Long activityId) {
 		this.activityId = activityId;
 	}
+		
 	/**
-	 * @return Returns the userId.
-	 */
-	public Long getUserId() {
-		return userId;
-	}
-	/**
-	 * @param userId The userId to set.
-	 */
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-	/**
-	 * @param exportContent The exportContent to set.
-	 */
-	public void setExportContent(String exportContent) {
-		this.exportContent = exportContent;
-	}
-	/**
 	 * @return Returns the activityDescription.
 	 */
 	public String getActivityDescription() {
@@ -176,30 +114,6 @@
 	public void setActivityDescription(String activityDescription) {
 		this.activityDescription = activityDescription;
 	}
-	/**
-	 * @return Returns the toolContentId.
-	 */
-	public Long getToolContentId() {
-		return toolContentId;
-	}
-	/**
-	 * @param toolContentId The toolContentId to set.
-	 */
-	public void setToolContentId(Long toolContentId) {
-		this.toolContentId = toolContentId;
-	}
-	/**
-	 * @return Returns the mainFileName.
-	 */
-	public String getMainFileName() {
-		return mainFileName;
-	}
-	/**
-	 * @param mainFileName The mainFileName to set.
-	 */
-	public void setMainFileName(String mainFileName) {
-		this.mainFileName = mainFileName;
-	}
 	
 	
 }