Index: lams_tool_sbmt/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.xml,v
diff -u -r1.35 -r1.36
--- lams_tool_sbmt/build.xml	28 Sep 2006 23:32:06 -0000	1.35
+++ lams_tool_sbmt/build.xml	13 Dec 2006 06:28:49 -0000	1.36
@@ -239,6 +239,8 @@
 				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>
 	
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_sbmt/conf/xdoclet/struts-plugins.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_sbmt/conf/xdoclet/validation-forms.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java,v
diff -u -r1.35 -r1.36
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	6 Nov 2006 01:36:36 -0000	1.35
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	13 Dec 2006 06:28:49 -0000	1.36
@@ -73,7 +73,7 @@
  * 				  parameter="dispatch"
  *                input="/authoring/authoring.jsp" 
  *                scope="request" 
- *                validate="false"
+ *                validate="true"
  * 
  * @struts.action-forward name="success" path="/authoring/authoring.jsp"
  * @struts.action-forward name="instructionFileList" path="/authoring/parts/instructionfilelist.jsp"
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java,v
diff -u -r1.38 -r1.39
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	15 Nov 2006 06:42:35 -0000	1.38
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	13 Dec 2006 06:28:49 -0000	1.39
@@ -60,6 +60,7 @@
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -304,9 +305,12 @@
 			error = true;
 		}
 		
-		if(error)
-			this.addErrors(request,errors);
+		boolean oversize = !FileValidatorUtil.validateFileSize(learnerForm.getFile(),false,errors);
+		error = error?error:oversize;
 		
+		if(error){
+			this.addErrors(request,errors);
+		}
 		return error;
 	}
 
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.37 -r1.38
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	7 Sep 2006 01:36:49 -0000	1.37
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	13 Dec 2006 06:28:49 -0000	1.38
@@ -134,7 +134,7 @@
       input="/authoring/authoring.jsp"
       parameter="dispatch"
       unknown="false"
-      validate="false"
+      validate="true"
     >
       <forward
         name="success"
@@ -171,7 +171,7 @@
 		<action path="/learning/submitReflection"
 			type="org.lamsfoundation.lams.tool.sbmt.web.ReflectAction"
 			name="reflectionForm" 
-			validate="true" 
+			validate="false" 
 			input="/learner/notebook.jsp"
 			parameter="submitReflection" 
 			scope="request">
@@ -187,6 +187,10 @@
 
   <message-resources parameter="org.lamsfoundation.lams.tool.sbmt.ApplicationResources" />
 
-   <!-- 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>
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/struts/validation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?