Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r882787d2ea17b4756ded02f0fa29f805fe095dc4 -rff15bbb438aa3c4989670d97539f10c02959f1f5
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java
===================================================================
diff -u -r665317d0c907b053cec7f56ac36305eb09dac446 -rff15bbb438aa3c4989670d97539f10c02959f1f5
--- lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java	(.../INotebookEntryDAO.java)	(revision 665317d0c907b053cec7f56ac36305eb09dac446)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java	(.../INotebookEntryDAO.java)	(revision ff15bbb438aa3c4989670d97539f10c02959f1f5)
@@ -39,6 +39,6 @@
 
 	List<NotebookEntry> get(Integer userID, Long lessonID);
 
-	List<NotebookEntry> get(String id, Long idType, String signature,
+	List<NotebookEntry> get(Long id, Integer idType, String signature,
 			Integer userID);
 }
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java
===================================================================
diff -u -r665317d0c907b053cec7f56ac36305eb09dac446 -rff15bbb438aa3c4989670d97539f10c02959f1f5
--- lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java	(.../NotebookEntryDAO.java)	(revision 665317d0c907b053cec7f56ac36305eb09dac446)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java	(.../NotebookEntryDAO.java)	(revision ff15bbb438aa3c4989670d97539f10c02959f1f5)
@@ -33,18 +33,18 @@
 
 public class NotebookEntryDAO extends BaseDAO implements INotebookEntryDAO {
 	
-	public static final String SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID = "from " + NotebookEntry.class.getName() 
-							+ " where external_id=? and external_id_type=? and user_id=?";
+	private static final String SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID = "from " + NotebookEntry.class.getName() 
+							+ " where external_id=? and external_id_type=? and external_signature=? and user_id=?";
 	
-	public static final String SQL_QUERY_FIND_ENTRY_BY_USER_ID = "from " + NotebookEntry.class.getName() 
+	private static final String SQL_QUERY_FIND_ENTRY_BY_USER_ID = "from " + NotebookEntry.class.getName() 
 							+ " where user_id=?";
 	
 	public void saveOrUpdate(NotebookEntry notebookEntry) {
 		this.getHibernateTemplate().saveOrUpdate(notebookEntry);
 		this.getHibernateTemplate().flush();
 	}
 
-	public List<NotebookEntry> get(String id, Long idType, String signature, Integer userID) {
+	public List<NotebookEntry> get(Long id, Integer idType, String signature, Integer userID) {
 		return (List<NotebookEntry>)(getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID, new Object[]{id, idType, signature, userID}));
 	}
 
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
===================================================================
diff -u -r65b97692a859965d00f5ea2eb602ddf0c1c9d450 -rff15bbb438aa3c4989670d97539f10c02959f1f5
--- lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java	(.../CoreNotebookService.java)	(revision 65b97692a859965d00f5ea2eb602ddf0c1c9d450)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java	(.../CoreNotebookService.java)	(revision ff15bbb438aa3c4989670d97539f10c02959f1f5)
@@ -25,9 +25,7 @@
 
 package org.lamsfoundation.lams.notebook.service;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -53,7 +51,7 @@
 		return notebookEntry.getUid();
 	}
 
-	public List<NotebookEntry> getEntry(String id, Long idType, String signature, Integer userID) {
+	public List<NotebookEntry> getEntry(Long id, Integer idType, String signature, Integer userID) {
 		return notebookEntryDAO.get(id, idType, signature, userID);
 	}
 
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java
===================================================================
diff -u -r665317d0c907b053cec7f56ac36305eb09dac446 -rff15bbb438aa3c4989670d97539f10c02959f1f5
--- lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java	(.../ICoreNotebookService.java)	(revision 665317d0c907b053cec7f56ac36305eb09dac446)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java	(.../ICoreNotebookService.java)	(revision ff15bbb438aa3c4989670d97539f10c02959f1f5)
@@ -35,7 +35,7 @@
 	Long createNotebookEntry(Long id, Integer idType, String signature,
 			Integer userID, String title, String entry);
 
-	List<NotebookEntry> getEntry(String id, Long idType, String signature, Integer userID);
+	List<NotebookEntry> getEntry(Long id, Integer idType, String signature, Integer userID);
 	
 	NotebookEntry getEntry(Long uid);
 	
Index: lams_common/src/java/org/lamsfoundation/lams/web/util/SessionMap.java
===================================================================
diff -u -r79c78a5c20fece2ede9c8c9827afb8b4d429b286 -rff15bbb438aa3c4989670d97539f10c02959f1f5
--- lams_common/src/java/org/lamsfoundation/lams/web/util/SessionMap.java	(.../SessionMap.java)	(revision 79c78a5c20fece2ede9c8c9827afb8b4d429b286)
+++ lams_common/src/java/org/lamsfoundation/lams/web/util/SessionMap.java	(.../SessionMap.java)	(revision ff15bbb438aa3c4989670d97539f10c02959f1f5)
@@ -29,7 +29,7 @@
 
 import java.util.HashMap;
 
-public class SessionMap extends HashMap {
+public class SessionMap<K,V> extends HashMap<K,V> {
 
 	private static final long serialVersionUID = -4702185515740658324L;
 
@@ -40,7 +40,6 @@
 	public SessionMap() {
 		long count = getCount();
 		this.sessionID = "sessionMapID-" + count;
-		this.put("sessionID", "sessionMapID-" + count);
 	}
 
 	private long getCount() {