Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java,v
diff -u -r1.41 -r1.42
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	8 Mar 2006 12:02:14 -0000	1.41
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	27 Mar 2006 03:28:16 -0000	1.42
@@ -91,6 +91,15 @@
 	public static final int GROUPING_SUPPORT_REQUIRED = 3;
 	/******************************************************************/
 	
+	
+	/** 
+	 * Entries for an activity in a language property file 
+	 */
+	public static final String I8N_TITLE = "activity.title";
+	public static final String I8N_DESCRIPTION = "activity.description";
+	public static final String I8N_HELP_TEXT = "activity.helptext";
+
+	
     //---------------------------------------------------------------------
     // Instance variables
     //---------------------------------------------------------------------
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java,v
diff -u -r1.7 -r1.8
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java	21 Nov 2005 05:21:46 -0000	1.7
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java	27 Mar 2006 03:28:16 -0000	1.8
@@ -22,6 +22,8 @@
  */
 package org.lamsfoundation.lams.learningdesign.dto;
 
+import java.util.Date;
+
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.GateActivity;
 import org.lamsfoundation.lams.learningdesign.Grouping;
@@ -33,13 +35,7 @@
 import org.lamsfoundation.lams.learningdesign.SequenceActivity;
 import org.lamsfoundation.lams.learningdesign.SynchGateActivity;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
-import org.lamsfoundation.lams.learningdesign.dto.GroupingDTO;
-import org.lamsfoundation.lams.tool.dto.AuthoringToolDTO;
 import org.lamsfoundation.lams.tool.Tool;
-import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Set;
 
 public class LibraryActivityDTO extends BaseDTO
 {
@@ -66,11 +62,15 @@
 	private Boolean defineLater;
 	private Date createDateTime;
 	private Integer groupingSupportType;
+	/** Name of the file (including the package) that contains the text strings for
+	 * this activity. e.g. org.lamsfoundation.lams.tool.sbmt.SbmtResources.properties. */
+	private String languageFile;
 	
 	/* Properties Specific to ToolActivity */
 	private Long toolID;
 	private Long toolContentID;
-	private String toolDisplayName;	
+	private String toolDisplayName;
+	private String toolLanguageFile;
 	private Boolean supportsDefineLater;
 	private Boolean supportsRunOffline;
 	private Boolean supportsModeration;
@@ -119,6 +119,7 @@
 	    this.defineLater = activity.getDefineLater();
 	    this.createDateTime = activity.getCreateDateTime();
 	    this.groupingSupportType = activity.getGroupingSupportType();
+	    this.languageFile = activity.getLanguageFile();
 	    processActivityType(activity);
 	    
 	}
@@ -144,8 +145,8 @@
 		
 	}
 	private void addGroupingActivityAttributes(GroupingActivity groupingActivity){
-		Grouping grouping = groupingActivity.getCreateGrouping();		
-	/*	this.groupingDTO = grouping.getGroupingDTO();
+		/*	Grouping grouping = groupingActivity.getCreateGrouping();		
+		this.groupingDTO = grouping.getGroupingDTO();
 		this.createGroupingID = grouping.getGroupingId();
 		this.createGroupingUIID = grouping.getGroupingUIID();
 		this.groupingType = grouping.getGroupingTypeId(); */
@@ -167,6 +168,7 @@
 	        this.toolID = tool.getToolId();
 			this.toolContentID = new Long(tool.getDefaultToolContentId());
 			this.toolDisplayName = tool.getToolDisplayName();
+			this.toolLanguageFile = tool.getLanguageFile();
 			this.supportsDefineLater = new Boolean(tool.getSupportsDefineLater());
 			this.supportsRunOffline = new Boolean(tool.getSupportsRunOffline());
 			this.supportsModeration = new Boolean(tool.getSupportsModeration());
@@ -442,4 +444,40 @@
     public String getOptionsInstructions() {
         return optionsInstructions;
     }
-}
+
+    /**
+     * @return Returns the languge file for the activity (for I8N).
+     */
+ 	public String getLanguageFile() {
+		return languageFile;
+	}
+
+    /**
+     * @return Returns the languge file for the tool (for I8N).
+     */
+	public String getToolLanguageFile() {
+		return toolLanguageFile;
+	}
+
+	/** Set the activity's description */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	/** Set the activity's help text */
+	public void setHelpText(String helpText) {
+		this.helpText = helpText;
+	}
+
+	/** Set the activity's title */
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	/** Set the tool's display name (similar to title) */
+	public void setToolDisplayName(String toolDisplayName) {
+		this.toolDisplayName = toolDisplayName;
+	}
+
+
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java,v
diff -u -r1.12 -r1.13
--- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java	16 Mar 2006 23:40:07 -0000	1.12
+++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java	27 Mar 2006 03:28:16 -0000	1.13
@@ -113,6 +113,11 @@
 	 * this activity. e.g. org.lamsfoundation.lams.tool.sbmt.SbmtResources.properties. */
 	private String languageFile;
 
+	/** 
+	 * Entries for an tool in a language property file 
+	 */
+	public static final String I8N_DISPLAY_NAME = "tool.display.name";
+	public static final String I8N_DESCRIPTION = "tool.description";
 
     /** full constructor */
     public Tool(Long toolId,