Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
diff -u -ra0999444e5cac377c2e02a67a3583c84e8e82ca2 -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -84,6 +84,8 @@
 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.
+
+authoring.save.success=Authoring save success.
 #-------------------------END Authoring Labels END-----------------#
 
 #---------------------------------Monitoring ----------------------------------#
Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r1bbc24766872de253e91283aab5a3ab475913a4b -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 1bbc24766872de253e91283aab5a3ab475913a4b)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -15,7 +15,8 @@
 			scope="session" 
 			parameter="updateContent" 
 			validate="false">
-			<forward name="success" path="/pages/authoring/authoring.jsp" />
+			<forward name="author" path="/pages/authoring/authoring.jsp" />
+			<forward name="monitoring" path="/pages/monitoring/authoring.jsp" />
 		</action>
 		<!-- ==========  Resource Item : URL ========== -->
 		<action path="/authoring/newItemInit"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java
===================================================================
diff -u -r5d0efcab8441b253fc761272cbaeb62aa4f4a4ef -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java	(.../ResourceUserDAO.java)	(revision 5d0efcab8441b253fc761272cbaeb62aa4f4a4ef)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java	(.../ResourceUserDAO.java)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -20,6 +20,10 @@
  */
 package org.lamsfoundation.lams.tool.rsrc.dao;
 
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
+
 public interface ResourceUserDAO extends DAO {
 
+	ResourceUser getUserByUserID(Class<ResourceUser> name, Long userUid);
+
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/BaseDAOHibernate.java
===================================================================
diff -u -r5d0efcab8441b253fc761272cbaeb62aa4f4a4ef -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/BaseDAOHibernate.java	(.../BaseDAOHibernate.java)	(revision 5d0efcab8441b253fc761272cbaeb62aa4f4a4ef)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/BaseDAOHibernate.java	(.../BaseDAOHibernate.java)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -28,7 +28,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.lamsfoundation.lams.tool.rsrc.dao.DAO;
-import org.springframework.orm.ObjectRetrievalFailureException;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
@@ -53,11 +52,6 @@
      */
     public Object getObject(Class clazz, Serializable id) {
         Object o = getHibernateTemplate().get(clazz, id);
-
-        if (o == null) {
-            throw new ObjectRetrievalFailureException(clazz, id);
-        }
-
         return o;
     }
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java
===================================================================
diff -u -r5d0efcab8441b253fc761272cbaeb62aa4f4a4ef -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java	(.../ResourceUserDAOHibernate.java)	(revision 5d0efcab8441b253fc761272cbaeb62aa4f4a4ef)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java	(.../ResourceUserDAOHibernate.java)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -20,9 +20,20 @@
  */
 package org.lamsfoundation.lams.tool.rsrc.dao.hibernate;
 
+import java.util.List;
+
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceUserDAO;
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
 
 
 public class ResourceUserDAOHibernate extends BaseDAOHibernate implements ResourceUserDAO{
+	
+	private static final String FIND_BY_USER_ID = "from " + ResourceUser.class.getName() + " as u where u.userId =?";
+	public ResourceUser getUserByUserID(Class<ResourceUser> name, Long userUid) {
+		List list = this.getHibernateTemplate().find(FIND_BY_USER_ID,userUid);
+		if(list == null || list.size() == 0)
+			return null;
+		return (ResourceUser) list.get(0);
+	}
 
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml
===================================================================
diff -u -r5d0efcab8441b253fc761272cbaeb62aa4f4a4ef -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml	(.../Resource.hbm.xml)	(revision 5d0efcab8441b253fc761272cbaeb62aa4f4a4ef)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml	(.../Resource.hbm.xml)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -123,7 +123,7 @@
             name="resourceItems"
             lazy="true"
             inverse="true"
-            cascade="none"
+            cascade="all"
             sort="unsorted"
             order-by="create_date desc"
         >
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java
===================================================================
diff -u -r2116db454fd0ec719a6deeaacd9d10306d341b93 -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	(.../Resource.java)	(revision 2116db454fd0ec719a6deeaacd9d10306d341b93)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	(.../Resource.java)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -350,7 +350,7 @@
 	 * 
 	 * @hibernate.set lazy="true"
 	 *                inverse="true"
-	 *                cascade="none"
+	 *                cascade="all"
 	 *                order-by="create_date desc"
 	 * @hibernate.collection-key column="resource_uid"
 	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.rsrc.model.ResourceItem"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r6c82746ec6c1edbc3ef793dcf2e93aff7bf758d9 -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 6c82746ec6c1edbc3ef793dcf2e93aff7bf758d9)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -226,7 +226,7 @@
 
 	public ResourceUser getUserByID(Long userUid) {
 		
-		return (ResourceUser) resourceUserDao.getObject(ResourceUser.class,userUid);
+		return (ResourceUser) resourceUserDao.getUserByUserID(ResourceUser.class,userUid);
 		
 	}
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r6c82746ec6c1edbc3ef793dcf2e93aff7bf758d9 -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6c82746ec6c1edbc3ef793dcf2e93aff7bf758d9)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -380,18 +380,19 @@
 	    		if(item.getFileUuid() != null && item.getFileVersionId() != null)
 	    			service.deleteFromRepository(item.getFileUuid(),item.getFileVersionId());
 	    	}
-
-			//initialize attachmentList again
-			attachmentList = getAttachmentList(request);
-			attachmentList.addAll(resource.getAttachments());
-			
 			//**********************************************
 			//finally persist resourcePO again
 			service.saveOrUpdateResource(resourcePO);
+			
+			//initialize attachmentList again
+			attachmentList = getAttachmentList(request);
+			attachmentList.addAll(resource.getAttachments());
 		} catch (Exception e) {
 			log.error(e);
 		}
-		
+
+		ActionMessages messages = new ActionMessages();
+		messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("authoring.save.success"));
     	String mode = (String) request.getSession().getAttribute(ResourceConstants.MODE);
     	if(StringUtils.equals(mode,ResourceConstants.AUTHOR_MODE))
     		return mapping.findForward("author");
@@ -811,7 +812,7 @@
 		if(itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_WEBSITE 
 				||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT
 				||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_FILE){
-			if(itemForm.getFile() == null)
+			if(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/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r22c9fac3e900de26984ff64416f30a373fc05658 -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 22c9fac3e900de26984ff64416f30a373fc05658)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -63,8 +63,7 @@
         } 
         
         function doSubmit(method) {
-        	document.SbmtAuthoringForm.dispatch.value=method;
-        	document.SbmtAuthoringForm.submit();
+        	$("authoringForm").submit();
         }
         
     </script>
@@ -74,7 +73,7 @@
 </head>
 <body onLoad="init()">
 
-<html:form action="authoring/update" method="post"
+<html:form action="authoring/update" method="post" styleId="authoringForm"
 	focus="title"  enctype="multipart/form-data">
 		<html:hidden property="toolContentID"/>
 		<html:hidden property="currentTab" styleId="currentTab" />
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -ra0999444e5cac377c2e02a67a3583c84e8e82ca2 -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -22,7 +22,7 @@
 		<tr>
 			<td>
 			<%@ include file="/common/messages.jsp" %>
-			<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm">
+			<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm"  enctype="multipart/form-data">
 				<input type="hidden" name="instructionList" id="instructionList"/>
 				<input type="hidden" name="itemType" id="itemType" value="2"/>
 				<html:hidden property="itemIndex"/>
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
diff -u -ra0999444e5cac377c2e02a67a3583c84e8e82ca2 -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -24,7 +24,7 @@
 		<tr>
 			<td>
 			<%@ include file="/common/messages.jsp" %>
-			<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm">
+			<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
 				<input type="hidden" name="instructionList" id="instructionList"/>
 				<input type="hidden" name="itemType" id="itemType" value="4"/>
 				<html:hidden property="itemIndex"/>
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -ra0999444e5cac377c2e02a67a3583c84e8e82ca2 -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -24,7 +24,7 @@
 		<tr>
 			<td>
 			<%@ include file="/common/messages.jsp" %>
-			<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm">
+			<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
 				<input type="hidden" name="instructionList" id="instructionList"/>
 				<input type="hidden" name="itemType" id="itemType" value="3"/>
 				<html:hidden property="itemIndex"/>
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -ra0999444e5cac377c2e02a67a3583c84e8e82ca2 -rca5f4ba9be98d3653d3820b885376003c6bf2b55
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
@@ -35,7 +35,7 @@
 				onclick="preview()" class="button">
 		</td>
 		<td width="50px">
-			<input type="button" name="ei"  value="<fmt:message key="label.authoring.basic.resource.edit" />
+			<input type="button" name="ei"  value="<fmt:message key="label.authoring.basic.resource.edit" />"
 				onclick="editItem(${status.index})" class="button">
 		</td>
 		<td width="50px">
@@ -48,7 +48,8 @@
 			<fmt:message key="label.authoring.basic.resource.website" />
 		</td>
 		<td width="50px">
-			<input type="button" name="pi" value="<fmt:message key="label.authoring.basic.resource.preview" />">
+			<input type="button" name="pi" value="<fmt:message key="label.authoring.basic.resource.preview" />"
+				onclick="preview()" class="button">
 		</td>
 		<td width="50px">
 			<input type="button" name="ei"  value="<fmt:message key="label.authoring.basic.resource.edit" />"
@@ -64,11 +65,12 @@
 			<fmt:message key="label.authoring.basic.resource.learning.object" />
 		</td>
 		<td width="50px">
-			<input type="button" name="pi" value="<fmt:message key="label.authoring.basic.resource.preview" />">
+			<input type="button" name="pi" value="<fmt:message key="label.authoring.basic.resource.preview" />"
+				onclick="preview()" class="button">
 		</td>
 		<td width="50px">
 			<input type="button" name="ei"  value="<fmt:message key="label.authoring.basic.resource.edit" />"
-				onclick="editItem(${status.index})" class="button">
+				onclick="editItem(${status.index})" class="	">
 		</td>
 		<td width="50px">
 			<input type="button" name="di" value="<fmt:message key="label.authoring.basic.resource.delete" />"