Index: lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/Attic/CommonCartridgeSession.hbm.xml,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.hbm.xml	27 Apr 2016 13:22:38 -0000	1.1.2.1
+++ lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.hbm.xml	18 May 2016 17:46:33 -0000	1.1.2.2
@@ -77,26 +77,6 @@
             length="250"
         />
 
-        <set
-            name="commonCartridgeItems"
-            lazy="true"
-            inverse="false"
-            cascade="all"
-            sort="unsorted"
-            order-by="create_date desc"
-        >
-
-            <key
-                column="session_uid"
-            >
-            </key>
-
-            <one-to-many
-                  class="org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItem"
-            />
-
-        </set>
-
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-CommonCartridgeSession.xml
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20160518.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java	11 May 2016 07:15:13 -0000	1.3.2.3
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java	18 May 2016 17:46:33 -0000	1.3.2.4
@@ -36,9 +36,6 @@
  * CommonCartridge
  *
  * @author Andrey Balan
- *
- *
- *
  */
 public class CommonCartridge implements Cloneable {
 
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java	11 May 2016 07:15:13 -0000	1.2.2.3
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java	18 May 2016 17:46:33 -0000	1.2.2.4
@@ -34,9 +34,6 @@
  * CommonCartridge
  *
  * @author Andrey Balan
- *
- *
- *
  */
 public class CommonCartridgeItem implements Cloneable {
     private static final Logger log = Logger.getLogger(CommonCartridgeItem.class);
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.java,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.java	11 May 2016 07:15:13 -0000	1.1.2.3
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.java	18 May 2016 17:46:33 -0000	1.1.2.4
@@ -30,9 +30,6 @@
  * CommonCartridge
  * 
  * @author Andrey Balan
- *
- *
- *
  */
 public class CommonCartridgeItemVisitLog {
 
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.java,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.java	11 May 2016 07:15:13 -0000	1.1.2.3
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.java	18 May 2016 17:46:33 -0000	1.1.2.4
@@ -32,9 +32,6 @@
  * CommonCartridge
  * 
  * @author Andrey Balan
- *
- *
- *
  */
 public class CommonCartridgeSession {
 
@@ -48,12 +45,10 @@
     private Date sessionEndDate;
     //finish or not
     private int status;
-    //commonCartridge Items
-    private Set commonCartridgeItems;
 
-//  **********************************************************
-    //		Get/Set methods
-//  **********************************************************
+    // **********************************************************
+    // Get/Set methods
+    // **********************************************************
     /**
      *
      * @return Returns the learnerID.
@@ -145,24 +140,4 @@
 	this.sessionName = sessionName;
     }
 
-    /**
-     * 
-     * 
-     *
-     *
-     *
-     *
-     *
-     *
-     * 
-     * @return
-     */
-    public Set getCommonCartridgeItems() {
-	return commonCartridgeItems;
-    }
-
-    public void setCommonCartridgeItems(Set commonCartridgeItems) {
-	this.commonCartridgeItems = commonCartridgeItems;
-    }
-
 }
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.java,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.java	11 May 2016 07:15:13 -0000	1.1.2.3
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.java	18 May 2016 17:46:33 -0000	1.1.2.4
@@ -34,9 +34,6 @@
  * CommonCartridge
  * 
  * @author Andrey Balan
- *
- *
- *
  */
 public class CommonCartridgeUser implements Cloneable {
     private static final long serialVersionUID = -7043502180037866257L;
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java,v
diff -u -r1.9.2.10 -r1.9.2.11
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	11 May 2016 07:15:12 -0000	1.9.2.10
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	18 May 2016 17:46:34 -0000	1.9.2.11
@@ -286,24 +286,6 @@
     }
 
     @Override
-    public List<CommonCartridgeItem> getCommonCartridgeItemsBySessionId(Long sessionId) {
-	CommonCartridgeSession session = commonCartridgeSessionDao.getSessionBySessionId(sessionId);
-	if (session == null) {
-	    CommonCartridgeServiceImpl.log.error("Failed get CommonCartridgeSession by ID [" + sessionId + "]");
-	    return null;
-	}
-	// add commonCartridge items from Authoring
-	CommonCartridge commonCartridge = session.getCommonCartridge();
-	List<CommonCartridgeItem> items = new ArrayList<CommonCartridgeItem>();
-	items.addAll(commonCartridge.getCommonCartridgeItems());
-
-	// add commonCartridge items from CommonCartridgeSession
-	items.addAll(session.getCommonCartridgeItems());
-
-	return items;
-    }
-
-    @Override
     public CommonCartridge getCommonCartridgeBySessionId(Long sessionId) {
 	CommonCartridgeSession session = commonCartridgeSessionDao.getSessionBySessionId(sessionId);
 	// to skip CGLib problem
@@ -421,36 +403,21 @@
 	Map<Long, Integer> visitCountMap = commonCartridgeItemVisitDao.getSummary(contentId);
 
 	CommonCartridge commonCartridge = commonCartridgeDao.getByContentId(contentId);
-	Set<CommonCartridgeItem> resItemList = commonCartridge.getCommonCartridgeItems();
+	Set<CommonCartridgeItem> items = commonCartridge.getCommonCartridgeItems();
 
-	// get all sessions in a commonCartridge and retrieve all commonCartridge items under this session
-	// plus initial commonCartridge items by author creating (resItemList)
-	List<CommonCartridgeSession> sessionList = commonCartridgeSessionDao.getByContentId(contentId);
-	for (CommonCartridgeSession session : sessionList) {
+	List<CommonCartridgeSession> sessions = commonCartridgeSessionDao.getByContentId(contentId);
+	for (CommonCartridgeSession session : sessions) {
 	    // one new group for one session.
 	    group = new ArrayList<Summary>();
 	    // firstly, put all initial commonCartridge item into this group.
-	    for (CommonCartridgeItem item : resItemList) {
+	    for (CommonCartridgeItem item : items) {
 		Summary sum = new Summary(session.getSessionId(), session.getSessionName(), item);
 		// set viewNumber according visit log
 		if (visitCountMap.containsKey(item.getUid())) {
 		    sum.setViewNumber(visitCountMap.get(item.getUid()).intValue());
 		}
 		group.add(sum);
 	    }
-	    // get this session's all commonCartridge items
-	    Set<CommonCartridgeItem> sessItemList = session.getCommonCartridgeItems();
-	    for (CommonCartridgeItem item : sessItemList) {
-		// to skip all item create by author
-		if (!item.isCreateByAuthor()) {
-		    Summary sum = new Summary(session.getSessionId(), session.getSessionName(), item);
-		    // set viewNumber according visit log
-		    if (visitCountMap.containsKey(item.getUid())) {
-			sum.setViewNumber(visitCountMap.get(item.getUid()).intValue());
-		    }
-		    group.add(sum);
-		}
-	    }
 	    // so far no any item available, so just put session name info to Summary
 	    if (group.size() == 0) {
 		group.add(new Summary(session.getSessionId(), session.getSessionName(), null));
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java	11 May 2016 07:15:13 -0000	1.2.2.3
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java	18 May 2016 17:46:34 -0000	1.2.2.4
@@ -140,14 +140,6 @@
     void deleteCommonCartridgeItem(Long uid);
 
     /**
-     * Return all reource items within the given toolSessionID.
-     *
-     * @param sessionId
-     * @return
-     */
-    List<CommonCartridgeItem> getCommonCartridgeItemsBySessionId(Long sessionId);
-
-    /**
      * Get commonCartridge which is relative with the special toolSession.
      *
      * @param sessionId
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java,v
diff -u -r1.5.2.2 -r1.5.2.3
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java	11 May 2016 07:15:13 -0000	1.5.2.2
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java	18 May 2016 17:46:33 -0000	1.5.2.3
@@ -119,7 +119,7 @@
 	}
 	// ----------------------- Add commonCartridge item function ---------------------------
 	if (param.equals("newItemInit")) {
-	    return newItemlInit(mapping, form, request, response);
+	    return newItemInit(mapping, form, request, response);
 	}
 	if (param.equals("editItemInit")) {
 	    return editItemInit(mapping, form, request, response);
@@ -218,7 +218,7 @@
      * @param response
      * @return
      */
-    private ActionForward newItemlInit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    private ActionForward newItemInit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	String sessionMapID = WebUtil.readStrParam(request, CommonCartridgeConstants.ATTR_SESSION_MAP_ID);
 	((CommonCartridgeItemForm) form).setSessionMapID(sessionMapID);
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java	11 May 2016 07:15:13 -0000	1.3.2.2
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java	18 May 2016 17:46:33 -0000	1.3.2.3
@@ -135,10 +135,9 @@
 	    commonCartridgeUser = getCurrentUser(service, sessionId);
 	}
 
-	List<CommonCartridgeItem> items = null;
-	CommonCartridge commonCartridge;
-	items = service.getCommonCartridgeItemsBySessionId(sessionId);
-	commonCartridge = service.getCommonCartridgeBySessionId(sessionId);
+	CommonCartridge commonCartridge = service.getCommonCartridgeBySessionId(sessionId);
+	List<CommonCartridgeItem> items = new ArrayList<CommonCartridgeItem>();
+	items.addAll(commonCartridge.getCommonCartridgeItems());
 
 	// check whehter finish lock is on/off
 	boolean lock = commonCartridge.getLockWhenFinished() && commonCartridgeUser != null
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/MonitoringAction.java,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/MonitoringAction.java	11 May 2016 07:15:13 -0000	1.2.2.2
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/MonitoringAction.java	18 May 2016 17:46:33 -0000	1.2.2.3
@@ -66,7 +66,6 @@
 	if (param.equals("summary")) {
 	    return summary(mapping, form, request, response);
 	}
-
 	if (param.equals("listuser")) {
 	    return listuser(mapping, form, request, response);
 	}
@@ -92,7 +91,7 @@
 
 	// get back SessionMap
 	String sessionMapID = request.getParameter(CommonCartridgeConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	request.setAttribute(CommonCartridgeConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 
 	// update session value
@@ -119,7 +118,7 @@
 
 	// get back SessionMap
 	String sessionMapID = request.getParameter(CommonCartridgeConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	request.setAttribute(CommonCartridgeConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 
 	// update session value
@@ -140,7 +139,7 @@
     private ActionForward summary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	// initial Session Map
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	request.setAttribute(CommonCartridgeConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	// save contentFolderID into session
@@ -149,14 +148,14 @@
 
 	Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	ICommonCartridgeService service = getCommonCartridgeService();
-	List<List<Summary>> groupList = service.getSummary(contentId);
+	List<List<Summary>> summaryList = service.getSummary(contentId);
 
 	CommonCartridge commonCartridge = service.getCommonCartridgeByContentId(contentId);
 
 	Map<Long, Set<ReflectDTO>> relectList = service.getReflectList(contentId, false);
 
 	// cache into sessionMap
-	sessionMap.put(CommonCartridgeConstants.ATTR_SUMMARY_LIST, groupList);
+	sessionMap.put(CommonCartridgeConstants.ATTR_SUMMARY_LIST, summaryList);
 	sessionMap.put(CommonCartridgeConstants.PAGE_EDITABLE, commonCartridge.isContentInUse());
 	sessionMap.put(CommonCartridgeConstants.ATTR_RESOURCE, commonCartridge);
 	sessionMap.put(CommonCartridgeConstants.ATTR_TOOL_CONTENT_ID, contentId);