Index: lams_tool_sbmt/build.xml
===================================================================
diff -u -r39c01a1dca00f314cfdbaadfadf123b2f27ab580 -r7ce5a98708f5a561d46682de26ae44541ab23d20
--- lams_tool_sbmt/build.xml	(.../build.xml)	(revision 39c01a1dca00f314cfdbaadfadf123b2f27ab580)
+++ lams_tool_sbmt/build.xml	(.../build.xml)	(revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
@@ -250,6 +250,7 @@
 				mergedir="${conf.xdoclet.dir}" sessiontimeout="${sessiontimeout}"/>
 				
 	         <strutsconfigxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.2" />
+	         <strutsdynaformvalidationxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.1.3"  />
 	      </webdoclet>
 	   </target>
 	
Index: lams_tool_sbmt/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -rdf1375bbde992f59d04ee895a971eb4dfa7282b1 -r7ce5a98708f5a561d46682de26ae44541ab23d20
--- lams_tool_sbmt/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision df1375bbde992f59d04ee895a971eb4dfa7282b1)
+++ lams_tool_sbmt/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
@@ -10,7 +10,8 @@
 				   
 </form-bean>
 
-<form-bean name="SbmtLearnerForm" type="org.apache.struts.action.DynaActionForm">
+
+<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"/>
@@ -28,4 +29,6 @@
 	<form-property name="filesUploaded"
 				   type="java.util.List"/>
 </form-bean>
+
+
 <form-bean name="emptyForm" type="org.apache.struts.action.DynaActionForm"/>
\ No newline at end of file
Index: lams_tool_sbmt/conf/xdoclet/struts-plugins.xml
===================================================================
diff -u
--- lams_tool_sbmt/conf/xdoclet/struts-plugins.xml	(revision 0)
+++ lams_tool_sbmt/conf/xdoclet/struts-plugins.xml	(revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
@@ -0,0 +1,5 @@
+  <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+    <set-property property="pathnames"
+                     value="/WEB-INF/struts/validator-rules.xml,
+                            /WEB-INF/struts/validation.xml"/>
+  </plug-in>
\ No newline at end of file
Index: lams_tool_sbmt/conf/xdoclet/validation-forms.xml
===================================================================
diff -u
--- lams_tool_sbmt/conf/xdoclet/validation-forms.xml	(revision 0)
+++ lams_tool_sbmt/conf/xdoclet/validation-forms.xml	(revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
@@ -0,0 +1,6 @@
+<form name="SbmtLearnerForm">
+	<field property="filePath" depends="required">
+		<arg key="SbmtLearnerForm.filePath"/>
+	</field>
+</form>
+
Index: lams_tool_sbmt/db/model/lams_tool_sbmt.clay
===================================================================
diff -u -rb610cde22bca23f3ec2c70121db08612edff3912 -r7ce5a98708f5a561d46682de26ae44541ab23d20
--- lams_tool_sbmt/db/model/lams_tool_sbmt.clay	(.../lams_tool_sbmt.clay)	(revision b610cde22bca23f3ec2c70121db08612edff3912)
+++ lams_tool_sbmt/db/model/lams_tool_sbmt.clay	(.../lams_tool_sbmt.clay)	(revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
@@ -64,19 +64,6 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="submission_id" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="submission_id" remarks="">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
 <column alias="comments" auto-increment="false" column-size="250" decimal-digits="0" default-value="" mandatory="true" name="comments" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
@@ -109,15 +96,7 @@
 <primary-key-column name="report_id"/>
 </primary-key>
 <unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_tl_lasbmt11_report_1" on-delete="" on-update="" referenced-key="PK_TL_LASBMT11_SUBMISSION_DETAILS" referenced-table="tl_lasbmt11_submission_details" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="submission_id" referenced-key-column-name="submission_id"/>
-</foreign-key>
-</foreign-key-list>
+<foreign-key-list/>
 <index-list/>
 </table>
 <table alias="tl_lasbmt11_session" name="tl_lasbmt11_session" remarks="">
@@ -269,6 +248,19 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
+<column alias="report_id" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="report_id" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant type-name-pattern="BIGINT"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
 </column-list>
 <primary-key alias="" name="PK_TL_LASBMT11_SUBMISSION_DETAILS" remarks="">
 <primary-key-description></primary-key-description>
@@ -283,6 +275,13 @@
 </foreign-key-figure>
 <foreign-key-column column-name="session_id" referenced-key-column-name="session_id"/>
 </foreign-key>
+<foreign-key alias="" name="FK_tl_lasbmt11_submission_details_2" on-delete="" on-update="" referenced-key="PK_TL_LASBMT11_REPORT" referenced-table="tl_lasbmt11_report" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
+<foreign-key-description></foreign-key-description>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="report_id" referenced-key-column-name="report_id"/>
+</foreign-key>
 </foreign-key-list>
 <index-list/>
 </table>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties
===================================================================
diff -u -r09c9fa0ac21227610deb68479356ca37513ae74e -r7ce5a98708f5a561d46682de26ae44541ab23d20
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	(.../SbmtResources.properties)	(revision 09c9fa0ac21227610deb68479356ca37513ae74e)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	(.../SbmtResources.properties)	(revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
@@ -28,4 +28,33 @@
 label.monitoring.needMarking = File(s) need marking
 
 #-------------------------Exception Labels-----------------#
-sbmt.web.action.upload.exception = Upload of file failed.
\ No newline at end of file
+sbmt.web.action.upload.exception = Upload of file failed.
+
+
+# Errors
+learner.from.filepath.displayname=Upload file name
+# -- standard errors --
+errors.header=<UL>
+errors.prefix=<LI>
+errors.suffix=</LI>
+errors.footer=</UL>
+# -- validator --
+errors.invalid={0} is invalid.
+errors.maxlength={0} can not be greater than {1} characters.
+errors.minlength={0} can not be less than {1} characters.
+errors.range={0} is not in the range {1} through {2}.
+errors.required={0} is required.
+errors.byte={0} must be an byte.
+errors.date={0} is not a date.
+errors.double={0} must be an double.
+errors.float={0} must be an float.
+errors.integer={0} must be an integer.
+errors.long={0} must be an long.
+errors.short={0} must be an short.
+errors.creditcard={0} is not a valid credit card number.
+errors.email={0} is an invalid e-mail address.
+# -- other --
+errors.cancel=Operation cancelled.
+errors.detail={0}
+errors.general=The process did not complete. Details should follow.
+errors.token=Request could not be completed. Operation is not in sequence.
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rdf1375bbde992f59d04ee895a971eb4dfa7282b1 -r7ce5a98708f5a561d46682de26ae44541ab23d20
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision df1375bbde992f59d04ee895a971eb4dfa7282b1)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
@@ -24,7 +24,7 @@
 				   type="java.lang.Long"/>
 </form-bean>
 
-<form-bean name="SbmtLearnerForm" type="org.apache.struts.action.DynaActionForm">
+<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"/>
@@ -39,6 +39,7 @@
 	<form-property name="filesUploaded"
 				   type="java.util.List"/>
 </form-bean>
+
 <form-bean name="emptyForm" type="org.apache.struts.action.DynaActionForm"/>
   </form-beans>
 
@@ -131,6 +132,10 @@
 
   <message-resources parameter="org.lamsfoundation.lams.tool.sbmt.SbmtResources" />
 
-   <!-- Define your Struts plugins in a file called struts-plugins.xml and place it in your merge directory. -->
+    <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+    <set-property property="pathnames"
+                     value="/WEB-INF/struts/validator-rules.xml,
+                            /WEB-INF/struts/validation.xml"/>
+  </plug-in>
 
 </struts-config>
Index: lams_tool_sbmt/web/WEB-INF/struts/validation.xml
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/struts/validation.xml	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/struts/validation.xml	(revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN" "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
+<form-validation>
+  <!--
+    Define global validation config in validation-global.xml
+  -->
+  <formset>
+  <form name="SbmtLearnerForm">
+	<field property="filePath" depends="required">
+		<arg key="learner.from.filepath.displayname"/>
+	</field>
+</form>
+
+  </formset>
+</form-validation>
Index: lams_tool_sbmt/web/WEB-INF/struts/validator-rules.xml
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/struts/validator-rules.xml	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/struts/validator-rules.xml	(revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
@@ -0,0 +1,287 @@
+<!DOCTYPE form-validation PUBLIC
+          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN"
+          "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
+<!--
+  $Header$
+  $Revision$
+  $Date$
+
+   This file contains the default Struts Validator pluggable validator
+   definitions.  It should be placed somewhere under /WEB-INF and
+   referenced in the struts-config.xml under the plug-in element
+   for the ValidatorPlugIn.
+
+      <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+        <set-property property="pathnames" value="/WEB-INF/validator-rules.xml,
+                                                  /WEB-INF/validation.xml"/>
+      </plug-in>
+
+   These are the default error messages associated with
+   each validator defined in this file.  They should be
+   added to your projects ApplicationResources.properties
+   file or you can associate new ones by modifying the
+   pluggable validators msg attributes in this file.
+
+   # Struts Validator Error Messages
+   errors.required={0} is required.
+   errors.minlength={0} can not be less than {1} characters.
+   errors.maxlength={0} can not be greater than {1} characters.
+   errors.invalid={0} is invalid.
+
+   errors.byte={0} must be a byte.
+   errors.short={0} must be a short.
+   errors.integer={0} must be an integer.
+   errors.long={0} must be a long.
+   errors.float={0} must be a float.
+   errors.double={0} must be a double.
+
+   errors.date={0} is not a date.
+   errors.range={0} is not in the range {1} through {2}.
+   errors.creditcard={0} is an invalid credit card number.
+   errors.email={0} is an invalid e-mail address.
+
+   Note: Starting in Struts 1.2.0 the default javascript definitions have
+         been consolidated to commons-validator. The default can be overridden
+         by supplying a <javascript> element with a CDATA section, just as
+         in struts 1.1.
+
+-->
+
+<form-validation>
+
+   <global>
+
+      <validator name="required"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateRequired"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+                  msg="errors.required"/>
+
+      <validator name="requiredif"
+                 classname="org.apache.struts.validator.FieldChecks"
+                 method="validateRequiredIf"
+                 methodParams="java.lang.Object,
+                               org.apache.commons.validator.ValidatorAction,
+                               org.apache.commons.validator.Field,
+                               org.apache.struts.action.ActionMessages,
+                               org.apache.commons.validator.Validator,
+                               javax.servlet.http.HttpServletRequest"
+                 msg="errors.required"/>
+
+      <validator name="validwhen"
+          msg="errors.required"
+                 classname="org.apache.struts.validator.validwhen.ValidWhen"
+                 method="validateValidWhen"
+                 methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"/>
+
+
+      <validator name="minlength"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateMinLength"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.minlength"
+           jsFunction="org.apache.commons.validator.javascript.validateMinLength"/>
+
+
+      <validator name="maxlength"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateMaxLength"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.maxlength"
+           jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/>
+
+
+
+      <validator name="mask"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateMask"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.invalid"/>
+
+
+      <validator name="byte"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateByte"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.byte"
+       jsFunctionName="ByteValidations"/>
+
+
+      <validator name="short"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateShort"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.short"
+       jsFunctionName="ShortValidations"/>
+
+
+      <validator name="integer"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateInteger"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.integer"
+       jsFunctionName="IntegerValidations"/>
+
+
+
+      <validator name="long"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateLong"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.long"/>
+
+
+      <validator name="float"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateFloat"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.float"
+       jsFunctionName="FloatValidations"/>
+
+      <validator name="double"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateDouble"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.double"/>
+
+
+      <validator name="date"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateDate"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.date"
+       jsFunctionName="DateValidations"/>
+
+
+      <validator name="intRange"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateIntRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends="integer"
+                  msg="errors.range"/>
+
+
+      <validator name="floatRange"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateFloatRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends="float"
+                  msg="errors.range"/>
+
+
+      <validator name="creditCard"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateCreditCard"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.creditcard"/>
+
+
+      <validator name="email"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateEmail"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.email"/>
+
+      <validator name="url"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateUrl"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.url"/>
+
+     <!--
+       This simply allows struts to include the validateUtilities into a page, it should
+       not be used as a validation rule.
+     -->
+     <validator name="includeJavaScriptUtilities"
+            classname=""
+               method=""
+         methodParams=""
+              depends=""
+                  msg=""
+           jsFunction="org.apache.commons.validator.javascript.validateUtilities"/>
+
+   </global>
+
+</form-validation>
Index: lams_tool_sbmt/web/sbmtLearner.jsp
===================================================================
diff -u -rdf1375bbde992f59d04ee895a971eb4dfa7282b1 -r7ce5a98708f5a561d46682de26ae44541ab23d20
--- lams_tool_sbmt/web/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision df1375bbde992f59d04ee895a971eb4dfa7282b1)
+++ lams_tool_sbmt/web/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
@@ -16,6 +16,9 @@
 	<!-- 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">
 
+		<html:javascript formName="SbmtLearnerForm"
+        method="validateForm"/>
+
   </head>
   
   <body>
@@ -47,7 +50,7 @@
 				<tr>
 				<!--Second Row displaying the description of the File -->
 				<td><b><bean:message key="label.learner.fileDescription"/></b></td>
-				<td><bean:write name="filesUploaded" property="fileDescription"/></td>
+				<td><bean:write name="filesUploaded" property="fileDescription" filter="false"/></td>
 				</tr>
 				<tr>
 				<!--Third row displaying the date of submission of the File -->
@@ -58,7 +61,7 @@
 				<!--Fourth row displaying the comments -->
 				<td><b><bean:message key="label.learner.comments"/></b></td>
 				<td><logic:notEmpty name="filesUploaded" property="comments">
-						<bean:write name="filesUploaded" property="comments"/><br>
+						<bean:write name="filesUploaded" property="comments" filter="false"/><br>
 				</logic:notEmpty>
 				<logic:empty  name="filesUploaded" property="comments">
 						<bean:message key="label.learner.notAvailable"/><br>
@@ -83,7 +86,7 @@
 	</div>
 					
   	<div id="formtablecontainer">
-    <html:form action="/learner?method=uploadFile" method="post" >
+    <html:form action="/learner?method=uploadFile" method="post" focus="filePath"  onsubmit="return validateForm(this);">
       <p><html:errors/></p>
       <table class="forms">
       	<!-- Hidden fields -->