Index: lams_tool_larsrc/.classpath
===================================================================
diff -u -r7aeb528c89386d6a2aaef95b4d99d47612c8f734 -ra20a8a284fe4d12369cefbec952022b58f437811
--- lams_tool_larsrc/.classpath	(.../.classpath)	(revision 7aeb528c89386d6a2aaef95b4d99d47612c8f734)
+++ lams_tool_larsrc/.classpath	(.../.classpath)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
@@ -25,5 +25,5 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
 	<classpathentry kind="var" path="JBOSS_HOME/common/lib/log4j.jar"/>
-	<classpathentry kind="output" path="web/WEB-INF/classes"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
Index: lams_tool_larsrc/build.properties
===================================================================
diff -u -r3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60 -ra20a8a284fe4d12369cefbec952022b58f437811
--- lams_tool_larsrc/build.properties	(.../build.properties)	(revision 3fe05cc69b1d0cfa2cb494a4778a8ab00dec2d60)
+++ lams_tool_larsrc/build.properties	(.../build.properties)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
@@ -13,7 +13,7 @@
 weblib=lib
 
 #project version
-tool.version=20090115
+tool.version=20090818
 
 # hide tool option
 hideTool=false
Index: lams_tool_larsrc/build.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -ra20a8a284fe4d12369cefbec952022b58f437811
--- lams_tool_larsrc/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_tool_larsrc/build.xml	(.../build.xml)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
@@ -503,12 +503,6 @@
         		<include name="**/*.*"/>
         	</fileset>
         </copy>
-        <copy verbose="yes" todir="${jboss.deploy}/${product}.war/WEB-INF/classes">
-	    	<fileset dir="${build.classes.java}">
-	    		<include name="**/*.properties"/>
-	    		<include name="**/*.xml"/>
-	    	</fileset>
-        </copy>
     </target>
 
 	<!-- end tasks **************************************************************************************************-->
Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -raf0f333826569e48655569fbf9c8b13decd475b0 -ra20a8a284fe4d12369cefbec952022b58f437811
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision af0f333826569e48655569fbf9c8b13decd475b0)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
@@ -155,6 +155,15 @@
 			scope="request">
 			<forward name="success" path="/pages/authoring/pedagogicalPlannerForm.jsp" />
 		</action>
+		<action path="/authoring/switchResourceItemPosition"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
+			name="resourceItemForm" 
+			validate="false"
+			parameter="switchResourceItemPosition"
+			scope="request">
+			<forward name="success" path="/pages/authoring/parts/itemlist.jsp" />
+		</action>
+		
 		<!-- ==========  Display Item  ========== -->
 		<action path="/reviewItem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.ViewItemAction"
Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql
===================================================================
diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -ra20a8a284fe4d12369cefbec952022b58f437811
--- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	(.../create_lams_tool_rsrc.sql)	(revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
+++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql	(.../create_lams_tool_rsrc.sql)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
@@ -66,6 +66,7 @@
    open_url_new_window tinyint,
    resource_uid bigint,
    session_uid bigint,
+   order_id integer,
    primary key (uid)
 )type=innodb;
 create table tl_larsrc11_item_log (
@@ -117,8 +118,8 @@
  `allow_add_urls`, `mini_view_resource_number`, `allow_auto_run`,`reflect_on_activity`) VALUES
   (1,NULL,NULL,NULL,'Resources','0','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0);
   
-INSERT INTO `tl_larsrc11_resource_item` (`uid`, `file_uuid`, `file_version_id`, `description`, `ims_schema`, `init_item`, `organization_xml`, `title`, `url`, `create_by`, `create_date`, `create_by_author`, `is_hide`, `item_type`, `file_type`, `file_name`, `open_url_new_window`, `resource_uid`, `session_uid`) VALUES 
-  (1,NULL,NULL,NULL,NULL,NULL,NULL,'Web Search','http://www.google.com ',null,NOW(),1,0,1,NULL,NULL,0,1,NULL);
+INSERT INTO `tl_larsrc11_resource_item` (`uid`, `file_uuid`, `file_version_id`, `description`, `ims_schema`, `init_item`, `organization_xml`, `title`, `url`, `create_by`, `create_date`, `create_by_author`, `is_hide`, `item_type`, `file_type`, `file_name`, `open_url_new_window`, `resource_uid`, `session_uid`, `order_id`) VALUES 
+  (1,NULL,NULL,NULL,NULL,NULL,NULL,'Web Search','http://www.google.com ',null,NOW(),1,0,1,NULL,NULL,0,1,NULL, 1);
 INSERT INTO `tl_larsrc11_item_instruction` (`uid`, `description`, `sequence_id`, `item_uid`) VALUES 
   (1,'Use Google to search the web',0,1);
     
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20090818_updateFrom231.sql
===================================================================
diff -u
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20090818_updateFrom231.sql	(revision 0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20090818_updateFrom231.sql	(revision a20a8a284fe4d12369cefbec952022b58f437811)
@@ -0,0 +1,15 @@
+-- SQL statements to update from LAMS 2.3.1
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-2421 Adding sorting for resource items
+ALTER TABLE tl_larsrc11_resource_item ADD COLUMN order_id integer DEFAULT NULL;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
===================================================================
diff -u -r920894ca746cba5e080023c5cc80167d64d1653d -ra20a8a284fe4d12369cefbec952022b58f437811
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
@@ -178,6 +178,14 @@
             column="open_url_new_window"
         />
 
+        <property
+            name="orderId"
+            type="java.lang.Integer"
+            update="true"
+            insert="true"
+            column="order_id"
+        />
+
         <!--
             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 -r920894ca746cba5e080023c5cc80167d64d1653d -ra20a8a284fe4d12369cefbec952022b58f437811
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	(.../ResourceItem.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	(.../ResourceItem.java)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
@@ -33,282 +33,326 @@
 
 /**
  * Resource
+ * 
  * @author Dapeng Ni
- *
- * @hibernate.class  table="tl_larsrc11_resource_item"
- *
+ * 
+ * @hibernate.class table="tl_larsrc11_resource_item"
+ * 
  */
-public class ResourceItem  implements Cloneable{
-	private static final Logger log = Logger.getLogger(ResourceItem.class);
-	
-	private Long uid;
-	//Resource Type:1=URL,2=File,3=Website,4=Learning Object
-	private short type;
-	
-	private String title;
+public class ResourceItem implements Cloneable {
+    private static final Logger log = Logger.getLogger(ResourceItem.class);
 
-	private String description;
-	
-	private String url;
-	
-	private boolean openUrlNewWindow;
+    private Long uid;
+    // Resource Type:1=URL,2=File,3=Website,4=Learning Object
+    private short type;
 
-	private String imsSchema;
+    private String title;
 
-	private String initialItem;
+    private String description;
 
-	private String organizationXml;
+    private String url;
 
-	private Long fileUuid;
+    private boolean openUrlNewWindow;
 
-	private Long fileVersionId;
+    private String imsSchema;
 
-	private String fileName;
-	
-	private String fileType;
-	
-	private Set itemInstructions;
-	
-	private boolean isHide;
-	private boolean isCreateByAuthor;
-	
-	private Date createDate;
-	private ResourceUser createBy;
-	
-	//***********************************************
-	//DTO fields:
-	private boolean complete;
-	
-    public Object clone(){
-    	ResourceItem obj = null;
-		try {
-			obj = (ResourceItem) super.clone();
-//			clone attachment
-  			if(itemInstructions != null){
-  				Iterator iter = itemInstructions.iterator();
-  				Set set = new HashSet();
-  				while(iter.hasNext()){
-  					ResourceItemInstruction instruct = (ResourceItemInstruction)iter.next(); 
-  					ResourceItemInstruction newInsruct = (ResourceItemInstruction) instruct.clone();
-					set.add(newInsruct);
-  				}
-  				obj.itemInstructions = set;
-  			}
-			((ResourceItem)obj).setUid(null);
-  			//clone ReourceUser as well
-  			if(this.createBy != null)
-  				((ResourceItem)obj).setCreateBy((ResourceUser) this.createBy.clone());
-  			
-		} catch (CloneNotSupportedException e) {
-			log.error("When clone " + ResourceItem.class + " failed");
+    private String initialItem;
+
+    private String organizationXml;
+
+    private Long fileUuid;
+
+    private Long fileVersionId;
+
+    private String fileName;
+
+    private String fileType;
+
+    private Set itemInstructions;
+
+    private Integer orderId;
+
+    private boolean isHide;
+    private boolean isCreateByAuthor;
+
+    private Date createDate;
+    private ResourceUser createBy;
+
+    // ***********************************************
+    // DTO fields:
+    private boolean complete;
+
+    public Object clone() {
+	ResourceItem obj = null;
+	try {
+	    obj = (ResourceItem) super.clone();
+	    // clone attachment
+	    if (itemInstructions != null) {
+		Iterator iter = itemInstructions.iterator();
+		Set set = new HashSet();
+		while (iter.hasNext()) {
+		    ResourceItemInstruction instruct = (ResourceItemInstruction) iter.next();
+		    ResourceItemInstruction newInsruct = (ResourceItemInstruction) instruct.clone();
+		    set.add(newInsruct);
 		}
-		
-		return obj;
-	}	
-//    **********************************************************
-	  	//		Get/Set methods
-//	  **********************************************************
-		/**
-		 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
-		 * @return Returns the uid.
-		 */
-		public Long getUid() {
-			return uid;
-		}
-		/**
-		 * @param uid The uid to set.
-		 */
-		public void setUid(Long userID) {
-			this.uid = userID;
-		}
-		/**
-		 * @hibernate.property column="file_uuid"
-		 * 
-		 * @return
-		 */
-		public Long getFileUuid() {
-			return fileUuid;
-		}
-		public void setFileUuid(Long crUuid) {
-			this.fileUuid = crUuid;
-		}
-		/**
-		 * @hibernate.property column="file_version_id"
-		 * @return
-		 */
-		public Long getFileVersionId() {
-			return fileVersionId;
-		}
-		public void setFileVersionId(Long crVersionId) {
-			this.fileVersionId = crVersionId;
-		}
-		/**
-		 * @hibernate.property column="description"
-		 * @return
-		 */
-		public String getDescription() {
-			return description;
-		}
-		public void setDescription(String description) {
-			this.description = description;
-		}
-		/**
-		 * @hibernate.property column="ims_schema"
-		 * @return
-		 */
-		public String getImsSchema() {
-			return imsSchema;
-		}
-		public void setImsSchema(String imsSchema) {
-			this.imsSchema = imsSchema;
-		}
-		/**
-		 * @hibernate.property column="init_item"
-		 * @return
-		 */
-		public String getInitialItem() {
-			return initialItem;
-		}
-		public void setInitialItem(String initialItem) {
-			this.initialItem = initialItem;
-		}
-		/**
-	     * @hibernate.set   lazy="false"
-	     * 					cascade="all-delete-orphan"
-	     * 					inverse="false"
-	     * 					order-by="sequence_id asc"
-	     * @hibernate.collection-key column="item_uid"
-	     * @hibernate.collection-one-to-many
-	     * 			class="org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction"
-	     * @return
-		 */
-		public Set getItemInstructions() {
-			return itemInstructions;
-		}
-		public void setItemInstructions(Set itemInstructions) {
-			this.itemInstructions = itemInstructions;
-		}
-		/**
-		 * @hibernate.property
-	     *	column="organization_xml"
-	     *  length="65535"
-		 * @return
-		 */
-		public String getOrganizationXml() {
-			return organizationXml;
-		}
-		public void setOrganizationXml(String organizationXml) {
-			this.organizationXml = organizationXml;
-		}
-		/**
-		 * @hibernate.property column="title" length="255"
-		 * @return
-		 */
-		public String getTitle() {
-			return title;
-		}
-		public void setTitle(String title) {
-			this.title = title;
-		}
-		/**
-		 * @hibernate.property column="url" length="65535"
-		 * @return
-		 */
-		public String getUrl() {
-			return url;
-		}
-		public void setUrl(String url) {
-			this.url = url;
-		}
-		/**
-	     * @hibernate.many-to-one
-	     *     cascade="none"
-	     * 		column="create_by"
-		 * 
-		 * @return
-		 */
-		public ResourceUser getCreateBy() {
-			return createBy;
-		}
-		public void setCreateBy(ResourceUser createBy) {
-			this.createBy = createBy;
-		}
-		/**
-		 * @hibernate.property column="create_date" 
-		 * @return
-		 */
-		public Date getCreateDate() {
-			return createDate;
-		}
-		public void setCreateDate(Date createDate) {
-			this.createDate = createDate;
-		}
-		/**
-		 * @hibernate.property column="create_by_author" 
-		 * @return
-		 */
-		public boolean isCreateByAuthor() {
-			return isCreateByAuthor;
-		}
-		public void setCreateByAuthor(boolean isCreateByAuthor) {
-			this.isCreateByAuthor = isCreateByAuthor;
-		}
-		/**
-		 * @hibernate.property column="is_hide" 
-		 * @return
-		 */
-		public boolean isHide() {
-			return isHide;
-		}
-		public void setHide(boolean isHide) {
-			this.isHide = isHide;
-		}
-		/**
-		 * @hibernate.property column="item_type" 
-		 * @return
-		 */
-		public short getType() {
-			return type;
-		}
-		public void setType(short type) {
-			this.type = type;
-		}
-		  /**
-	     * @hibernate.property column="file_type"
-	     */
-	    public String getFileType() {
-	        return fileType;
+		obj.itemInstructions = set;
 	    }
+	    ((ResourceItem) obj).setUid(null);
+	    // clone ReourceUser as well
+	    if (this.createBy != null)
+		((ResourceItem) obj).setCreateBy((ResourceUser) this.createBy.clone());
 
-	    public void setFileType(String type) {
-	        this.fileType = type;
-	    }
+	} catch (CloneNotSupportedException e) {
+	    log.error("When clone " + ResourceItem.class + " failed");
+	}
 
-	    /**
-	     * @hibernate.property column="file_name"
-	     */
-	    public String getFileName() {
-	        return fileName;
-	    }
+	return obj;
+    }
 
-	    public void setFileName(String name) {
-	        this.fileName = name;
-	    }
-	    /**
-	     * @hibernate.property  column="open_url_new_window" 
-	     * @return
-	     */
-	    public boolean isOpenUrlNewWindow() {
-	    	return openUrlNewWindow;
-	    }
-	    public void setOpenUrlNewWindow(boolean openUrlNewWindow) {
-	    	this.openUrlNewWindow = openUrlNewWindow;
-	    }
-	    
-		public void setComplete(boolean complete) {
-			this.complete=complete;
-		}
-		public boolean isComplete() {
-			return complete;
-		}
+    // **********************************************************
+    // Get/Set methods
+    // **********************************************************
+    /**
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
+     * @return Returns the uid.
+     */
+    public Long getUid() {
+	return uid;
+    }
+
+    /**
+     * @param uid
+     *            The uid to set.
+     */
+    public void setUid(Long userID) {
+	this.uid = userID;
+    }
+
+    /**
+     * @hibernate.property column="file_uuid"
+     * 
+     * @return
+     */
+    public Long getFileUuid() {
+	return fileUuid;
+    }
+
+    public void setFileUuid(Long crUuid) {
+	this.fileUuid = crUuid;
+    }
+
+    /**
+     * @hibernate.property column="file_version_id"
+     * @return
+     */
+    public Long getFileVersionId() {
+	return fileVersionId;
+    }
+
+    public void setFileVersionId(Long crVersionId) {
+	this.fileVersionId = crVersionId;
+    }
+
+    /**
+     * @hibernate.property column="description"
+     * @return
+     */
+    public String getDescription() {
+	return description;
+    }
+
+    public void setDescription(String description) {
+	this.description = description;
+    }
+
+    /**
+     * @hibernate.property column="ims_schema"
+     * @return
+     */
+    public String getImsSchema() {
+	return imsSchema;
+    }
+
+    public void setImsSchema(String imsSchema) {
+	this.imsSchema = imsSchema;
+    }
+
+    /**
+     * @hibernate.property column="init_item"
+     * @return
+     */
+    public String getInitialItem() {
+	return initialItem;
+    }
+
+    public void setInitialItem(String initialItem) {
+	this.initialItem = initialItem;
+    }
+
+    /**
+     * @hibernate.set lazy="false" cascade="all-delete-orphan" inverse="false"
+     *                order-by="sequence_id asc"
+     * @hibernate.collection-key column="item_uid"
+     * @hibernate.collection-one-to-many 
+     *                                   class="org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction"
+     * @return
+     */
+    public Set getItemInstructions() {
+	return itemInstructions;
+    }
+
+    public void setItemInstructions(Set itemInstructions) {
+	this.itemInstructions = itemInstructions;
+    }
+
+    /**
+     * @hibernate.property column="organization_xml" length="65535"
+     * @return
+     */
+    public String getOrganizationXml() {
+	return organizationXml;
+    }
+
+    public void setOrganizationXml(String organizationXml) {
+	this.organizationXml = organizationXml;
+    }
+
+    /**
+     * @hibernate.property column="title" length="255"
+     * @return
+     */
+    public String getTitle() {
+	return title;
+    }
+
+    public void setTitle(String title) {
+	this.title = title;
+    }
+
+    /**
+     * @hibernate.property column="url" length="65535"
+     * @return
+     */
+    public String getUrl() {
+	return url;
+    }
+
+    public void setUrl(String url) {
+	this.url = url;
+    }
+
+    /**
+     * @hibernate.many-to-one cascade="none" column="create_by"
+     * 
+     * @return
+     */
+    public ResourceUser getCreateBy() {
+	return createBy;
+    }
+
+    public void setCreateBy(ResourceUser createBy) {
+	this.createBy = createBy;
+    }
+
+    /**
+     * @hibernate.property column="create_date"
+     * @return
+     */
+    public Date getCreateDate() {
+	return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+	this.createDate = createDate;
+    }
+
+    /**
+     * @hibernate.property column="create_by_author"
+     * @return
+     */
+    public boolean isCreateByAuthor() {
+	return isCreateByAuthor;
+    }
+
+    public void setCreateByAuthor(boolean isCreateByAuthor) {
+	this.isCreateByAuthor = isCreateByAuthor;
+    }
+
+    /**
+     * @hibernate.property column="is_hide"
+     * @return
+     */
+    public boolean isHide() {
+	return isHide;
+    }
+
+    public void setHide(boolean isHide) {
+	this.isHide = isHide;
+    }
+
+    /**
+     * @hibernate.property column="item_type"
+     * @return
+     */
+    public short getType() {
+	return type;
+    }
+
+    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;
+    }
+
+    /**
+     * @hibernate.property column="open_url_new_window"
+     * @return
+     */
+    public boolean isOpenUrlNewWindow() {
+	return openUrlNewWindow;
+    }
+
+    public void setOpenUrlNewWindow(boolean openUrlNewWindow) {
+	this.openUrlNewWindow = openUrlNewWindow;
+    }
+    
+    /**
+     * @hibernate.property column="order_id"
+     * @return
+     */
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    public void setComplete(boolean complete) {
+	this.complete = complete;
+    }
+
+    public boolean isComplete() {
+	return complete;
+    }
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/util/ResourceItemComparator.java
===================================================================
diff -u -rba48f6e190634453f82c64697e9c46f24d4bee80 -ra20a8a284fe4d12369cefbec952022b58f437811
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/util/ResourceItemComparator.java	(.../ResourceItemComparator.java)	(revision ba48f6e190634453f82c64697e9c46f24d4bee80)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/util/ResourceItemComparator.java	(.../ResourceItemComparator.java)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
@@ -12,12 +12,19 @@
 public class ResourceItemComparator implements Comparator<ResourceItem> {
 
     public int compare(ResourceItem o1, ResourceItem o2) {
-	if (o1 != null && o2 != null & o1.getCreateDate() != null && o2.getCreateDate() != null) {
+    
+	if (o1 != null && o2 != null & o1.getOrderId() != null && o2.getOrderId() != null){
+	    if (o1.getOrderId() > o2.getOrderId()) {
+		return 1;
+	    } else {
+		return -1;
+	    }
+	}
+	else if (o1 != null && o2 != null & o1.getCreateDate() != null && o2.getCreateDate() != null) {
 	    return (o1.getCreateDate().getTime() - o2.getCreateDate().getTime()) > 0 ? 1 : -1;
 	} else if (o1 != null)
 	    return 1;
 	else
 	    return -1;
     }
-
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -rba48f6e190634453f82c64697e9c46f24d4bee80 -ra20a8a284fe4d12369cefbec952022b58f437811
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision ba48f6e190634453f82c64697e9c46f24d4bee80)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
@@ -177,6 +177,9 @@
 	if (param.equals("saveOrUpdatePedagogicalPlannerForm")) {
 	    return saveOrUpdatePedagogicalPlannerForm(mapping, form, request, response);
 	}
+	if (param.equals("switchResourceItemPosition")) {
+	    return switchResourceItemPosition(mapping, form, request, response);
+	}
 
 	return mapping.findForward(ResourceConstants.ERROR);
     }
@@ -458,6 +461,16 @@
 	SortedSet<ResourceItem> resourceItemList = getResourceItemList(sessionMap);
 	resourceItemList.clear();
 	resourceItemList.addAll(items);
+	
+	
+	// If there is no order id, set it up
+	int i = 1;
+	for (ResourceItem resourceItem : resourceItemList) {
+	    if (resourceItem.getOrderId() == null || resourceItem.getOrderId() != i) {
+		resourceItem.setOrderId(i);
+	    }
+	    i++;
+	}
 
 	sessionMap.put(ResourceConstants.ATTR_RESOURCE_FORM, resourceForm);
 	return mapping.findForward(ResourceConstants.SUCCESS);
@@ -540,7 +553,7 @@
 		// get back UID
 		resourcePO.setUid(uid);
 	    } else { // if it is Teacher, then just update basic tab content
-		     // (definelater)
+		// (definelater)
 		resourcePO.setInstructions(resource.getInstructions());
 		resourcePO.setTitle(resource.getTitle());
 		// change define later status
@@ -1046,6 +1059,7 @@
 	if (itemIdx == -1) { // add
 	    item = new ResourceItem();
 	    item.setCreateDate(new Timestamp(new Date().getTime()));
+	    item.setOrderId(resourceList.size() + 1);
 	    resourceList.add(item);
 	} else { // edit
 	    List<ResourceItem> rList = new ArrayList<ResourceItem>(resourceList);
@@ -1349,4 +1363,35 @@
 	plannerForm.setFileVersion(insertIndex, null);
 	return mapping.findForward(ResourceConstants.SUCCESS);
     }
+
+    private ActionForward switchResourceItemPosition(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+
+	String sessionMapID = WebUtil.readStrParam(request, "sessionMapID");
+	int resourceItemOrderID1 = WebUtil.readIntParam(request, "resourceItemOrderID1");
+	int resourceItemOrderID2 = WebUtil.readIntParam(request, "resourceItemOrderID2");
+
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	// check whether it is "edit(old item)" or "add(new item)"
+	SortedSet<ResourceItem> resourceList = getResourceItemList(sessionMap);
+
+	for (ResourceItem item : resourceList) {
+	    if (item.getOrderId() == resourceItemOrderID1) {
+		item.setOrderId(resourceItemOrderID2);
+		continue;
+	    }
+	    if (item.getOrderId() == resourceItemOrderID2) {
+		item.setOrderId(resourceItemOrderID1);
+		continue;
+	    }
+	}
+
+	SortedSet<ResourceItem> newItems = new TreeSet<ResourceItem>(new ResourceItemComparator());
+	newItems.addAll(resourceList);
+	sessionMap.put(ResourceConstants.ATTR_RESOURCE_ITEM_LIST, newItems);
+	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+
+	// return null to close this window
+	return mapping.findForward(ResourceConstants.SUCCESS);
+    }
+
 }
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
diff -u -rdce733c3ba2918b8f6f7a5c0bf2b0db48826e39a -ra20a8a284fe4d12369cefbec952022b58f437811
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision dce733c3ba2918b8f6f7a5c0bf2b0db48826e39a)
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
@@ -72,6 +72,25 @@
 		hideBusy(resourceListTargetDiv);
 	}
 
+	function switchItem(resourceItemOrderID1, resourceItemOrderID2, sessionMapID) {
+		resourceItemOrderID1++;
+		resourceItemOrderID2++;
+		
+		var url = "<c:url value="/authoring/switchResourceItemPosition.do"/>";
+		var param = "sessionMapID=" + sessionMapID + "&resourceItemOrderID1=" + resourceItemOrderID1 + "&resourceItemOrderID2=" + resourceItemOrderID2;
+		deleteItemLoading();
+		var myAjax = new Ajax.Updater(
+	    	resourceListTargetDiv,
+	    	url,
+	    	{
+	    		method:'get',
+	    		parameters:param,
+	    		onComplete:deleteItemComplete,
+	    		evalScripts:true
+	    	}
+	    );
+	}
+
 </script>
 <!-- Basic Tab Content -->
 <table>
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -ra20a8a284fe4d12369cefbec952022b58f437811
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
@@ -12,10 +12,10 @@
 		<img src="${ctxPath}/includes/images/indicator.gif"
 			style="display:none" id="resourceListArea_Busy" />
 	</h2>
-
+	
 	<table class="alternative-color" id="itemTable" cellspacing="0">
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-
+		<c:set var="listSize" value="${fn:length(sessionMap.resourceList)}" />
 		<c:forEach var="resource" items="${sessionMap.resourceList}"
 			varStatus="status">
 			<tr>
@@ -31,6 +31,38 @@
 							onclick="previewItem(1,${status.index},'${sessionMapID}')"> <fmt:message
 								key="label.authoring.basic.resource.verify.url" /> </a>
 					</td>
+					<td width="10%">
+						<%-- Don't display down icon if last line --%>
+						<c:choose>
+							<c:when test="${0 != status.index}">
+								<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
+									border="0" title="<fmt:message key="label.up"/>"
+									onclick="switchItem(${status.index}, ${status.index - 1}, '${sessionMapID}')">
+							</c:when>
+							<c:otherwise>
+								<img
+									src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
+									border="0" title="<fmt:message key="label.up"/>">
+							</c:otherwise>
+						</c:choose>
+
+						<c:choose>
+							<c:when test="${listSize != status.count}">
+								<img src="<html:rewrite page='/includes/images/downarrow.gif'/>"
+									border="0" title="<fmt:message key="label.down"/>"
+									onclick="switchItem(${status.index}, ${status.index + 1}, '${sessionMapID}')">
+							</c:when>
+
+							<c:otherwise>
+								<img
+									src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
+									border="0" title="<fmt:message key="label.down"/>">
+							</c:otherwise>
+
+						</c:choose>
+
+						<%-- Don't display down icon if last line --%>
+					</td>
 					<td width="5%">
 						<img src="${tool}includes/images/edit.gif"
 							title="<fmt:message key="label.authoring.basic.resource.edit" />"
@@ -55,6 +87,38 @@
 							onclick="previewItem(2,${status.index},'${sessionMapID}')"> <fmt:message
 								key="label.authoring.basic.resource.preview" /> </a>
 					</td>
+					<td width="10%">
+						<%-- Don't display down icon if last line --%>
+						<c:choose>
+							<c:when test="${0 != status.index}">
+								<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
+									border="0" title="<fmt:message key="label.up"/>"
+									onclick="switchItem(${status.index}, ${status.index - 1}, '${sessionMapID}')">
+							</c:when>
+							<c:otherwise>
+								<img
+									src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
+									border="0" title="<fmt:message key="label.up"/>">
+							</c:otherwise>
+						</c:choose>
+
+						<c:choose>
+							<c:when test="${listSize != status.count}">
+								<img src="<html:rewrite page='/includes/images/downarrow.gif'/>"
+									border="0" title="<fmt:message key="label.down"/>"
+									onclick="switchItem(${status.index}, ${status.index + 1}, '${sessionMapID}')">
+							</c:when>
+
+							<c:otherwise>
+								<img
+									src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
+									border="0" title="<fmt:message key="label.down"/>">
+							</c:otherwise>
+
+						</c:choose>
+
+						<%-- Don't display down icon if last line --%>
+					</td>
 					<td>
 						<img src="${tool}includes/images/edit.gif"
 							title="<fmt:message key="label.authoring.basic.resource.edit" />"
@@ -79,6 +143,38 @@
 							onclick="previewItem(3,${status.index},'${sessionMapID}')"> <fmt:message
 								key="label.authoring.basic.resource.preview" /> </a>
 					</td>
+					<td width="10%">
+						<%-- Don't display down icon if last line --%>
+						<c:choose>
+							<c:when test="${0 != status.index}">
+								<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
+									border="0" title="<fmt:message key="label.up"/>"
+									onclick="switchItem(${status.index}, ${status.index - 1}, '${sessionMapID}')">
+							</c:when>
+							<c:otherwise>
+								<img
+									src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
+									border="0" title="<fmt:message key="label.up"/>">
+							</c:otherwise>
+						</c:choose>
+
+						<c:choose>
+							<c:when test="${listSize != status.count}">
+								<img src="<html:rewrite page='/includes/images/downarrow.gif'/>"
+									border="0" title="<fmt:message key="label.down"/>"
+									onclick="switchItem(${status.index}, ${status.index + 1}, '${sessionMapID}')">
+							</c:when>
+
+							<c:otherwise>
+								<img
+									src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
+									border="0" title="<fmt:message key="label.down"/>">
+							</c:otherwise>
+
+						</c:choose>
+
+						<%-- Don't display down icon if last line --%>
+					</td>
 					<td>
 						<img src="${tool}includes/images/edit.gif"
 							title="<fmt:message key="label.authoring.basic.resource.edit" />"
@@ -102,6 +198,38 @@
 							onclick="previewItem(4,${status.index},'${sessionMapID}')"> <fmt:message
 								key="label.authoring.basic.resource.preview" /> </a>
 					</td>
+					<td width="10%">
+						<%-- Don't display down icon if last line --%>
+						<c:choose>
+							<c:when test="${0 != status.index}">
+								<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
+									border="0" title="<fmt:message key="label.up"/>"
+									onclick="switchItem(${status.index}, ${status.index - 1}, '${sessionMapID}')">
+							</c:when>
+							<c:otherwise>
+								<img
+									src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
+									border="0" title="<fmt:message key="label.up"/>">
+							</c:otherwise>
+						</c:choose>
+
+						<c:choose>
+							<c:when test="${listSize != status.count}">
+								<img src="<html:rewrite page='/includes/images/downarrow.gif'/>"
+									border="0" title="<fmt:message key="label.down"/>"
+									onclick="switchItem(${status.index}, ${status.index + 1}, '${sessionMapID}')">
+							</c:when>
+
+							<c:otherwise>
+								<img
+									src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
+									border="0" title="<fmt:message key="label.down"/>">
+							</c:otherwise>
+
+						</c:choose>
+
+						<%-- Don't display down icon if last line --%>
+					</td>
 					<td>
 						<img src="${tool}includes/images/edit.gif"
 							title="<fmt:message key="label.authoring.basic.resource.edit" />"