Index: lams_tool_larsrc/build.xml
===================================================================
diff -u -r65296e0451eae1b3515d347b885318fc0a290e96 -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/build.xml	(.../build.xml)	(revision 65296e0451eae1b3515d347b885318fc0a290e96)
+++ lams_tool_larsrc/build.xml	(.../build.xml)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -313,6 +313,7 @@
 		<mkdir dir="${build.deploy}"/>
 		<mkdir dir="${build.deploy}/lib"/> 
 		<mkdir dir="${build.deploy}/sql"/> 
+		<mkdir dir="${build.deploy}/language"/> 
 		 
 		<copy overwrite="yes" todir="${build.deploy}/sql">
 			<fileset dir="${db.scripts}/">
@@ -340,7 +341,13 @@
 			classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
 		    <classpath refid="deploy.lib.classpath"/>
 		</taskdef>
-
+		<copy overwrite="yes" todir="${build.deploy}/language">
+				<fileset dir="${conf.language.dir}">
+					<include name="*.properties"/>
+					<include name="*.txt"/>
+				</fileset>
+		</copy>	
+		
 		<generateDeployProperties depends="compile" 
 			mode="development" 
 			outputPath="${build.deploy}"
@@ -358,7 +365,17 @@
 			lamsEarPath="${jboss.deploy}"
 			toolContext="${toolContext}"
 			toolWebUri="${product}.war"
-			/>
+			languageFilesPackage="org.lamsfoundation.lams.tool.forum">
+
+			<!-- language files go as a fileset. -->
+			<!-- Not nice but can't work out how to embed them in a tag. -->
+			<fileset dir="${build.deploy}/language">
+				<include name="**/*.properties"/>
+				<include name="**/*.txt"/>
+			</fileset>
+						
+			</generateDeployProperties>
+
 	</target>
 
 	<target name="deploy-tool" depends="create-deploy-package" 
Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
diff -u
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	(revision 0)
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -0,0 +1,201 @@
+# CVS ID: $Id$ #
+# Language strings for the Forum tool.
+# ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
+activity.title=Shared Resources
+activity.description=Sharing resource with others.
+activity.helptext=Uploading your resources to share with others.
+
+tool.display.name=Shared Resources Tool
+tool.description=Tool for sharing resources.
+
+#=========================labels===========================#
+appName  = Shared Resources
+errorPage.title=Error page
+errorPage.heading=Some error occurs when handling your request
+#=========================labels===========================#
+#-------------------------Authoring Labels-----------------#
+label.authoring.heading = Shared Resources
+label.author.title=Shared Resources Authoring
+
+label.authoring.heading.basic=Basic
+label.authoring.heading.advance=Advance
+label.authoring.heading.instructions=Instructions
+
+label.authoring.heading.basic.desc=Basic input information for shared resources
+label.authoring.heading.instructions.desc=Please input online and offline instructions
+label.authoring.heading.advance.desc=Please input advance options for shared resources 
+
+label.authoring.basic.title=Title
+label.authoring.basic.instruction=Instruction
+label.authoring.basic.add.url=Add URL
+label.authoring.basic.add.file=Add Single File
+label.authoring.basic.add.website=Add Shared Website
+label.authoring.basic.add.learning.object=Add Learning Object
+#----- S: Resource ----------
+label.authoring.basic.resource.list.title=Resource List
+
+label.authoring.basic.resource.url=URL:
+label.authoring.basic.resource.file=File:
+label.authoring.basic.resource.website=PACKAGE:
+label.authoring.basic.resource.learning.object=Learning Object:
+
+label.authoring.basic.resource.verify.url=Verify URL
+label.authoring.basic.resource.preview=Preview
+label.authoring.basic.resource.edit=Edit
+label.authoring.basic.resource.delete=Delete
+
+label.authoring.basic.resource.add.instruction=Add Instruction
+label.authoring.basic.resource.instructions=Instructions
+
+label.authoring.basic.resource.title.input=Title
+label.authoring.basic.resource.url.input=URL
+label.authoring.basic.resource.file.input=File
+label.authoring.basic.resource.description.input=Description
+label.authoring.basic.resource.zip.file.input=Zip file:
+
+#----- E: Resource ----------
+
+label.authoring.online.instruction =Online Instructions
+label.authoring.offline.instruction=Offline Instructions
+label.authoring.online.file =Upload online file
+label.authoring.offline.file=Upload offline file
+label.authoring.choosefile.button=Choose file
+label.authoring.upload.online.button=Upload Online
+label.authoring.upload.offline.button=Upload Offline
+label.authoring.online.filelist=Online file list
+label.authoring.offline.filelist=Offline file list
+label.authoring.online.delete=Delete
+label.authoring.offline.delete=Delete
+
+label.authoring.advance.lock.on.finished=Lock on finished
+label.authoring.advance.run.content.auto=Run content automatically (Only avaiable if there's only one resource)
+label.authoring.advance.mini.number.resources.view=Minimum number of resources to view
+label.authoring.advance.allow.learner.add.urls=Allow learners to add URLs
+label.authoring.advance.allow.learner.add.files=Allow learners to add Files
+
+
+label.authoring.save.button=Save
+label.authoring.cancel.button=Cancel
+
+authoring.exception= There is a problem in shared resources authoring page, the reason is {0}
+
+error.resource.item.title.blank = Title can not be blank.
+error.resource.item.url.blank = URL can not be blank.
+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.
+#-------------------------END Authoring Labels END-----------------#
+
+#---------------------------------Monitoring ----------------------------------#
+page.title.monitoring.content.userlist=Summary
+page.title.monitoring.view.user.mark=View user mark
+page.title.monitoring.edit.user.mark=Edit user mark
+page.title.monitoring.view.activity=View Activity
+page.title.monitoring.edit.activity=Edit Activity
+page.title.monitoring.view.instructions=View Instructions
+page.title.monitoring.view.topic=View topic
+page.title.monitoring.statistic=Statistic
+page.title.monitoring.definelater=Forum Tool Define
+
+label.monitoring.edit.activity.cancel=Cancel
+label.monitoring.edit.activity.update=Update
+label.monitoring.edit.activity.edit=Edit
+
+label.monitoring.statistic.average.mark= Average message mark
+lable.monitoring.statistic.total.message=# of total message
+
+message.monitoring.edit.activity.not.editable=This Activity is no longer editable
+#------------------------------End Monitoring ----------------------------------#
+
+## errors
+errors.header=<b class="error">
+errors.footer=</b>
+
+#error.title = System Error!
+error.valueReqd = Value Required
+error.inputFileTooLarge = Input File size is too large!
+error.uploading = error uploading
+error.mark.needNumber= Mark must be int value
+error.mark.invalid.number= Mark is invalid number format
+error.fail.get.forum=No Forum available
+error.title.empty=Title can not be blank
+#General Messages
+message.msg.maxFileSize = Max 250K
+
+##Message
+title.messageTopic.open = Topic Details
+
+title.message.add = Add Message
+title.message.open = View Message
+title.message.reply = Reply Message
+title.message.edit = Edit Message
+title.message.view=Message Board
+title.message.view.topic=View Message
+title.message.delete=Delete Message
+
+message.label.subject = Subject
+message.label.body = Body
+message.label.attachment = Attachment
+message.label.postedOn = Posted On:
+message.label.threadReplies  = Thread Replies
+message.link.reply = Reply
+
+##Labels
+label.open = Open
+label.delete = Delete
+label.download = Download 
+label.view = View
+label.edit = Edit
+label.reply = Reply
+label.done = Done
+label.finish= Finish
+label.newtopic= New Topic
+label.refresh= Refresh
+lable.char.left=Characters left
+label.basic=Basic
+label.advanced=Advanced
+label.instructions=Instructions
+##Buttons
+button.upload = Upload
+button.done = Done
+button.submit = Submit
+button.on = On
+button.off = Off
+button.add = Add
+button.cancel = Cancel
+
+js.error.invalid.number=The input is invalid number format 
+js.error.min.number=The input must be greater than 0 
+js.error.title=The following error(s) occurred:
+
+#not list in spanish yet
+monitoring.tab.summary=Summary
+monitoring.tab.instructions=Instruction
+monitoring.tab.edit.activity=Edit Activity
+
+monitoring.user.post.topic=provides following posts:
+lable.topic.title.comment=Comment
+message.not.avaliable=Not Available
+lable.update.mark=Update mark
+message.assign.mark= Please assign a mark and a comment for the report by 
+message.session.name=Session Name
+message.monitoring.summary.no.users=No users available
+message.view.all.marks=View all marks
+message.download.marks=Download marks
+label.monitoring.summary.view.forum= View forum
+
+#new messages 6/3/06
+message.monitoring.summary.no.session=No Session Available
+
+#new messages 7/3/06
+topic.message.subject.hidden=Message subject hidden
+topic.message.body.hidden=Message body hidden
+label.show=Show
+label.hide=Hide
+
+#new messages 10/3/06
+page.title.monitoring.init=Forum Monitoring
+monitoring.tab.statistics=Statistics
+# NB monitoring.tab.edit.statistics was removed 
+label.save=Save
+label.cancel=Cancel
Fisheye: Tag a0999444e5cac377c2e02a67a3583c84e8e82ca2 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ApplicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/IContentPackageConverter.java
===================================================================
diff -u -r5d0efcab8441b253fc761272cbaeb62aa4f4a4ef -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/IContentPackageConverter.java	(.../IContentPackageConverter.java)	(revision 5d0efcab8441b253fc761272cbaeb62aa4f4a4ef)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/IContentPackageConverter.java	(.../IContentPackageConverter.java)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -32,7 +32,7 @@
  * Note: Classes that implement this interface should be normal POJOS,
  * not singletons. This allows them to have instance data.
  */
-interface IContentPackageConverter {
+public interface IContentPackageConverter {
     
     /**
      * @return Returns the defaultItem.
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/SimpleContentPackageConverter.java
===================================================================
diff -u -r5d0efcab8441b253fc761272cbaeb62aa4f4a4ef -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/SimpleContentPackageConverter.java	(.../SimpleContentPackageConverter.java)	(revision 5d0efcab8441b253fc761272cbaeb62aa4f4a4ef)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/SimpleContentPackageConverter.java	(.../SimpleContentPackageConverter.java)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -47,7 +47,7 @@
  * 
  * @author Fiona Malikoff
  */
-class SimpleContentPackageConverter implements IContentPackageConverter {
+public class SimpleContentPackageConverter implements IContentPackageConverter {
 
 	private Logger log = Logger.getLogger(SimpleContentPackageConverter.class);
 	
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
===================================================================
diff -u -rf3709b5af90ca8439a64e65b0c971bc547b1eb3a -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision f3709b5af90ca8439a64e65b0c971bc547b1eb3a)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -26,19 +26,19 @@
         </id>
 
         <property
-            name="crUuid"
+            name="fileUuid"
             type="java.lang.Long"
             update="true"
             insert="true"
-            column="cr_uuid"
+            column="file_uuid"
         />
 
         <property
-            name="crVersionId"
+            name="fileVersionId"
             type="java.lang.Long"
             update="true"
             insert="true"
-            column="cr_version_id"
+            column="file_version_id"
         />
 
         <property
@@ -154,6 +154,22 @@
             column="item_type"
         />
 
+        <property
+            name="fileType"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="file_type"
+        />
+
+        <property
+            name="fileName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="file_name"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ResourceItem.xml
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
===================================================================
diff -u -rf3709b5af90ca8439a64e65b0c971bc547b1eb3a -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	(.../ResourceItem.java)	(revision f3709b5af90ca8439a64e65b0c971bc547b1eb3a)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	(.../ResourceItem.java)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -48,16 +48,21 @@
 
 	private String organizationXml;
 
-	private Long crUuid;
+	private Long fileUuid;
 
-	private Long crVersionId;
+	private Long fileVersionId;
 
+	private String fileName;
+	
+	private String fileType;
+	
 	private Set itemInstructions;
 	
 	private boolean isHide;
+	private boolean isCreateByAuthor;
+	
 	private Date createDate;
 	private ResourceUser createBy;
-	private boolean isCreateByAuthor;
 	
 //    **********************************************************
 	  	//		Get/Set methods
@@ -76,25 +81,25 @@
 			this.uid = userID;
 		}
 		/**
-		 * @hibernate.property column="cr_uuid"
+		 * @hibernate.property column="file_uuid"
 		 * 
 		 * @return
 		 */
-		public Long getCrUuid() {
-			return crUuid;
+		public Long getFileUuid() {
+			return fileUuid;
 		}
-		public void setCrUuid(Long crUuid) {
-			this.crUuid = crUuid;
+		public void setFileUuid(Long crUuid) {
+			this.fileUuid = crUuid;
 		}
 		/**
-		 * @hibernate.property column="cr_version_id"
+		 * @hibernate.property column="file_version_id"
 		 * @return
 		 */
-		public Long getCrVersionId() {
-			return crVersionId;
+		public Long getFileVersionId() {
+			return fileVersionId;
 		}
-		public void setCrVersionId(Long crVersionId) {
-			this.crVersionId = crVersionId;
+		public void setFileVersionId(Long crVersionId) {
+			this.fileVersionId = crVersionId;
 		}
 		/**
 		 * @hibernate.property column="description"
@@ -227,4 +232,25 @@
 		public void setType(short type) {
 			this.type = type;
 		}
+		  /**
+	     * @hibernate.property column="file_type"
+	     */
+	    public String getFileType() {
+	        return fileType;
+	    }
+
+	    public void setFileType(String type) {
+	        this.fileType = type;
+	    }
+
+	    /**
+	     * @hibernate.property column="file_name"
+	     */
+	    public String getFileName() {
+	        return fileName;
+	    }
+
+	    public void setFileName(String name) {
+	        this.fileName = name;
+	    }
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
===================================================================
diff -u -r65296e0451eae1b3515d347b885318fc0a290e96 -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision 65296e0451eae1b3515d347b885318fc0a290e96)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(.../IResourceService.java)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -28,6 +28,7 @@
 import org.lamsfoundation.lams.contentrepository.IVersionedNode;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment;
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 
 /**
  * @author Dapeng.Ni
@@ -46,5 +47,7 @@
 	Set getAuthoredItems(Long resourceUid);
 
 	ResourceAttachment uploadInstructionFile(FormFile file, String type) throws ResourceApplicationException;
+
+	void uploadResourceItemFile(ResourceItem item, FormFile file) throws ResourceApplicationException;
 }
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r65296e0451eae1b3515d347b885318fc0a290e96 -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 65296e0451eae1b3515d347b885318fc0a290e96)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -21,8 +21,11 @@
  * ***********************************************************************/
 
 package org.lamsfoundation.lams.tool.rsrc.service;
+import java.io.File;
+import java.io.FileFilter;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
@@ -37,6 +40,7 @@
 import org.lamsfoundation.lams.contentrepository.NodeKey;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
+import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
 import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -46,13 +50,18 @@
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceItemDAO;
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceSessionDAO;
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceUserDAO;
+import org.lamsfoundation.lams.tool.rsrc.ims.IContentPackageConverter;
+import org.lamsfoundation.lams.tool.rsrc.ims.IMSManifestException;
 import org.lamsfoundation.lams.tool.rsrc.ims.ImscpApplicationException;
+import org.lamsfoundation.lams.tool.rsrc.ims.SimpleContentPackageConverter;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 import org.lamsfoundation.lams.tool.rsrc.util.ResourceToolContentHandler;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.zipfile.ZipFileUtil;
+import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
 
 /**
  * 
@@ -82,7 +91,7 @@
 		if ( item == null )
 			throw new ResourceApplicationException("Reource item "+itemUid+" not found.");
 
-		return getFile(item.getCrUuid(), item.getCrVersionId(), relPathString);
+		return getFile(item.getFileUuid(), item.getFileVersionId(), relPathString);
 	}
 	
 	
@@ -252,18 +261,116 @@
 				node = resourceToolContentHandler.uploadFile(file.getInputStream(), fileName, 
 				        file.getContentType(), fileType);
 			} catch (InvalidParameterException e) {
-				throw new ResourceApplicationException("FileNotFoundException occured while trying to upload File" + e.getMessage());
+				throw new ResourceApplicationException("InvalidParameterException occured while trying to upload File" + e.getMessage());
 			} catch (FileNotFoundException e) {
 				throw new ResourceApplicationException("FileNotFoundException occured while trying to upload File" + e.getMessage());
 			} catch (RepositoryCheckedException e) {
-				throw new ResourceApplicationException("FileNotFoundException occured while trying to upload File" + e.getMessage());
+				throw new ResourceApplicationException("RepositoryCheckedException occured while trying to upload File" + e.getMessage());
 			} catch (IOException e) {
-				throw new ResourceApplicationException("FileNotFoundException occured while trying to upload File" + e.getMessage());
+				throw new ResourceApplicationException("IOException occured while trying to upload File" + e.getMessage());
 			}
           }
         return node;
     }
+	private NodeKey processPackage(String packageDirectory, String initFile) throws ResourceApplicationException {
+		NodeKey node = null;
+		try {
+			node = resourceToolContentHandler.uploadPackage(packageDirectory, initFile);
+		} catch (InvalidParameterException e) {
+			throw new ResourceApplicationException("InvalidParameterException occured while trying to upload Package:" + e.getMessage());
+		} catch (RepositoryCheckedException e) {
+			throw new ResourceApplicationException("RepositoryCheckedException occured while trying to upload Package:" + e.getMessage());
+		}
+        return node;
+	}
 
+	public void uploadResourceItemFile(ResourceItem item, FormFile file) throws ResourceApplicationException {
+		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);
+				item.setFileUuid(nodeKey.getUuid());
+				item.setFileVersionId(nodeKey.getVersion());
+			}
+			//need unzip upload, and check the initial item :default.htm/html or index.htm/html 
+			if(item.getType() == ResourceConstants.RESOURCE_TYPE_WEBSITE){
+				String packageDirectory = ZipFileUtil.expandZip(is, fileName);
+				String initFile = findWebsiteInitialItem(packageDirectory);
+				item.setInitialItem(initFile);
+				//upload package
+				NodeKey nodeKey = processPackage(packageDirectory,initFile);
+				item.setFileUuid(nodeKey.getUuid());
+				item.setFileVersionId(nodeKey.getVersion());
+			}
+			//need unzip upload, and parse learning object information from XML file. 
+			if(item.getType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT){
+				String packageDirectory = ZipFileUtil.expandZip(is, fileName);
+				IContentPackageConverter cpConverter = new SimpleContentPackageConverter(packageDirectory);
+				String initFile = cpConverter.getDefaultItem();
+				item.setInitialItem(initFile);
+				item.setImsSchema(cpConverter.getSchema());
+				item.setOrganizationXml(cpConverter.getOrganzationXML());
+//				upload package
+				NodeKey nodeKey = processPackage(packageDirectory,initFile);
+				item.setFileUuid(nodeKey.getUuid());
+				item.setFileVersionId(nodeKey.getVersion());
+			}
+			// create the package from the directory contents  
+		
+		} catch (ZipFileUtilException e) {
+			log.error("ZipFileUtilException occurs when Uploading Resource Item :" + e.toString());
+			throw new ResourceApplicationException(e);
+		} catch (FileNotFoundException e) {
+			log.error("FileNotFoundException occurs when Uploading Resource Item:" + e.toString());
+			throw new ResourceApplicationException(e);
+		} catch (IOException e) {
+			log.error("IOException occurs when Uploading Resource Item:" + e.toString());
+			throw new ResourceApplicationException(e);
+		} catch (IMSManifestException e) {
+			log.error("IMSManifestException occurs when Uploading Resource Item:" + e.toString());
+			throw new ResourceApplicationException(e);
+		} catch (ImscpApplicationException e) {
+			log.error("ImscpApplicationException occurs when Uploading Resource Item:" + e.toString());
+			throw new ResourceApplicationException(e);
+		}
+	}
+
+
+	/**
+	 * Find out default.htm/html or index.htm/html in the given directory folder
+	 * @param packageDirectory
+	 * @return
+	 */
+	private String findWebsiteInitialItem(String packageDirectory) {
+		File file = new File(packageDirectory);
+		if(!file.isDirectory())
+			return "";
+		
+		File[] initFiles = file.listFiles(new FileFilter(){
+			public boolean accept(File pathname) {
+				if(pathname == null || pathname.getName() == null)
+					return false;
+				String name = pathname.getName();
+				if(name.endsWith("default.html")
+					||name.endsWith("default.htm")
+					||name.endsWith("index.html")
+					||name.endsWith("index.htm"))
+					return true;
+				return false;
+			}
+		});
+		if(initFiles != null && initFiles.length > 0)
+			return initFiles[0].getName();
+		else
+			return "";
+	}
+
+
 	//*****************************************************************************
 	// set methods for Spring Bean
 	//*****************************************************************************
@@ -298,4 +405,5 @@
 		this.toolService = toolService;
 	}
 
+
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r1bbc24766872de253e91283aab5a3ab475913a4b -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 1bbc24766872de253e91283aab5a3ab475913a4b)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -38,9 +38,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.math.NumberUtils;
-import org.apache.commons.validator.UrlValidator;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionErrors;
@@ -65,8 +63,6 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-import com.sun.org.apache.bcel.internal.generic.Instruction;
-
 /**
  * @author Steve.Ni
  * @version $Revision$
@@ -162,7 +158,21 @@
 		request.setAttribute("instructionList",instructionList);
 		return findForward(type,mapping);
 	}
-	private ActionForward saveOrUpdateItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+	/**
+	 * This method will get necessary information from resource item form and save or update into 
+	 * <code>HttpSession</code> ResourceItemList. Notice, this save is not persist them into database,  
+	 * just save <code>HttpSession</code> temporarily. Only they will be persist when the entire authoring 
+	 * page is being persisted.
+	 *  
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 * @throws ServletException
+	 */
+	private ActionForward saveOrUpdateItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
+		throws ServletException {
 		//get instructions:
 		List<String> instructionList = getInstructionsFromRequest(request);
 		
@@ -175,34 +185,12 @@
 			return findForward(itemForm.getItemType(),mapping);
 		}
 		
-		//check whether it is "edit(old item)" or "add(new item)"
-		List resourceList = getResourceList(request);
-		int itemIdx = NumberUtils.stringToInt(itemForm.getItemIndex(),-1);
-		ResourceItem item;
-		if(itemIdx == -1){
-			item = new ResourceItem();
-			resourceList.add(item);
-		}else
-			item = (ResourceItem) resourceList.get(itemIdx);
-		item.setType(ResourceConstants.RESOURCE_TYPE_URL);
-		item.setTitle(itemForm.getTitle());
-		item.setUrl(itemForm.getUrl());
-//		TODO: set author when persist:need persit the author as well if required
-//		HttpSession ss = SessionManager.getSession();
-//		//get back login user DTO
-//		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		item.setCreateByAuthor(true);
-		item.setHide(false);
-		//set instrcutions
-		Set instructions = new LinkedHashSet();
-		int idx=0;
-		for (String ins : instructionList) {
-			ResourceItemInstruction rii = new ResourceItemInstruction();
-			rii.setDescription(ins);
-			rii.setSequenceId(idx++);
-			instructions.add(rii);
+		try {
+			extractFormToResourceItem(request, instructionList, itemForm);
+		} catch (ResourceApplicationException e) {
+			log.error("Uploading failed. The exception is " + e.toString());
+			throw new ServletException(e);
 		}
-		item.setItemInstructions(instructions);
 		
 		//return null to close this window
 		return mapping.findForward(ResourceConstants.SUCCESS);
@@ -279,7 +267,15 @@
 		request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE_LIST, new ArrayList(item));
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
-
+	/**
+	 * This method will persist all inforamtion in this authoring page, include all resource item, information etc.
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
 	private ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
 		return null;
@@ -601,6 +597,70 @@
 		request.setAttribute(ResourceConstants.ATTR_INSTRUCTION_LIST,instructions);
 		
 	}
+	/**
+	 *
+	 * @param request
+	 * @param instructionList
+	 * @param itemForm
+	 * @throws ResourceApplicationException 
+	 */
+	private void extractFormToResourceItem(HttpServletRequest request, List<String> instructionList, ResourceItemForm itemForm) 
+		throws ResourceApplicationException {
+		/* 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.
+		 */
+		
+		//check whether it is "edit(old item)" or "add(new item)"
+		List resourceList = getResourceList(request);
+		int itemIdx = NumberUtils.stringToInt(itemForm.getItemIndex(),-1);
+		ResourceItem item;
+		if(itemIdx == -1){
+			item = new ResourceItem();
+			resourceList.add(item);
+		}else
+			item = (ResourceItem) resourceList.get(itemIdx);
+		item.setType(itemForm.getItemType());
+		item.setTitle(itemForm.getTitle());
+		item.setCreateByAuthor(true);
+		item.setHide(false);
+		//set instrcutions
+		Set instructions = new LinkedHashSet();
+		int idx=0;
+		for (String ins : instructionList) {
+			ResourceItemInstruction rii = new ResourceItemInstruction();
+			rii.setDescription(ins);
+			rii.setSequenceId(idx++);
+			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(type == ResourceConstants.RESOURCE_TYPE_WEBSITE 
+				||type == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT
+				||type == ResourceConstants.RESOURCE_TYPE_FILE){
+			IResourceService service = getResourceService();
+			service.uploadResourceItemFile(item, itemForm.getFile());
+		}
+		
+	}
 
 	/**
 	 * @param itemForm
Index: lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js
===================================================================
diff -u
--- lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js	(revision 0)
+++ lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -0,0 +1,89 @@
+	/*
+	 This is Resource Item instrcution area.
+	 */
+    var instructionTargetDiv = "instructionArea";
+// Please set these 2 variables in JSP file for using tag reason:
+//    var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
+//    var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
+	function removeInstruction(idx){
+		//var id = "instructionItem" + idx;
+		//Element.remove(id);
+ 		var url= removeInstructionUrl;
+	    var reqIDVar = new Date();
+	    var param = Form.serialize("instructionForm")+"&removeIdx="+idx+"&reqID="+reqIDVar.getTime();
+	    removeInstructionLoading();
+	    var myAjax = new Ajax.Updater(
+		    	instructionTargetDiv,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:removeInstructionComplete,
+		    		evalScripts:true
+		    	}
+	    );
+	}
+	function addInstruction(){
+		var url= addInstructionUrl;
+	    var reqIDVar = new Date();
+	    var param = Form.serialize("instructionForm")+"&reqID="+reqIDVar.getTime();
+		addInstructionLoading();
+	    var myAjax = new Ajax.Updater(
+		    	instructionTargetDiv,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:addInstructionComplete,
+		    		evalScripts:true
+		    	}
+	    );
+	}
+	function upItem(itemIdx){
+		if(itemIdx == 0)
+			return;
+		var currId = "instructionItemDesc" + itemIdx;
+		var repId = "instructionItemDesc" + (--itemIdx);
+		switchValue(currId,repId);
+	}
+	function downItem(itemIdx,maxSize){
+		if(itemIdx == (maxSize -1))
+			return;
+		var currId = "instructionItemDesc" + itemIdx;
+		var repId = "instructionItemDesc" + (++itemIdx);
+		switchValue(currId,repId);
+	}
+	function switchValue(currId,repId){
+		var temp = $(repId).value;
+		$(repId).value =  $(currId).value;
+		$(currId).value= temp;
+	}
+	function removeInstructionLoading(){
+		showBusy(instructionTargetDiv);
+	}
+	function removeInstructionComplete(){
+		hideBusy(instructionTargetDiv);
+	
+	}
+	function addInstructionLoading(){
+		showBusy(instructionTargetDiv);
+	}
+	function addInstructionComplete(){
+		hideBusy(instructionTargetDiv);
+	
+	}
+	function showBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.show(targetDiv+"_Busy");
+		}
+	}
+	function hideBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.hide(targetDiv+"_Busy");
+		}				
+	}
+	
+	function submitResourceItem(){
+		$("instructionList").value = Form.serialize("instructionForm");
+		$(resourceItemForm).submit();
+	}
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
diff -u -r1bbc24766872de253e91283aab5a3ab475913a4b -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 1bbc24766872de253e91283aab5a3ab475913a4b)
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -38,7 +38,7 @@
 		var url = "<c:url value="/authoring/editItemInit.do?itemIndex="/>" + idx +"&reqID="+reqIDVar.getTime();
 		showMessage(url);
 	}
-	
+	//The panel of resource list panel
 	var resourceListTargetDiv = "resourceListArea";
 	function deleteItem(idx){
 		var url = "<c:url value="/authoring/removeItem.do"/>";
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -rf3709b5af90ca8439a64e65b0c971bc547b1eb3a -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision f3709b5af90ca8439a64e65b0c971bc547b1eb3a)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -1 +1,67 @@
-<%@ include file="/common/taglibs.jsp" %>
\ No newline at end of file
+<%@ include file="/common/taglibs.jsp" %>
+<html>
+<head>
+	<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+    <link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
+	<!-- this is the custom CSS for hte tool -->
+	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
+	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/prototype.js'/>"></script>
+	<script type="text/javascript">
+	   <%-- user for  rsrcresourceitem.js --%>
+	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
+       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
+	</script>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
+
+</head>
+<body class="tabpart">
+	<table class="forms">
+		<!-- Basic Info Form-->
+		<tr>
+			<td>
+			<%@ include file="/common/messages.jsp" %>
+			<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm">
+				<input type="hidden" name="instructionList" id="instructionList"/>
+				<input type="hidden" name="itemType" id="itemType" value="2"/>
+				<html:hidden property="itemIndex"/>
+				<table class="innerforms">
+					<tr>
+						<td colspan="2"><h2><fmt:message key="label.authoring.basic.add.file"/></h2></td>
+					</tr>
+					<tr>
+						<td width="130px"><fmt:message key="label.authoring.basic.resource.title.input"/></td>
+						<td><html:text property="title" size="55" tabindex="1" /></td>
+					</tr>
+					<tr>
+						<td width="130px"><fmt:message key="label.authoring.basic.resource.file.input"/></td>
+						<td><html:file tabindex="3" property="file" size="55"  /> </td>
+					</tr>	
+				</table>
+			</html:form>
+			</td>
+		</tr>
+		<tr>
+			<td><hr></td>
+		</tr>
+		<tr>
+			
+			<!-- Instructions -->
+			<td>
+				<table class="innerforms">
+					<tr>
+						<td>
+							<%@ include file="instructions.jsp" %>
+						</td>
+						<td width="100%" align="right" valign="bottom">
+							<input onclick="submitResourceItem()" type="button" name="add" value="<fmt:message key="label.authoring.basic.add.file"/>" class="buttonStyle">
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+
+</body>
+</html>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
diff -u -rf3709b5af90ca8439a64e65b0c971bc547b1eb3a -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision f3709b5af90ca8439a64e65b0c971bc547b1eb3a)
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -1 +1,73 @@
-<%@ include file="/common/taglibs.jsp" %>
\ No newline at end of file
+<%@ include file="/common/taglibs.jsp" %>
+<html>
+<head>
+	<c:set var="lams"><lams:LAMSURL /></c:set>
+	<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+    <link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
+	<!-- this is the custom CSS for hte tool -->
+	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
+	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/prototype.js'/>"></script>
+	<script type="text/javascript">
+	   <%-- user for  rsrcresourceitem.js --%>
+	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
+       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
+	</script>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
+
+</head>
+<body class="tabpart">
+	<table class="forms">
+		<!-- Basic Info Form-->
+		<tr>
+			<td>
+			<%@ include file="/common/messages.jsp" %>
+			<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm">
+				<input type="hidden" name="instructionList" id="instructionList"/>
+				<input type="hidden" name="itemType" id="itemType" value="4"/>
+				<html:hidden property="itemIndex"/>
+				<table class="innerforms">
+					<tr>
+						<td colspan="2"><h2><fmt:message key="label.authoring.basic.add.learning.object"/></h2></td>
+					</tr>
+					<tr>
+						<td width="130px"><fmt:message key="label.authoring.basic.resource.title.input"/></td>
+						<td><html:text property="title" size="55" tabindex="1" /></td>
+					</tr>
+					<tr>
+						<td width="130px"><fmt:message key="label.authoring.basic.resource.description.input"/></td>
+						<td><lams:STRUTS-textarea rows="5" cols="55" tabindex="2" property="description"/> </td>
+					</tr>	
+					<tr>
+						<td width="130px"><fmt:message key="label.authoring.basic.resource.zip.file.input"/></td>
+						<td><html:file tabindex="3" property="file" size="55"  /> </td>
+					</tr>	
+				</table>
+			</html:form>
+			</td>
+		</tr>
+		<tr>
+			<td><hr></td>
+		</tr>
+		<tr>
+			
+			<!-- Instructions -->
+			<td>
+				<table class="innerforms">
+					<tr>
+						<td>
+							<%@ include file="instructions.jsp" %>
+						</td>
+						<td width="100%" align="right" valign="bottom">
+							<input onclick="submitResourceItem()" type="button" name="add" value="<fmt:message key="label.authoring.basic.add.learning.object"/>" class="buttonStyle">
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+
+</body>
+</html>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -r1bbc24766872de253e91283aab5a3ab475913a4b -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 1bbc24766872de253e91283aab5a3ab475913a4b)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -8,92 +8,12 @@
 	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
 	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/prototype.js'/>"></script>
-	
-<script type="text/javascript">
-    var instructionTargetDiv = "instructionArea";
-	function removeInstruction(idx){
-		//var id = "instructionItem" + idx;
-		//Element.remove(id);
- 		var url="<c:url value='/authoring/removeInstruction.do'/>";
-	    var reqIDVar = new Date();
-	    var param = Form.serialize("instructionForm")+"&removeIdx="+idx+"&reqID="+reqIDVar.getTime();
-	    removeInstructionLoading();
-	    var myAjax = new Ajax.Updater(
-		    	instructionTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:removeInstructionComplete,
-		    		evalScripts:true
-		    	}
-	    );
-	}
-	function addInstruction(){
-		var url="<c:url value='/authoring/newInstruction.do'/>";
-	    var reqIDVar = new Date();
-	    var param = Form.serialize("instructionForm")+"&reqID="+reqIDVar.getTime();
-		addInstructionLoading();
-	    var myAjax = new Ajax.Updater(
-		    	instructionTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:addInstructionComplete,
-		    		evalScripts:true
-		    	}
-	    );
-	}
-	function upItem(itemIdx){
-		if(itemIdx == 0)
-			return;
-		var currId = "instructionItemDesc" + itemIdx;
-		var repId = "instructionItemDesc" + (--itemIdx);
-		switchValue(currId,repId);
-	}
-	function downItem(itemIdx,maxSize){
-		if(itemIdx == (maxSize -1))
-			return;
-		var currId = "instructionItemDesc" + itemIdx;
-		var repId = "instructionItemDesc" + (++itemIdx);
-		switchValue(currId,repId);
-	}
-	function switchValue(currId,repId){
-		var temp = $(repId).value;
-		$(repId).value =  $(currId).value;
-		$(currId).value= temp;
-	}
-	function removeInstructionLoading(){
-		showBusy(instructionTargetDiv);
-	}
-	function removeInstructionComplete(){
-		hideBusy(instructionTargetDiv);
-	
-	}
-	function addInstructionLoading(){
-		showBusy(instructionTargetDiv);
-	}
-	function addInstructionComplete(){
-		hideBusy(instructionTargetDiv);
-	
-	}
-	function showBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.show(targetDiv+"_Busy");
-		}
-	}
-	function hideBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.hide(targetDiv+"_Busy");
-		}				
-	}
-	
-	function submitResourceItem(){
-		$("instructionList").value = Form.serialize("instructionForm");
-		$(resourceItemForm).submit();
-	}
-</script>
+    <%-- user for  rsrcresourceitem.js --%>
+	<script type="text/javascript">
+	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
+       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
+	</script>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 
 </head>
 <body class="tabpart">
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -rf3709b5af90ca8439a64e65b0c971bc547b1eb3a -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision f3709b5af90ca8439a64e65b0c971bc547b1eb3a)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -1 +1,73 @@
-<%@ include file="/common/taglibs.jsp" %>
\ No newline at end of file
+<%@ include file="/common/taglibs.jsp" %>
+<html>
+<head>
+	<c:set var="lams"><lams:LAMSURL /></c:set>
+	<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+    <link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
+	<!-- this is the custom CSS for hte tool -->
+	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
+	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/prototype.js'/>"></script>
+	<script type="text/javascript">
+	   <%-- user for  rsrcresourceitem.js --%>
+	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
+       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
+	</script>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
+
+</head>
+<body class="tabpart">
+	<table class="forms">
+		<!-- Basic Info Form-->
+		<tr>
+			<td>
+			<%@ include file="/common/messages.jsp" %>
+			<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="resourceItemForm">
+				<input type="hidden" name="instructionList" id="instructionList"/>
+				<input type="hidden" name="itemType" id="itemType" value="3"/>
+				<html:hidden property="itemIndex"/>
+				<table class="innerforms">
+					<tr>
+						<td colspan="2"><h2><fmt:message key="label.authoring.basic.add.website"/></h2></td>
+					</tr>
+					<tr>
+						<td width="130px"><fmt:message key="label.authoring.basic.resource.title.input"/></td>
+						<td><html:text property="title" size="55" tabindex="1" /></td>
+					</tr>
+					<tr>
+						<td width="130px"><fmt:message key="label.authoring.basic.resource.description.input"/></td>
+						<td><lams:STRUTS-textarea rows="5" cols="55" tabindex="2" property="description"/> </td>
+					</tr>	
+					<tr>
+						<td width="130px"><fmt:message key="label.authoring.basic.resource.zip.file.input"/></td>
+						<td><html:file tabindex="3" property="file" size="55"  /> </td>
+					</tr>	
+				</table>
+			</html:form>
+			</td>
+		</tr>
+		<tr>
+			<td><hr></td>
+		</tr>
+		<tr>
+			
+			<!-- Instructions -->
+			<td>
+				<table class="innerforms">
+					<tr>
+						<td>
+							<%@ include file="instructions.jsp" %>
+						</td>
+						<td width="100%" align="right" valign="bottom">
+							<input onclick="submitResourceItem()" type="button" name="add" value="<fmt:message key="label.authoring.basic.add.website"/>" class="buttonStyle">
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+
+</body>
+</html>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp
===================================================================
diff -u -r1bbc24766872de253e91283aab5a3ab475913a4b -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 1bbc24766872de253e91283aab5a3ab475913a4b)
+++ lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -15,7 +15,7 @@
 		<c:forEach var="item" items="${instructionList}" varStatus="status">
 			<tr id="instructionItem${status.index}">
 				<td width="10px">${status.index+1}</td>
-				<td width="100px"><input type="text" name="instructionItemDesc${status.index}" id="name="instructionItemDesc${status.index}"" size="70" value="${item}"></td>
+				<td width="100px"><input type="text" name="instructionItemDesc${status.index}" id="instructionItemDesc${status.index}" size="70" value="${item}"></td>
 				<td width="40px">
 					<a href="javascript:;" onclick="upItem('${status.index}')">
 						<img src="<html:rewrite page='/includes/images/uparrow.gif'/>" border="0">
@@ -37,6 +37,7 @@
 	</form>
 </div>
 
+<%-- This script will adjust resource item input area height according to the new instruction item amount. --%>
 <script type="text/javascript">
 	$("instructionCount").value="${listSize}";
 	var obj = window.top.document.getElementById('reourceInputArea');
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r1bbc24766872de253e91283aab5a3ab475913a4b -ra0999444e5cac377c2e02a67a3583c84e8e82ca2
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 1bbc24766872de253e91283aab5a3ab475913a4b)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
@@ -79,6 +79,7 @@
 </c:forEach>
 </table>
 </div>
+<%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
 	window.top.hideMessage();
 	var obj = window.top.document.getElementById('resourceListArea');