Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
diff -u -r754e5e666cf510aff7f8f25527987cee00319ee2 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 754e5e666cf510aff7f8f25527987cee00319ee2)
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -84,6 +84,16 @@
 error.resource.item.file.blank = File can not be blank.
 error.resource.item.desc.blank= Description can not be blank
 error.resource.item.invalid.url= Invalid URL format.
+error.upload.failed=Upload file failed: {0}
+error.msg.upload.file.not.found=Could not find upload file {0}.
+error.msg.zip.file.exception=Could not handle zip file when uploading file.
+error.msg.file.not.found=File not found exception occurs when uploading file.
+error.msg.ims.package=Invalid IMS package format.
+error.msg.ims.application=ImscpApplicationException occurs when uploading resource item file.
+error.msg.io.exception=IOException occurs when uploading file.
+error.msg.invaid.param.upload=InvalidParameterException occured while trying to upload File.
+error.msg.repository=Repository occurs exception while trying to upload file.
+error.msg.default.content.not.find=Could not retrieve default content record for this tool.
 
 authoring.save.success=Authoring save successfully.
 #-------------------------END Authoring Labels END-----------------#
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -rf644eb2a669882b4938c6b49bb0441e70bb7adb9 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -59,6 +59,7 @@
 	public static final String ERROR_MSG_DESC_BLANK = "error.resource.item.desc.blank";
 	public static final String ERROR_MSG_FILE_BLANK = "error.resource.item.file.blank";
 	public static final String ERROR_MSG_INVALID_URL = "error.resource.item.invalid.url";
+	public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed";
 	
 	//mode
 	public static final String MODE = "mode";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
===================================================================
diff -u -r0c4f17efc49e7012360fb98ac98b7e4a005fea9f -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -67,7 +67,7 @@
 
         <set
             name="itemInstructions"
-            lazy="true"
+            lazy="false"
             inverse="false"
             cascade="all-delete-orphan"
             sort="unsorted"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
===================================================================
diff -u -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	(.../ResourceItem.java)	(revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	(.../ResourceItem.java)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -135,7 +135,7 @@
 			this.initialItem = initialItem;
 		}
 		/**
-	     * @hibernate.set   lazy="true"
+	     * @hibernate.set   lazy="false"
 	     * 					cascade="all-delete-orphan"
 	     * 					inverse="false"
 	     * 					order-by="sequence_id desc"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
===================================================================
diff -u -r754e5e666cf510aff7f8f25527987cee00319ee2 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision 754e5e666cf510aff7f8f25527987cee00319ee2)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -48,9 +48,9 @@
 
 	List getAuthoredItems(Long resourceUid);
 
-	ResourceAttachment uploadInstructionFile(FormFile file, String type) throws ResourceApplicationException;
+	ResourceAttachment uploadInstructionFile(FormFile file, String type) throws UploadResourceFileException;
 
-	void uploadResourceItemFile(ResourceItem item, FormFile file) throws ResourceApplicationException;
+	void uploadResourceItemFile(ResourceItem item, FormFile file) throws UploadResourceFileException;
 
 	//********** for user methods *************
 	void createUser(ResourceUser resourceUser);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r754e5e666cf510aff7f8f25527987cee00319ee2 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 754e5e666cf510aff7f8f25527987cee00319ee2)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -182,7 +182,7 @@
 	public Resource getDefaultContent(Long contentId) throws ResourceApplicationException {
     	if (contentId == null)
     	{
-    	    String error="Could not retrieve default content id for Shared Resource tool";
+    		String error=messageService.getMessage("error.msg.default.content.not.find");
     	    log.error(error);
     	    throw new ResourceApplicationException(error);
     	}
@@ -200,9 +200,9 @@
 	}
 
 
-	public ResourceAttachment uploadInstructionFile(FormFile uploadFile, String fileType) throws ResourceApplicationException {
+	public ResourceAttachment uploadInstructionFile(FormFile uploadFile, String fileType) throws UploadResourceFileException {
 		if(uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName()))
-			throw new ResourceApplicationException("Could not find upload file: " + uploadFile);
+			throw new UploadResourceFileException(messageService.getMessage("error.msg.upload.file.not.found",new Object[]{uploadFile}));
 		
 		//upload file to repository
 		NodeKey nodeKey = processFile(uploadFile,fileType);
@@ -271,7 +271,7 @@
     	Resource defaultResource = getResourceByContentId(defaultResourceId);
     	if(defaultResource == null)
     	{
-    	    String error="Could not retrieve default content record for this tool";
+    	    String error=messageService.getMessage("error.msg.default.content.not.find");
     	    log.error(error);
     	    throw new ResourceApplicationException(error);
     	}
@@ -284,7 +284,7 @@
     	contentId=new Long(toolService.getToolDefaultContentIdBySignature(toolSignature));    
     	if (contentId == null)
     	{
-    	    String error="Could not retrieve default content id for this tool";
+    		String error=messageService.getMessage("error.msg.default.content.not.find");
     	    log.error(error);
     	    throw new ResourceApplicationException(error);
     	}
@@ -300,44 +300,42 @@
      * @throws RepositoryCheckedException
      * @throws InvalidParameterException
      */
-    private NodeKey processFile(FormFile file, String fileType) throws ResourceApplicationException{
+    private NodeKey processFile(FormFile file, String fileType) throws UploadResourceFileException {
     	NodeKey node = null;
         if (file!= null && !StringUtils.isEmpty(file.getFileName())) {
             String fileName = file.getFileName();
             try {
 				node = resourceToolContentHandler.uploadFile(file.getInputStream(), fileName, 
 				        file.getContentType(), fileType);
 			} catch (InvalidParameterException e) {
-				throw new ResourceApplicationException("InvalidParameterException occured while trying to upload File" + e.getMessage());
+				throw new UploadResourceFileException (messageService.getMessage("error.msg.invaid.param.upload"));
 			} catch (FileNotFoundException e) {
-				throw new ResourceApplicationException("FileNotFoundException occured while trying to upload File" + e.getMessage());
+				throw new UploadResourceFileException (messageService.getMessage("error.msg.file.not.found"));
 			} catch (RepositoryCheckedException e) {
-				throw new ResourceApplicationException("RepositoryCheckedException occured while trying to upload File" + e.getMessage());
+				throw new UploadResourceFileException (messageService.getMessage("error.msg.repository"));
 			} catch (IOException e) {
-				throw new ResourceApplicationException("IOException occured while trying to upload File" + e.getMessage());
+				throw new UploadResourceFileException (messageService.getMessage("error.msg.io.exception"));
 			}
           }
         return node;
     }
-	private NodeKey processPackage(String packageDirectory, String initFile) throws ResourceApplicationException {
+	private NodeKey processPackage(String packageDirectory, String initFile) throws UploadResourceFileException {
 		NodeKey node = null;
 		try {
 			node = resourceToolContentHandler.uploadPackage(packageDirectory, initFile);
 		} catch (InvalidParameterException e) {
-			throw new ResourceApplicationException("InvalidParameterException occured while trying to upload Package:" + e.getMessage());
+			throw new UploadResourceFileException (messageService.getMessage("error.msg.invaid.param.upload"));
 		} catch (RepositoryCheckedException e) {
-			throw new ResourceApplicationException("RepositoryCheckedException occured while trying to upload Package:" + e.getMessage());
+			throw new UploadResourceFileException (messageService.getMessage("error.msg.repository"));
 		}
         return node;
 	}
 
-	public void uploadResourceItemFile(ResourceItem item, FormFile file) throws ResourceApplicationException {
+	public void uploadResourceItemFile(ResourceItem item, FormFile file) throws UploadResourceFileException {
 		try {
 			InputStream is = file.getInputStream();
 			String fileName = file.getFileName();
 			String fileType = file.getContentType();
-			item.setFileType(fileType);
-			item.setFileName(fileName);
 			//For file only upload one sigle file
 			if(item.getType() == ResourceConstants.RESOURCE_TYPE_FILE){
 				NodeKey nodeKey = processFile(file,IToolContentHandler.TYPE_ONLINE);
@@ -368,22 +366,23 @@
 				item.setFileVersionId(nodeKey.getVersion());
 			}
 			// create the package from the directory contents  
-		
+			item.setFileType(fileType);
+			item.setFileName(fileName);
 		} catch (ZipFileUtilException e) {
-			log.error("ZipFileUtilException occurs when Uploading Resource Item :" + e.toString());
-			throw new ResourceApplicationException(e);
+			log.error(messageService.getMessage("error.msg.zip.file.exception") + " : " + e.toString());
+			throw new UploadResourceFileException(messageService.getMessage("error.msg.zip.file.exception"));
 		} catch (FileNotFoundException e) {
-			log.error("FileNotFoundException occurs when Uploading Resource Item:" + e.toString());
-			throw new ResourceApplicationException(e);
+			log.error(messageService.getMessage("error.msg.file.not.found")+":" + e.toString());
+			throw new UploadResourceFileException(messageService.getMessage("error.msg.file.not.found"));
 		} catch (IOException e) {
-			log.error("IOException occurs when Uploading Resource Item:" + e.toString());
-			throw new ResourceApplicationException(e);
+			log.error(messageService.getMessage("error.msg.io.exception")+ ":" + e.toString());
+			throw new UploadResourceFileException(messageService.getMessage("error.msg.io.exception"));
 		} catch (IMSManifestException e) {
-			log.error("IMSManifestException occurs when Uploading Resource Item:" + e.toString());
-			throw new ResourceApplicationException(e);
+			log.error(messageService.getMessage("error.msg.ims.package")+":" + e.toString());
+			throw new UploadResourceFileException(messageService.getMessage("error.msg.ims.package"));
 		} catch (ImscpApplicationException e) {
-			log.error("ImscpApplicationException occurs when Uploading Resource Item:" + e.toString());
-			throw new ResourceApplicationException(e);
+			log.error( messageService.getMessage("error.msg.ims.application")+":" + e.toString());
+			throw new UploadResourceFileException(messageService.getMessage("error.msg.ims.application"));
 		}
 	}
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/UploadResourceFileException.java
===================================================================
diff -u
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/UploadResourceFileException.java	(revision 0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/UploadResourceFileException.java	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -0,0 +1,48 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+/* $$Id$$ */
+package org.lamsfoundation.lams.tool.rsrc.service;
+
+public class UploadResourceFileException extends Exception{
+
+	public UploadResourceFileException() {
+		super();
+		
+	}
+
+	public UploadResourceFileException(String message, Throwable cause) {
+		super(message, cause);
+		
+	}
+
+	public UploadResourceFileException(String message) {
+		super(message);
+		
+	}
+
+	public UploadResourceFileException(Throwable cause) {
+		super(cause);
+		
+	}
+
+}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -rf644eb2a669882b4938c6b49bb0441e70bb7adb9 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -64,6 +64,7 @@
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
 import org.lamsfoundation.lams.tool.rsrc.service.IResourceService;
 import org.lamsfoundation.lams.tool.rsrc.service.ResourceApplicationException;
+import org.lamsfoundation.lams.tool.rsrc.service.UploadResourceFileException;
 import org.lamsfoundation.lams.tool.rsrc.web.form.ResourceForm;
 import org.lamsfoundation.lams.tool.rsrc.web.form.ResourceItemForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -216,7 +217,7 @@
 		
 		ResourceItemForm itemForm = (ResourceItemForm)form;
 		ActionErrors errors = validateResourceItem(itemForm);
-			
+		
 		if(!errors.isEmpty()){
 			this.addErrors(request,errors);
 			request.setAttribute(ResourceConstants.ATTR_INSTRUCTION_LIST,instructionList);
@@ -225,9 +226,14 @@
 		
 		try {
 			extractFormToResourceItem(request, instructionList, itemForm);
-		} catch (ResourceApplicationException e) {
+		} catch (UploadResourceFileException e) {
 			log.error("Uploading failed. The exception is " + e.toString());
-			throw new ServletException(e);
+			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(ResourceConstants.ERROR_MSG_UPLOAD_FAILED,e.getMessage()));
+			if(!errors.isEmpty()){
+				this.addErrors(request,errors);
+				request.setAttribute(ResourceConstants.ATTR_INSTRUCTION_LIST,instructionList);
+				return findForward(itemForm.getItemType(),mapping);
+			}
 		}
 		
 		//return null to close this window
@@ -456,6 +462,8 @@
 			//initialize attachmentList again
 			attachmentList = getAttachmentList(request);
 			attachmentList.addAll(resource.getAttachments());
+			resourceForm.setResource(resourcePO);
+			
 		} catch (Exception e) {
 			log.error(e);
 		}
@@ -513,6 +521,7 @@
 		else
 			file = (FormFile) resourceForm.getOnlineFile();
 		
+		ActionErrors errors = new ActionErrors();
 		try {
 			IResourceService service = getResourceService();
 			//upload to repository
@@ -551,10 +560,14 @@
 				}
 			}
 			list.add(att);
-		} catch (ResourceApplicationException e) {
+		} catch (UploadResourceFileException e) {
 			log.error("Upload instruction attachment failed:" + e.getMessage());
+			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(ResourceConstants.ERROR_MSG_UPLOAD_FAILED,e.getMessage()));
 		}
 		
+		if(!errors.isEmpty())
+			this.addErrors(request,errors);
+		
 		return mapping.findForward(ResourceConstants.SUCCESS);
 
 	}
@@ -794,7 +807,7 @@
 	 * @throws ResourceApplicationException 
 	 */
 	private void extractFormToResourceItem(HttpServletRequest request, List<String> instructionList, ResourceItemForm itemForm) 
-		throws ResourceApplicationException {
+		throws UploadResourceFileException {
 		/* BE CAREFUL: This method will copy nessary info from request form to a old or new ResourceItem instance.
 		 * It gets all info EXCEPT ResourceItem.createDate and ResourceItem.createBy, which need be set when persisting 
 		 * this resource item.
@@ -811,7 +824,51 @@
 		}else //edit
 			item = (ResourceItem) resourceList.get(itemIdx);
 		
+		short type = itemForm.getItemType();	
 		item.setType(itemForm.getItemType());
+		/* Set following fields regards to the type:
+	    item.setFileUuid();
+		item.setFileVersionId();
+		item.setFileType();
+		item.setFileName();
+		
+		item.getInitialItem()
+		item.setImsSchema()
+		item.setOrganizationXml()
+		 */
+		//if the item is edit (not new add) then the getFile may return null
+		//it may throw exception, so put it as first, to avoid other invlidate update: 
+		if(itemForm.getFile() != null){
+			if(type == ResourceConstants.RESOURCE_TYPE_WEBSITE 
+					||type == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT
+					||type == ResourceConstants.RESOURCE_TYPE_FILE){
+				//if it has old file, and upload a new, then save old to deleteList
+				ResourceItem delAttItem = new ResourceItem();
+				boolean hasOld = false;
+				if(item.getFileUuid() != null){
+					hasOld = true;
+					//be careful, This new ResourceItem object never be save into database
+					//just temporarily use for saving fileUuid and versionID use:
+					delAttItem.setFileUuid(item.getFileUuid());
+					delAttItem.setFileVersionId(item.getFileVersionId());
+				}
+				IResourceService service = getResourceService();
+				try {
+					service.uploadResourceItemFile(item, itemForm.getFile());
+				} catch (UploadResourceFileException e) {
+					//if it is new add , then remove it!
+					if(itemIdx == -1){ 
+						resourceList.remove(item);
+					}
+					throw e;
+				}
+				//put it after "upload" to ensure deleted file added into list only no exception happens during upload 
+				if(hasOld){
+					List delAtt = getDeletedItemAttachmentList(request);
+					delAtt.add(delAttItem);
+				}
+			}
+		}
 		item.setTitle(itemForm.getTitle());
 		item.setCreateByAuthor(true);
 		item.setHide(false);
@@ -825,44 +882,15 @@
 			instructions.add(rii);
 		}
 		item.setItemInstructions(instructions);
-		
-		short type = itemForm.getItemType();
+
 		if(type == ResourceConstants.RESOURCE_TYPE_URL){
 			item.setUrl(itemForm.getUrl());
 		}
 		if(type == ResourceConstants.RESOURCE_TYPE_WEBSITE 
 				||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT){
 			item.setDescription(itemForm.getDescription());
 		}
-		/* Set following fields regards to the type:
-		    item.setFileUuid();
-			item.setFileVersionId();
-			item.setFileType();
-			item.setFileName();
-			
-			item.getInitialItem()
-			item.setImsSchema()
-			item.setOrganizationXml()
-		 */
-		//if the item is edit (not new add) then the getFile may return null
-		if(itemForm.getFile() != null){
-			if(type == ResourceConstants.RESOURCE_TYPE_WEBSITE 
-					||type == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT
-					||type == ResourceConstants.RESOURCE_TYPE_FILE){
-				//if it has old file, and upload a new, then save old to deleteList
-				if(item.getFileUuid() != null){
-					List delAtt = getDeletedItemAttachmentList(request);
-					//be careful, This new ResourceItem object never be save into database
-					//just temporarily use for saving fileUuid and versionID use:
-					ResourceItem delAttItem = new ResourceItem();
-					delAttItem.setFileUuid(item.getFileUuid());
-					delAttItem.setFileVersionId(item.getFileVersionId());
-					delAtt.add(delAttItem);
-				}
-				IResourceService service = getResourceService();
-				service.uploadResourceItemFile(item, itemForm.getFile());
-			}
-		}		
+		
 	}
 
 	/**
@@ -890,7 +918,9 @@
 		if(itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_WEBSITE 
 				||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT
 				||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_FILE){
-			if(itemForm.getFile() == null || StringUtils.isEmpty(itemForm.getFile().getFileName()))
+			//for edit validate: file already exist
+			if(!itemForm.isHasFile() &&
+				(itemForm.getFile() == null || StringUtils.isEmpty(itemForm.getFile().getFileName())))
 				errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(ResourceConstants.ERROR_MSG_FILE_BLANK));
 		}
 		return errors;
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java
===================================================================
diff -u -rf644eb2a669882b4938c6b49bb0441e70bb7adb9 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	(.../ResourceForm.java)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	(.../ResourceForm.java)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -90,6 +90,20 @@
         	logger.error("Initial ResourceForum failed by null value of Resource.");
         }
 	}
+    public void reset(ActionMapping mapping, HttpServletRequest request){
+    	String param = mapping.getParameter();
+    	//if it is start page, all data read out from database or current session
+    	//so need not reset checkbox to refresh value!
+    	if(!StringUtils.equals(param,"start") && !StringUtils.equals(param,"initPage")){
+	    	resource.setAllowAddFiles(false);
+	    	resource.setAllowAddUrls(false);
+	    	resource.setLockWhenFinished(false);
+	    	resource.setDefineLater(false);
+	    	resource.setRunAuto(false);
+	    	resource.setRunOffline(false);
+    	}
+    }
+
 	public int getCurrentTab() {
 		return currentTab;
 	}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java
===================================================================
diff -u -r754e5e666cf510aff7f8f25527987cee00319ee2 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java	(.../ResourceItemForm.java)	(revision 754e5e666cf510aff7f8f25527987cee00319ee2)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java	(.../ResourceItemForm.java)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -38,6 +38,7 @@
 	private short itemType;
 	private String description;
 	private String url;
+	//flag of this item has attachment or not
 	private boolean hasFile;
 	private Long fileUuid;
 	private Long fileVersionId;
Index: lams_tool_larsrc/web/common/defaultFrame.jsp
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/web/common/defaultFrame.jsp	(.../defaultFrame.jsp)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_larsrc/web/common/defaultFrame.jsp	(.../defaultFrame.jsp)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -17,7 +17,7 @@
   USA
 
   http://www.gnu.org/licenses/gpl.txt 
--->
+--%>
 <%@ include file="/common/taglibs.jsp" %>
 
 <table bgcolor="#9DC5EC" width="100%" border="0" cellspacing="0" cellpadding="0" align="center" summary="This table is being used for layout purposes only">
Index: lams_tool_larsrc/web/layout/frame.jsp
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/web/layout/frame.jsp	(.../frame.jsp)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_larsrc/web/layout/frame.jsp	(.../frame.jsp)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -17,7 +17,7 @@
   USA
 
   http://www.gnu.org/licenses/gpl.txt 
--->
+--%>
 <%@ include file="/common/taglibs.jsp" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
Index: lams_tool_larsrc/web/pages/authoring/advance.jsp
===================================================================
diff -u -rf644eb2a669882b4938c6b49bb0441e70bb7adb9 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
+++ lams_tool_larsrc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -46,5 +46,4 @@
 				</html:checkbox>
 			</td>
 		</tr>
-		<tr><td colspan="2"><html:errors/></td></tr>
 	</table>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/instructions.jsp
===================================================================
diff -u -rf644eb2a669882b4938c6b49bb0441e70bb7adb9 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
+++ lams_tool_larsrc/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -116,5 +116,4 @@
 				</html:button>
 			</td>
 		</tr>			
-		<tr><td colspan="2"><html:errors/></td></tr>
 		</table>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp
===================================================================
diff -u -rf644eb2a669882b4938c6b49bb0441e70bb7adb9 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision f644eb2a669882b4938c6b49bb0441e70bb7adb9)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -1,5 +1,6 @@
 <%@ include file="/common/taglibs.jsp" %>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+<input type="hidden" name="hasFile" value="${itemAttachment.hasFile}"/>
 <c:choose>
 	<c:when test="${itemAttachment.hasFile}">
 		<table border="0">
Index: lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	(.../navigatortree.jsp)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	(.../navigatortree.jsp)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -17,7 +17,7 @@
   USA
 
   http://www.gnu.org/licenses/gpl.txt 
--->
+--%>
 
 <%@ include file="/common/taglibs.jsp" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_larsrc/web/pages/learningobj/xmltree.xsl
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r80c80183c1497f0ba84e9ab1fa78a2fbb369ef65
--- lams_tool_larsrc/web/pages/learningobj/xmltree.xsl	(.../xmltree.xsl)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_larsrc/web/pages/learningobj/xmltree.xsl	(.../xmltree.xsl)	(revision 80c80183c1497f0ba84e9ab1fa78a2fbb369ef65)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<%-- 
+<!-- 
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 License Information: http://lamsfoundation.org/licensing/lams/2.0/