Index: lams_tool_sbmt/conf/xdoclet/web-settings.xml
===================================================================
diff -u -re25aeb7cab3254a415d2de6674b1012c129660f5 -rdf6ad7b34421631085b2ad7a68fa779c550e6a24
--- lams_tool_sbmt/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision e25aeb7cab3254a415d2de6674b1012c129660f5)
+++ lams_tool_sbmt/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision df6ad7b34421631085b2ad7a68fa779c550e6a24)
@@ -4,6 +4,9 @@
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
 		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
+		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
+		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml	
+		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml	
 	</param-value>
 </context-param>
 <context-param>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
diff -u -r0bab69ca213843b109a46bf4834d736cb956cf6f -rdf6ad7b34421631085b2ad7a68fa779c550e6a24
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 0bab69ca213843b109a46bf4834d736cb956cf6f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision df6ad7b34421631085b2ad7a68fa779c550e6a24)
@@ -76,7 +76,7 @@
 		<property name="toolContentHandler"><ref bean="toolContentHandler"/></property>
 		<property name="userDAO"><ref bean="userDAO"/></property>
 		<property name="learnerService"><ref bean="learnerService"/></property>
-		<property name="toolService"><ref bean="toolService"/></property>
+		<property name="toolService"><ref bean="lamsToolService"/></property>
 	</bean>
 	
 	<bean id="submitFilesService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -r12363516e3d2a82823dca22cf7cafa91a4c8f9a6 -rdf6ad7b34421631085b2ad7a68fa779c550e6a24
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 12363516e3d2a82823dca22cf7cafa91a4c8f9a6)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision df6ad7b34421631085b2ad7a68fa779c550e6a24)
@@ -10,6 +10,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
@@ -28,6 +29,7 @@
 
 /**
  * @author Manpreet Minhas
+ * @author Steve Ni
  * 
  * @struts.action path="/authoring" 
  * 				  name="SbmtAuthoringForm" 
@@ -66,7 +68,12 @@
 		try {
 			SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(content.getContentID());
 			if(content.getContentID().equals(persistContent.getContentID())){
-				copyContentSimpleProperty(persistContent,content);
+				//keep Set type attribute for persist content becuase this update only 
+				//include updating simple properties from web page(i.e. text value, list value, etc)
+				content.setInstructionFiles(persistContent.getInstructionFiles());
+				content.setToolSession(persistContent.getToolSession());
+				//copy web page value into persist content, as above, the "Set" type value kept.
+				PropertyUtils.copyProperties(persistContent,content);
 				submitFilesService.updateSubmitFilesContent(persistContent);
 			}else
 				submitFilesService.addSubmitFilesContent(content);
@@ -75,20 +82,6 @@
 		}
 		return mapping.findForward("success");
 	}
-
-	private void copyContentSimpleProperty(SubmitFilesContent target, SubmitFilesContent src) {
-		target.setContentID(src.getContentID());
-		target.setContentInUse(src.isContentInUse());
-		target.setDefineLater(src.isDefineLater());
-		target.setRunOffline(src.isRunOffline());
-		target.setInstruction(src.getInstruction());
-		target.setOfflineInstruction(src.getOfflineInstruction());
-		target.setOnlineInstruction(src.getOnlineInstruction());
-		target.setRunOfflineInstruction(src.getRunOfflineInstruction());
-		target.setTitle(src.getTitle());
-		target.setLockOnFinished(src.isLockOnFinished());
-	}
-
 	/**
 	 * Handle upload online instruction files request.
 	 * @param mapping
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 -rdf6ad7b34421631085b2ad7a68fa779c550e6a24
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision df6ad7b34421631085b2ad7a68fa779c550e6a24)
@@ -9,6 +9,9 @@
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
 		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
+		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
+		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml	
+		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml	
 	</param-value>
 </context-param>
 <context-param>
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -r10b6f6f69897fce9306dd8d83c1e44d1322124f8 -rdf6ad7b34421631085b2ad7a68fa779c550e6a24
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 10b6f6f69897fce9306dd8d83c1e44d1322124f8)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision df6ad7b34421631085b2ad7a68fa779c550e6a24)
@@ -8,9 +8,12 @@
 	<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="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
+    <script lang="javascript">
+	    var imgRoot="<%=LAMS_WEB_ROOT%>/images/";
+    </script>
 	<script type="text/javascript" src="<%=LAMS_WEB_ROOT%>/common.js"></script>
-
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/server.js'/>"></script>
+	<script type="text/javascript" src="<%=LAMS_WEB_ROOT%>/includes/javascript/tabcontroller.js"></script>
+	
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
 </head>
 
@@ -29,9 +32,9 @@
 	<!-- table for tab 1 (basic)-->
 	<table border="0" cellspacing="0" cellpadding="0">
 	  <tr>
-		<td><a href="#"  onClick="showTab('b');return false;" ><img src="../images/aqua_tab_s_left.gif" name="tab_left_b" width="8" height="25" border="0" id="tab_left_b"/></a></td>
+		<td><a href="#"  onClick="showTab('b');return false;" ><img src="<%=LAMS_WEB_ROOT%>/images/aqua_tab_s_left.gif" name="tab_left_b" width="8" height="25" border="0" id="tab_left_b"/></a></td>
 		<td class="tab tabcentre_selected" width="90" id="tab_tbl_centre_b"  onClick="showTab('b');return false;" ><a href="#" onClick="showTab('b');return false;" id="b" >Basic</a></td>
-		<td><a href="#" onClick="showTab('b');return false;"><img src="../images/aqua_tab_s_right.gif"  name="tab_right_b" width="8" height="25" border="0" id="tab_right_b"/></a></td>
+		<td><a href="#" onClick="showTab('b');return false;"><img src="<%=LAMS_WEB_ROOT%>/images/aqua_tab_s_right.gif"  name="tab_right_b" width="8" height="25" border="0" id="tab_right_b"/></a></td>
 	  </tr>
 	</table>
 
@@ -40,9 +43,9 @@
 	<!-- table for tab 2 (advanced) -->
 	<table border="0" cellspacing="0" cellpadding="0">
 	  <tr>
-		<td><a href="#" onClick="showTab('a');return false;"><img src="../images/aqua_tab_left.gif" name="tab_left_a" width="8" height="22" border="0" id="tab_left_a" /></a></td>
+		<td><a href="#" onClick="showTab('a');return false;"><img src="<%=LAMS_WEB_ROOT%>/images/aqua_tab_left.gif" name="tab_left_a" width="8" height="22" border="0" id="tab_left_a" /></a></td>
 		<td class="tab tabcentre" width="90" id="tab_tbl_centre_a" onClick="showTab('a');return false;"><a href="#" onClick="showTab('a');return false;" id="a" >Advanced</a></td>
-		<td><a href="#" onClick="showTab('a');return false;"><img src="../images/aqua_tab_right.gif" name="tab_right_a" width="9" height="22" border="0" id="tab_right_a" /></a></td>
+		<td><a href="#" onClick="showTab('a');return false;"><img src="<%=LAMS_WEB_ROOT%>/images/aqua_tab_right.gif" name="tab_right_a" width="9" height="22" border="0" id="tab_right_a" /></a></td>
 	  </tr>
 	</table>
 
@@ -51,9 +54,9 @@
 	<!-- table for ab 3 (instructions) -->
 	<table border="0" cellspacing="0" cellpadding="0">
 	  <tr>
-		<td ><a href="#" onClick="showTab('i');return false;"><img border="0" src="../images/aqua_tab_left.gif" width="8" height="22" id="tab_left_i"   name="tab_left_i" /></a></td>
+		<td ><a href="#" onClick="showTab('i');return false;"><img border="0" src="<%=LAMS_WEB_ROOT%>/images/aqua_tab_left.gif" width="8" height="22" id="tab_left_i"   name="tab_left_i" /></a></td>
 		<td class="tab tabcentre" width="90" id="tab_tbl_centre_i"  onClick="showTab('i');return false;" ><a href="#" onClick="showTab('i');return false;" id="i" >Instructions</a></td>
-		<td ><a href="#" onClick="showTab('i');return false;"><img src="../images/aqua_tab_right.gif"  width="9" height="22" border="0" id="tab_right_i"  name="tab_right_i"/></a></td>
+		<td ><a href="#" onClick="showTab('i');return false;"><img src="<%=LAMS_WEB_ROOT%>/images/aqua_tab_right.gif"  width="9" height="22" border="0" id="tab_right_i"  name="tab_right_i"/></a></td>
 	  </tr>
 	</table>
 
Fisheye: Tag df6ad7b34421631085b2ad7a68fa779c550e6a24 refers to a dead (removed) revision in file `lams_tool_sbmt/web/includes/javascript/server.js'.
Fisheye: No comparison available.  Pass `N' to diff?