Index: lams_tool_sbmt/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -rf66f1839407b038bc217a2af60599ac3edde342f -r4f4b5c90a74621f805dff5922233ca7e0240931f
--- lams_tool_sbmt/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision f66f1839407b038bc217a2af60599ac3edde342f)
+++ lams_tool_sbmt/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
@@ -1,10 +1,8 @@
 <form-bean name ="SbmtAuthoringForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="title" 
-				   type="java.lang.String" 
-				   initial="Submit Files"/>
+				   type="java.lang.String" />
 	<form-property name="instructions" 
-				   type="java.lang.String" 
-				   initial="Please upload you files below. Maximum file size is 1.0 MB." />
+				   type="java.lang.String" />
 	<form-property name="toolContentID"
 				   type="java.lang.Long"/>
 				   
@@ -13,12 +11,10 @@
 
 <form-bean name="SbmtLearnerForm" type="org.apache.struts.validator.DynaValidatorForm">
 	<form-property name="filePath"
-				   type="java.lang.String"
-				   initial="Type the path of the File here or click the Browse button to choose"/>
+				   type="org.apache.struts.upload.FormFile"/>
 	
 	<form-property name="fileDescription"
-				   type="java.lang.String"
-				   initial="Type the description of the file here..."/>
+				   type="java.lang.String"/>
 	
 	<form-property name="toolSessionID"
 				   type="java.lang.Long"/>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
diff -u -r935874a247d4ff466784941891be3b56d59d8509 -r4f4b5c90a74621f805dff5922233ca7e0240931f
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision 935874a247d4ff466784941891be3b56d59d8509)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.IVersionedNode;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport;
@@ -95,16 +96,15 @@
 	 * 
 	 * @param contentID
 	 *            The content_id of the record to be updated in the database
-	 * @param filePath
-	 *            The physical location of the file from where it has to be
-	 *            uploaded
+	 * @param uploadedFile
+	 *            The STRUTS org.apache.struts.upload.FormFile type
 	 * @param fileDescription
 	 *            The description of the file being uploaded.
 	 * @param userID
 	 * 			  The <code>User</code> who has uploaded the file.
 	 * @throws SubmitFilesException
 	 */
-	public void uploadFile(Long contentID, String filePath,
+	public void uploadFile(Long contentID, FormFile uploadedFile,
 			String fileDescription, Long userID) throws SubmitFilesException;
 	
 	/**
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -rde9ee5f6274f17bb25bbba6f8ea3038cfebd5a90 -r4f4b5c90a74621f805dff5922233ca7e0240931f
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision de9ee5f6274f17bb25bbba6f8ea3038cfebd5a90)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
@@ -23,8 +23,8 @@
 package org.lamsfoundation.lams.tool.sbmt.service;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -38,6 +38,7 @@
 import java.util.TreeSet;
 
 import org.apache.log4j.Logger;
+import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
 import org.lamsfoundation.lams.contentrepository.FileException;
 import org.lamsfoundation.lams.contentrepository.ICredentials;
@@ -363,8 +364,6 @@
 	 *            uploaded
 	 * @param sessionID
 	 *            The <code>ToolSessionID</code> of the file being uploaded
-	 * @param filePath
-	 *            The physical path of the file
 	 * @param fileDescription
 	 *            The description of the file
 	 * @param fileName
@@ -377,7 +376,7 @@
 	 * 			  The <code>User</code> who has uploaded the file.
 	 * @throws SubmitFilesException
 	 */
-	private void uploadFile(InputStream stream, Long sessionID, String filePath,
+	private void uploadFile(InputStream stream, Long sessionID, 
 							String fileDescription, String fileName, String mimeType,
 							Date dateOfSubmission, Long userID) throws SubmitFilesException {
 
@@ -388,7 +387,7 @@
 							+ " found.");
 		else {
 			NodeKey nodeKey = uploadFileToRepository(stream, fileName, mimeType);
-			SubmissionDetails details = new SubmissionDetails(filePath,fileDescription,dateOfSubmission,
+			SubmissionDetails details = new SubmissionDetails(fileName,fileDescription,dateOfSubmission,
 															  userID,nodeKey.getUuid(),nodeKey.getVersion());
 			SubmitFilesReport report = new SubmitFilesReport();
 			details.setReport(report);
@@ -512,16 +511,17 @@
 	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#uploadFile(java.lang.Long,
 	 *      java.lang.String, java.lang.String)
 	 */
-	public void uploadFile(Long sessionID, String filePath,
+	public void uploadFile(Long sessionID, FormFile uploadFile,
 						   String fileDescription, Long userID) throws SubmitFilesException{
 		try{
-			File file = new File(filePath);
-			String fileName = file.getName();
+			String fileName = uploadFile.getFileName();
 			String mimeType = fileName.substring(fileName.lastIndexOf(".")+1,fileName.length());
-			FileInputStream stream = new FileInputStream(file);
-			uploadFile(stream,sessionID,filePath,fileDescription,fileName,mimeType,new Date(),userID);			
+			InputStream stream = uploadFile.getInputStream();
+			uploadFile(stream,sessionID,fileDescription,fileName,mimeType,new Date(),userID);			
 		}catch(FileNotFoundException fe){
 			throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + fe.getMessage());
+		} catch (IOException e) {
+			throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + e.getMessage());
 		}
 
 	}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -r75de919817a4bfa05924724631118b092da74cf7 -r4f4b5c90a74621f805dff5922233ca7e0240931f
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 75de919817a4bfa05924724631118b092da74cf7)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
@@ -21,6 +21,7 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.DynaActionForm;
 import org.apache.struts.actions.DispatchAction;
+import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
@@ -90,14 +91,14 @@
 		
 		Long sessionID =(Long) authForm.get("toolSessionID");
 		Long userID = (Long)authForm.get("userID");
-		String filePath = (String) authForm.get("filePath");
+		FormFile uploadedFile= (FormFile) authForm.get("filePath");
 		String fileDescription = (String) authForm.get("fileDescription");
-		
+
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
 		//to avoid user without patience click "upload" button too fast 
 		saveToken(request);
 		try{
-			submitFilesService.uploadFile(sessionID,filePath,fileDescription,userID);
+			submitFilesService.uploadFile(sessionID,uploadedFile,fileDescription,userID);
 			List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
 			listUploadFiles(authForm, filesUploaded);
 			return mapping.getInputForward();			
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r75de919817a4bfa05924724631118b092da74cf7 -r4f4b5c90a74621f805dff5922233ca7e0240931f
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 75de919817a4bfa05924724631118b092da74cf7)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
@@ -15,22 +15,18 @@
 
    <form-bean name ="SbmtAuthoringForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="title" 
-				   type="java.lang.String" 
-				   initial="Submit Files"/>
+				   type="java.lang.String" />
 	<form-property name="instructions" 
-				   type="java.lang.String" 
-				   initial="Please upload you files below. Maximum file size is 1.0 MB." />
+				   type="java.lang.String" />
 	<form-property name="toolContentID"
 				   type="java.lang.Long"/>
 </form-bean>
 
 <form-bean name="SbmtLearnerForm" type="org.apache.struts.validator.DynaValidatorForm">
 	<form-property name="filePath"
-				   type="java.lang.String"
-				   initial="Type the path of the File here or click the Browse button to choose"/>
+				   type="org.apache.struts.upload.FormFile"/>
 	<form-property name="fileDescription"
-				   type="java.lang.String"
-				   initial="Type the description of the file here..."/>
+				   type="java.lang.String"/>
 	<form-property name="toolSessionID"
 				   type="java.lang.Long"/>
 	<form-property name="userID"
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/authoring/authoring.jsp	(revision 0)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
@@ -0,0 +1,92 @@
+
+<%@ page language="java"%>
+
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="tags-html-el" prefix="html"%>
+<%@ taglib uri="tags-tiles" prefix="tiles"%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+<head>
+<html:base />
+<title>Submit Files</title>
+<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+<link href="../css/aqua.css" rel="stylesheet" type="text/css">
+
+</head>
+
+<body>
+<html:form action="authoring?method=updateContent" method="post"
+	focus="login">
+	<div id="basic">
+	<h1><fmt:message key="label.authoring.heading.basic" /></h1>
+	<h1><fmt:message key="label.authoring.heading.basic.desc" /></h1>
+	<table class="forms">
+		<!--hidden field contentID passed by flash-->
+		<html:hidden property="toolContentID" value="${toolContentID}" />
+		<!-- Title Row -->
+		<tr>
+			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
+			<td class="formcontrol"><html:text property="title" /></td>
+		</tr>
+		<!-- Instructions Row -->
+		<tr>
+			<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
+			<td class="formcontrol"><FCK:editor id="instructions"
+				basePath="/lams/fckEditor/" height="150" width="85%">
+			</FCK:editor></td>
+		</tr>
+	</table>
+	</div>
+	<div id="instruction">
+	<h1><fmt:message key="label.authoring.heading.instructions" /></h1>
+	<h2><fmt:message key="label.authoring.heading.instructions.desc" /></h2>
+	<table class="forms">
+		<!--hidden field contentID passed by flash-->
+		<html:hidden property="toolContentID" value="${toolContentID}" />
+		<!-- Title Row -->
+		<tr>
+		</tr>
+		<!-- Instructions Row -->
+		<tr>
+			<td class="formlabel"><fmt:message
+				key="label.authoring.online.instruction" />:</td>
+			<td class="formcontrol"><FCK:editor id="online_instruction"
+				basePath="/lams/fckEditor/" height="150" width="85%">
+			</FCK:editor></td>
+		</tr>
+		<tr>
+			<td class="formlabel"><fmt:message
+				key="label.authoring.offline.instruction" />:</td>
+			<td class="formcontrol"><FCK:editor id="offline_instruction"
+				basePath="/lams/fckEditor/" height="150" width="85%">
+			</FCK:editor></td>
+		</tr>
+		<tr>
+			<td class="formlabel"><fmt:message
+				key="label.authoring.uploadfile" />:</td>
+			<td class="formcontrol">
+				<html:file property="title" />
+				<input name="filename" type="file" value="choose file">
+				<input name="upload" type="button" value="upload">
+			</td>
+		</tr>			
+		</tr>
+	</table>
+	</div>
+	<table class="forms">
+		<!-- Button Row -->
+		<tr>
+			<td class="formcontrol"><html:button property="cancel"
+				onclick="window.close()">
+				<fmt:message key="label.authoring.cancel.button" />
+			</html:button></td>
+			<td class="formcontrol"><html:submit property="save">
+				<fmt:message key="label.authoring.save.button" />
+			</html:submit></td>
+	</table>
+</html:form>
+</body>
+</html:html>
Index: lams_tool_sbmt/web/sbmtLearner.jsp
===================================================================
diff -u -rcef13fc6b0b3ec922f5e0bc81d76d67111c812ee -r4f4b5c90a74621f805dff5922233ca7e0240931f
--- lams_tool_sbmt/web/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision cef13fc6b0b3ec922f5e0bc81d76d67111c812ee)
+++ lams_tool_sbmt/web/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision 4f4b5c90a74621f805dff5922233ca7e0240931f)
@@ -22,7 +22,7 @@
   
   <body>
   	<H1><c:out value="${content.title}"/></H1>
-  	<H2><c:out value="${content.instructions}" escapeXml="false"/></H2>
+  	<H2><c:out value="${content.instruction}" escapeXml="false"/></H2>
   	<div id="datatablecontainer">
   	<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
 	<logic:present name="SbmtLearnerForm" property="filesUploaded">
@@ -85,7 +85,7 @@
 	</div>
 					
   	<div id="formtablecontainer">
-    <html:form action="/learner?method=uploadFile" method="post" focus="filePath"  onsubmit="return validateForm(this);">
+    <html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data" focus="filePath"  onsubmit="return validateForm(this);">
       <p><html:errors/></p>
       <table class="forms">
       	<!-- Hidden fields -->