Index: lams_tool_sbmt/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.xml,v diff -u -r1.7 -r1.8 --- lams_tool_sbmt/build.xml 15 Jul 2005 06:42:08 -0000 1.7 +++ lams_tool_sbmt/build.xml 19 Jul 2005 00:14:54 -0000 1.8 @@ -250,6 +250,7 @@ mergedir="${conf.xdoclet.dir}" sessiontimeout="${sessiontimeout}"/> + Index: lams_tool_sbmt/conf/xdoclet/struts-forms.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/struts-forms.xml,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/conf/xdoclet/struts-forms.xml 15 Jul 2005 05:27:26 -0000 1.2 +++ lams_tool_sbmt/conf/xdoclet/struts-forms.xml 19 Jul 2005 00:14:54 -0000 1.3 @@ -10,7 +10,8 @@ - + +

@@ -28,4 +29,6 @@

+ + \ No newline at end of file Index: lams_tool_sbmt/conf/xdoclet/struts-plugins.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/struts-plugins.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_sbmt/conf/xdoclet/struts-plugins.xml 19 Jul 2005 00:14:54 -0000 1.1 @@ -0,0 +1,5 @@ + + + \ No newline at end of file Index: lams_tool_sbmt/conf/xdoclet/validation-forms.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/Attic/validation-forms.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_sbmt/conf/xdoclet/validation-forms.xml 19 Jul 2005 00:14:54 -0000 1.1 @@ -0,0 +1,6 @@ + + Index: lams_tool_sbmt/db/model/lams_tool_sbmt.clay =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/model/lams_tool_sbmt.clay,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/db/model/lams_tool_sbmt.clay 14 Jul 2005 05:55:16 -0000 1.2 +++ lams_tool_sbmt/db/model/lams_tool_sbmt.clay 19 Jul 2005 00:14:54 -0000 1.3 @@ -64,19 +64,6 @@ - - - - - - - - - - - - -

@@ -109,15 +96,7 @@

- - - - - - - - - +

@@ -269,6 +248,19 @@ + + + + + + + + + + + + +

@@ -283,6 +275,13 @@ + + + + + + +

Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/SbmtResources.properties,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties 11 Jul 2005 07:07:15 -0000 1.2 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties 19 Jul 2005 00:14:54 -0000 1.3 @@ -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=

+errors.suffix=

+# -- 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/sbmtLearner.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/Attic/sbmtLearner.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_sbmt/web/sbmtLearner.jsp 15 Jul 2005 05:27:26 -0000 1.4 +++ lams_tool_sbmt/web/sbmtLearner.jsp 19 Jul 2005 00:14:54 -0000 1.5 @@ -16,6 +16,9 @@ + + @@ -47,7 +50,7 @@ - + @@ -58,7 +61,7 @@ -
+

@@ -83,7 +86,7 @@

- +

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.4 -r1.5 --- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml 15 Jul 2005 05:27:26 -0000 1.4 +++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml 19 Jul 2005 00:14:54 -0000 1.5 @@ -24,7 +24,7 @@ type="java.lang.Long"/> - +

@@ -39,6 +39,7 @@

+ @@ -131,6 +132,10 @@ - + + + Index: lams_tool_sbmt/web/WEB-INF/struts/validation.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/struts/Attic/validation.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_sbmt/web/WEB-INF/struts/validation.xml 19 Jul 2005 00:14:54 -0000 1.1 @@ -0,0 +1,15 @@ + + + + + + + + + + + + + Index: lams_tool_sbmt/web/WEB-INF/struts/validator-rules.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/struts/Attic/validator-rules.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_sbmt/web/WEB-INF/struts/validator-rules.xml 19 Jul 2005 00:14:54 -0000 1.1 @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +