Index: lams_tool_sbmt/.classpath
===================================================================
diff -u -r0bab69ca213843b109a46bf4834d736cb956cf6f -r218109b0df4286a49f8426d903457f30760d7109
--- lams_tool_sbmt/.classpath	(.../.classpath)	(revision 0bab69ca213843b109a46bf4834d736cb956cf6f)
+++ lams_tool_sbmt/.classpath	(.../.classpath)	(revision 218109b0df4286a49f8426d903457f30760d7109)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry output="JBOSS_DEPLOY" kind="src" path="src/java"/>
+	<classpathentry output="JBOSS4" kind="src" path="src/java"/>
 	<classpathentry output="build/classes/test/java" kind="src" path="test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-workspace.jar"/>
Index: lams_tool_sbmt/.project
===================================================================
diff -u -r696c466679fbda03bce26ad4d2b28e908dd6a287 -r218109b0df4286a49f8426d903457f30760d7109
--- lams_tool_sbmt/.project	(.../.project)	(revision 696c466679fbda03bce26ad4d2b28e908dd6a287)
+++ lams_tool_sbmt/.project	(.../.project)	(revision 218109b0df4286a49f8426d903457f30760d7109)
@@ -54,6 +54,11 @@
 	</natures>
 	<linkedResources>
 		<link>
+			<name>JBOSS4</name>
+			<type>2</type>
+			<location>D:/jboss-4.0.2/server/default/deploy/lams.ear/lams-tool-lasbmt11.war/WEB-INF/classes</location>
+		</link>
+		<link>
 			<name>JBOSS_DEPLOY</name>
 			<type>2</type>
 			<location>D:/jboss-3.2.6/server/default/deploy/lams.ear/lams-tool-lasbmt11.war/WEB-INF/classes</location>
Index: lams_tool_sbmt/build.properties
===================================================================
diff -u -ref03b2a65a89e5554d6312ea5c0057d182282178 -r218109b0df4286a49f8426d903457f30760d7109
--- lams_tool_sbmt/build.properties	(.../build.properties)	(revision ef03b2a65a89e5554d6312ea5c0057d182282178)
+++ lams_tool_sbmt/build.properties	(.../build.properties)	(revision 218109b0df4286a49f8426d903457f30760d7109)
@@ -1,67 +1,21 @@
-# Abt properties for building the Lams Submit Files Tool
+####################################################################################################
+## NOTE: Most variables are defined in ../lams_build/common.properties file.
+##       You could define same name variable in this file to override value in common.properties.
+#####################################################################################################
+#properties for building the Lams Submit Files Tool
 
 #name of this project
 signature=lasbmt11
-name=lams_tool_lasbmt11
-product=lams-tool-lasbmt11
 
-# Directory where third party jars reside.
-sharedlib=../lams_build/lib
-j2eelibs=D:/eclipseplugins/myeclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
-
-deploy.tool.dir=../lams_build/deploy-tool
-build.deploy=${build}/deploy
-sql=${basedir}/db/sql
-
-#middlegen properties
-middlegen = ${conf}/middlegen
-gui = true
-
-#xdoclet version number
-xdoclet.version=1.2.3
-
-#web application properties
-sessiontimeout=120
-
-#database access
-db.name=lams
-db.driver=com.mysql.jdbc.Driver
-db.url=jdbc:mysql://localhost/${db.name}
-db.username=lams
-db.password=lamsdemo
-db.driver.jar=${sharedlib}/mysql/mysql-connector-java-3.1.7-bin.jar
-db.scripts=${basedir}/db/sql
-
 #submit files package definition
 sbmt.package=org.lamsfoundation.lams.tool.sbmt
 sbmt.path=org/lamsfoundation/lams/tool/sbmt
 
-#configuration files
-conf.dir=${basedir}/conf
-conf.middlegen.dir=${conf.dir}/middlegen
-conf.hibernate.dir=${conf.dir}/hibernate
-conf.hibernate.mapping.dir=${conf.hibernate.dir}/mappings
-conf.web.dir=${basedir}/web
-conf.webinf.dir=${conf.web.dir}/WEB-INF
-conf.xdoclet.dir=${conf.dir}/xdoclet
-conf.struts.dir=${conf.webinf.dir}/struts
+#JBoss root. Open comment if using another folder
+#jboss.home=D:/jboss-4.0.2/
 
-# Build directory
-build=${basedir}/build
-build.classes.java=${build}/classes/java
-build.classes.test=${build}/classes/test/java
-build.lib=${build}/lib
-build.report=${build}/report
-build.web=${build}/web
-
-# Source directory under the current root
-src.dir=${basedir}/src
-src.dir.java=${src.dir}/java
-src.dir.test=${basedir}/test/java
-
-jboss.home=D:/jboss-4.0.2/
-jboss.deploy=${jboss.home}server/default/deploy/lams.ear
+#Repository directory
 contentrepository.location = D:/repository
 
-# the URL used to access LAMS
-toolContext=/lams/tool/lasbmt11
+# Open comment if use different folder
+#j2eelibs=D:/eclipseplugins/myeclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
\ No newline at end of file
Index: lams_tool_sbmt/build.xml
===================================================================
diff -u -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 -r218109b0df4286a49f8426d903457f30760d7109
--- lams_tool_sbmt/build.xml	(.../build.xml)	(revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409)
+++ lams_tool_sbmt/build.xml	(.../build.xml)	(revision 218109b0df4286a49f8426d903457f30760d7109)
@@ -24,7 +24,7 @@
 
 	<!-- import properties from the specified file -->
 	<property file="build.properties"/>
-	
+	<property file="../lams_build/common.properties"/>
 	<path id="all-libs">
 			<fileset dir="${sharedlib}">
 				<include name="**/*.jar"/>
@@ -93,7 +93,7 @@
 			
 			<middlegen appname="lams_tool_sbmt" 
 					   prefsdir="${conf.middlegen.dir}"
-					   gui="${gui}"
+					   gui="${middlegen.gui}"
 					   databaseurl="${db.url}"
 					   driver="${db.driver}"
 					   username="${db.username}"
@@ -333,7 +333,7 @@
 		<mkdir dir="${build.deploy}/sql"/> 
 		 
 		<copy overwrite="yes" todir="${build.deploy}/sql">
-			<fileset dir="${sql}/">
+			<fileset dir="${db.scripts}/">
 				<include name="drop_lams_tool_sbmt.sql"/>
 				<include name="create_lams_tool_sbmt.sql"/>
 				<include name="activity_insert.sql"/>
@@ -368,11 +368,11 @@
 			dbDriverClass="${db.driver}"
 			deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
 			toolSignature="${signature}"
-			toolTablesDeleteScriptPath="${sql}/drop_lams_tool_sbmt.sql"
-			toolTablesScriptPath="${sql}/create_lams_tool_sbmt.sql"
-			toolActivityInsertScriptPath="${sql}/activity_insert.sql"
-			toolLibraryInsertScriptPath="${sql}/library_insert.sql"
-			toolInsertScriptPath="${sql}/tool_insert.sql"
+			toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_sbmt.sql"
+			toolTablesScriptPath="${db.scripts}/create_lams_tool_sbmt.sql"
+			toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql"
+			toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql"
+			toolInsertScriptPath="${db.scripts}/tool_insert.sql"
 			lamsEarPath="${jboss.deploy}"
 			toolContext="${toolContext}"
 			toolWebUri="${product}.war"
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
diff -u -r400b01498f92003243dfe91f424d0f4e44263874 -r218109b0df4286a49f8426d903457f30760d7109
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision 400b01498f92003243dfe91f424d0f4e44263874)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision 218109b0df4286a49f8426d903457f30760d7109)
@@ -29,4 +29,5 @@
 
 	public static final String TOOL_SESSION_ID = "toolSessionID";
 	public static final String TOOL_CONTENT_ID = "toolContentID";
+	public static final String USER_ID = "userID";
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -r400b01498f92003243dfe91f424d0f4e44263874 -r218109b0df4286a49f8426d903457f30760d7109
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 400b01498f92003243dfe91f424d0f4e44263874)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 218109b0df4286a49f8426d903457f30760d7109)
@@ -60,7 +60,7 @@
 
 		DynaActionForm authForm= (DynaActionForm)form;
 		Long sessionID =(Long) authForm.get(SbmtConstants.TOOL_SESSION_ID);
-		Long userID = (Long)authForm.get("userID");
+		Long userID = (Long)authForm.get(SbmtConstants.USER_ID);
 		
 		//get submission information from content table.E.g., title, instruction
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
@@ -95,7 +95,7 @@
 		DynaActionForm authForm= (DynaActionForm)form;
 		if(!isTokenValid(request,true)){
 			Long sessionID =(Long) authForm.get(SbmtConstants.TOOL_SESSION_ID);
-			Long userID = (Long)authForm.get("userID");
+			Long userID = (Long)authForm.get(SbmtConstants.USER_ID);
 			submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
 			List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
 
@@ -108,7 +108,7 @@
 		}
 		
 		Long sessionID =(Long) authForm.get(SbmtConstants.TOOL_SESSION_ID);
-		Long userID = (Long)authForm.get("userID");
+		Long userID = (Long)authForm.get(SbmtConstants.USER_ID);
 		FormFile uploadedFile= (FormFile) authForm.get("filePath");
 		String fileDescription = (String) authForm.get("fileDescription");
 
@@ -144,7 +144,7 @@
 			HttpServletResponse response){
 		DynaActionForm authForm= (DynaActionForm)form;
 		Long sessionID =(Long) authForm.get(SbmtConstants.TOOL_SESSION_ID);
-		Long userID = (Long)authForm.get("userID");
+		Long userID = (Long)authForm.get(SbmtConstants.USER_ID);
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
 		submitFilesService.finishSubmission(sessionID,userID);
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
diff -u -r400b01498f92003243dfe91f424d0f4e44263874 -r218109b0df4286a49f8426d903457f30760d7109
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 400b01498f92003243dfe91f424d0f4e44263874)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 218109b0df4286a49f8426d903457f30760d7109)
@@ -201,8 +201,7 @@
 		//return FileDetailsDTO list according to the given sessionID
 		Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID);		
 		request.setAttribute(SbmtConstants.TOOL_SESSION_ID,sessionID);
-//		request.setAttribute("user",
-//										  submitFilesService.getUserDetails(userID));
+//		request.setAttribute("user",submitFilesService.getUserDetails(userID));
 		request.setAttribute("report",userFilesMap);
 		return mapping.findForward("allUserMarks");
 
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -rdf6ad7b34421631085b2ad7a68fa779c550e6a24 -r218109b0df4286a49f8426d903457f30760d7109
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision df6ad7b34421631085b2ad7a68fa779c550e6a24)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 218109b0df4286a49f8426d903457f30760d7109)
@@ -199,7 +199,7 @@
 <!--  ======================================================== -->	
 <taglib>
     <taglib-uri>fck-editor</taglib-uri>
-    <taglib-location>/WEB-INF/fckEditor/tlds/FCKeditor.tld</taglib-location>
+    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
 </taglib>
 
    <!--