Index: lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml	(.../Dokumaran.hbm.xml)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml	(.../Dokumaran.hbm.xml)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -116,6 +116,14 @@
             insert="true"
             column="show_line_numbers"
         />
+        
+        <property
+            name="sharedPadId"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="shared_pad_id"
+        />
 
         <property
             name="useSelectLeaderToolOuput"
Index: lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml	(.../DokumaranSession.hbm.xml)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml	(.../DokumaranSession.hbm.xml)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -98,6 +98,15 @@
             column="etherpad_read_only_id"
             length="50"
         />
+        
+        <property
+            name="etherpadGroupId"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="etherpad_group_id"
+            length="50"
+        />
 
         <!--
             To add non XDoclet property mappings, create a file named
Index: lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml	(.../DokumaranUser.hbm.xml)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml	(.../DokumaranUser.hbm.xml)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -88,6 +88,14 @@
             insert="true"
             column="session_finished"
         />
+        
+       <property
+            name="leader"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="leader"
+        />
 
         <!--
             To add non XDoclet property mappings, create a file named
Index: lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -71,5 +71,6 @@
 label.waiting.for.leader  =Please, wait while somebody will become a group leader.
 label.users.from.group  =Other learners participating in current group:
 label.refresh  =Refresh
+label.shared.pad.id  =Shared pad id that allows using the same pad between several doKumaran activities
 
 #======= End labels: Exported 164 labels for en AU =====
Index: lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql	(.../create_lams_tool_dokumaran.sql)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql	(.../create_lams_tool_dokumaran.sql)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -16,6 +16,7 @@
    content_id bigint unique,
    show_chat tinyint,
    show_line_numbers tinyint,
+   shared_pad_id varchar(255),
    use_select_leader_tool_ouput tinyint,
    reflect_instructions TEXT, 
    reflect_on_activity smallint,
@@ -30,6 +31,7 @@
    session_id bigint,
    session_name varchar(250),
    group_leader_uid BIGINT,
+   etherpad_group_id varchar(50),
    etherpad_read_only_id varchar(50),
    primary key (uid)
 )ENGINE=InnoDB;
@@ -40,6 +42,7 @@
    first_name varchar(255),
    login_name varchar(255),
    session_finished smallint,
+   leader smallint,
    session_uid bigint,
    dokumaran_uid bigint,
    primary key (uid)
@@ -60,8 +63,8 @@
 
 INSERT INTO `tl_ladoku11_dokumaran` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `lock_on_finished`,
  `instructions`, `content_in_use`, `define_later`, `content_id`, `show_chat`, 
- `show_line_numbers`, `use_select_leader_tool_ouput`,`reflect_on_activity`) VALUES
-  (1,NULL,NULL,NULL,'doKumaran','0','Instructions ',0,0,${default_content_id},0,0,0,0);
+ `show_line_numbers`, `shared_pad_id`, `use_select_leader_tool_ouput`,`reflect_on_activity`) VALUES
+  (1,NULL,NULL,NULL,'doKumaran','0','Instructions ',0,0,${default_content_id},0,0,NULL,0,0);
   
 -- Inserting the required config item into the config table
 -- Etherpad API key is added so the Etherpad works there automatically for each build
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java	(.../DokumaranConstants.java)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java	(.../DokumaranConstants.java)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -95,7 +95,11 @@
     
     public static final String KEY_ETHERPAD_SERVER_URL = "etherpadServerUrl";
     
-    public static final String PAD_ID_PREFIX = "LAMS-sessionId-";
+    public static final String DEFAULT_PAD_NAME = "LAMS-pad";
+    
+    public static final String PREFIX_REGULAR_GROUP = "LAMS-group-";
+    
+    public static final String PREFIX_SHARED_GROUP = "LAMS-sharedGroup-";
 
     // error message keys
 
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java	(.../Dokumaran.java)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java	(.../Dokumaran.java)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -25,6 +25,7 @@
 
 import java.util.Date;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
@@ -55,6 +56,8 @@
     private boolean showChat;
 
     private boolean showLineNumbers;
+    
+    private String sharedPadId;
 
     private boolean lockWhenFinished;
 
@@ -318,7 +321,23 @@
     public void setShowLineNumbers(boolean showLineNumbers) {
 	this.showLineNumbers = showLineNumbers;
     }
+    
+    /**
+    *
+    * @return
+    */
+   public String getSharedPadId() {
+	return sharedPadId;
+   }
 
+   public void setSharedPadId(String sharedPadId) {
+	this.sharedPadId = sharedPadId;
+   }
+   
+   public boolean isSharedPadEnabled() {
+       return StringUtils.isNotEmpty(sharedPadId);
+   }
+
     /**
      *
      * @return
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java	(.../DokumaranSession.java)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java	(.../DokumaranSession.java)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -26,6 +26,7 @@
 import java.util.Date;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants;
 
 /**
  * Dokumaran
@@ -45,6 +46,7 @@
     // finish or not
     private int status;
     private DokumaranUser groupLeader;
+    private String etherpadGroupId;
     private String etherpadReadOnlyId;
 
     // **********************************************************
@@ -142,14 +144,28 @@
    }
 
    public boolean isUserGroupLeader(Long userUid) {
-
 	boolean isUserLeader = (this.groupLeader != null) && userUid.equals(this.groupLeader.getUid());
 	return isUserLeader;
    }
    
    /**
     * @return Returns the etherpadReadOnlyId
     */
+   public String getEtherpadGroupId() {
+	return etherpadGroupId;
+   }
+
+   /**
+    * @param etherpadReadOnlyId
+    *            The etherpadReadOnlyId to set.
+    */
+   public void setEtherpadGroupId(String etherpadGroupId) {
+	this.etherpadGroupId = etherpadGroupId;
+   }
+   
+   /**
+    * @return Returns the etherpadReadOnlyId
+    */
    public String getEtherpadReadOnlyId() {
 	return etherpadReadOnlyId;
    }
@@ -161,5 +177,10 @@
    public void setEtherpadReadOnlyId(String etherpadReadOnlyId) {
 	this.etherpadReadOnlyId = etherpadReadOnlyId;
    }
+   
+    public String getPadId() {
+	// HashUtil.sha1(DokumaranConstants.DEFAULT_PAD_NAME + sessionId);
+	return etherpadGroupId + "$" + DokumaranConstants.DEFAULT_PAD_NAME;
+    }
 
 }
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java	(.../DokumaranUser.java)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java	(.../DokumaranUser.java)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -45,6 +45,7 @@
     private String lastName;
     private String loginName;
     private boolean sessionFinished;
+    private boolean leader;
 
     private DokumaranSession session;
     private Dokumaran dokumaran;
@@ -68,6 +69,7 @@
 	this.session = session;
 	this.dokumaran = null;
 	this.sessionFinished = false;
+	this.leader = false;
     }
 
     public DokumaranUser(UserDTO user, Dokumaran content) {
@@ -78,6 +80,7 @@
 	this.session = null;
 	this.dokumaran = content;
 	this.sessionFinished = false;
+	this.leader = false;
     }
 
     /**
@@ -205,7 +208,19 @@
     public void setSessionFinished(boolean sessionFinished) {
 	this.sessionFinished = sessionFinished;
     }
+    
+    /**
+    *
+    * @return
+    */
+   public boolean isLeader() {
+	return leader;
+   }
 
+   public void setLeader(boolean leader) {
+	this.leader = leader;
+   }
+
     @Override
     public boolean equals(Object obj) {
 	if (this == obj) {
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -23,13 +23,19 @@
 
 package org.lamsfoundation.lams.tool.dokumaran.service;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.SortedMap;
 
+import javax.servlet.http.Cookie;
+
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
@@ -54,6 +60,7 @@
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputDefinition;
+import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants;
@@ -117,7 +124,7 @@
     private ICoreNotebookService coreNotebookService;
 
     private DokumaranOutputFactory dokumaranOutputFactory;
-    
+
     private EPLiteClient client = null;
 
     // *******************************************************************************
@@ -216,6 +223,14 @@
 	}
 
 	DokumaranSession session = getDokumaranSessionBySessionId(toolSessionId);
+	Long toolContentId = session.getDokumaran().getContentId();
+	boolean isMultipleLeadersAllowed = isGroupedActivity(toolContentId);
+	if (isMultipleLeadersAllowed) {
+
+	} else {
+
+	}
+
 	DokumaranUser leader = session.getGroupLeader();
 	// check leader select tool for a leader only in case Dokumaran tool doesn't know it. As otherwise it will screw
 	// up previous scratches done
@@ -321,8 +336,6 @@
     public List<SessionDTO> getSummary(Long contentId) {
 	List<SessionDTO> groupList = new ArrayList<SessionDTO>();
 
-	Dokumaran dokumaran = dokumaranDao.getByContentId(contentId);
-
 	// get all sessions in a dokumaran and retrieve all dokumaran items under this session
 	// plus initial dokumaran items by author creating (resItemList)
 	List<DokumaranSession> sessionList = dokumaranSessionDao.getByContentId(contentId);
@@ -332,10 +345,10 @@
 	    SessionDTO group = new SessionDTO();
 	    group.setSessionId(session.getSessionId());
 	    group.setSessionName(session.getSessionName());
-	    
-	    String padId = HashUtil.sha1(DokumaranConstants.PAD_ID_PREFIX + session.getSessionId());
+
+	    String padId = session.getPadId();
 	    group.setPadId(padId);
-	    
+
 	    groupList.add(group);
 	}
 
@@ -629,42 +642,81 @@
 	Dokumaran dokumaran = dokumaranDao.getByContentId(toolContentId);
 	session.setDokumaran(dokumaran);
 	dokumaranSessionDao.saveObject(session);
-	
-//	//create pad in a new thread so it doesn't affect session creation operation
-//	Thread t = new Thread(
-//		new CreatePadThread(this, toolSessionId, dokumaran.getInstructions()));
-//	t.start();
-	
+
+	// //create pad in a new thread so it doesn't affect session creation operation
+	// Thread t = new Thread(
+	// new CreatePadThread(this, toolSessionId, dokumaran.getInstructions()));
+	// t.start();
+
 	try {
+	    String groupIdentifier = DokumaranConstants.PREFIX_REGULAR_GROUP + toolSessionId;
+
+	    // in case sharedPadId is present - all sessions will share the same padId
+	    if (dokumaran.isSharedPadEnabled()) {
+
+		// find existing pad in any of the sessions associated with this toolContentId
+		List<DokumaranSession> sessions = dokumaranSessionDao.getByContentId(toolContentId);
+		DokumaranSession sessionWithAlreadyCreatedPad = null;
+		for (DokumaranSession sessionIter : sessions) {
+		    if (StringUtils.isNotBlank(session.getEtherpadGroupId())) {
+			sessionWithAlreadyCreatedPad = sessionIter;
+			break;
+		    }
+		}
+
+		if (sessionWithAlreadyCreatedPad == null) {
+		    ToolSession toolSession = toolService.getToolSession(toolSessionId);
+		    Long lessonId = toolSession.getLesson().getLessonId();
+		    groupIdentifier = DokumaranConstants.PREFIX_SHARED_GROUP + dokumaran.getSharedPadId() + lessonId;
+
+		} else {
+		    session.setEtherpadGroupId(sessionWithAlreadyCreatedPad.getEtherpadGroupId());
+		    session.setEtherpadReadOnlyId(sessionWithAlreadyCreatedPad.getEtherpadReadOnlyId());
+		    dokumaranSessionDao.saveObject(session);
+		    return;
+		}
+	    }
+
 	    EPLiteClient client = initializeEPLiteClient();
 
-	    String padId = HashUtil.sha1(DokumaranConstants.PAD_ID_PREFIX + toolSessionId);
+	    // create Etherpad Group assossiated with this session
+	    Map map = client.createGroupIfNotExistsFor(groupIdentifier);
+	    String groupId = (String) map.get("groupID");
+	    session.setEtherpadGroupId(groupId);
+	    String padId = session.getPadId();
+
+	    boolean isPadAlreadyCreated = false;
 	    try {
-		client.createPad(padId);
+		client.createGroupPad(groupId, DokumaranConstants.DEFAULT_PAD_NAME);
 	    } catch (EPLiteException e) {
 		// allow recreating existing pads
-		if (!"padID does already exist".equals(e.getMessage())) {
+		if ("padName does already exist".equals(e.getMessage())) {
+		    isPadAlreadyCreated = true;
+		//throw exception in all other cases
+		} else {
 		    throw e;
 		}
 	    }
 
 	    // set initial content
-	    String etherpadHtml = "<html><body>"
-		    + dokumaran.getInstructions().replaceAll("[\n\r\f]", "").replaceAll("&nbsp;", "")
-		    + "</body></html>";
-	    client.setHTML(padId, etherpadHtml);
+	    if (!dokumaran.isSharedPadEnabled() || !isPadAlreadyCreated) {
+		String etherpadHtml = "<html><body>"
+			+ dokumaran.getInstructions().replaceAll("[\n\r\f]", "").replaceAll("&nbsp;", "")
+			+ "</body></html>";
+		client.setHTML(padId, etherpadHtml);
+	    }
 
 	    // gets read-only id
 	    String etherpadReadOnlyId = (String) client.getReadOnlyID(padId).get("readOnlyID");
-
 	    session.setEtherpadReadOnlyId(etherpadReadOnlyId);
+
 	    dokumaranSessionDao.saveObject(session);
-	} catch (DokumaranConfigurationException e1) {
-	    log.warn(e1.getMessage(), e1);
+	} catch (Exception e) {
+	    log.warn(e.getMessage(), e);
 	}
 
     }
-    
+
     @Override
     public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) {
 	DokumaranUser learner = getUserByIDAndSession(learnerId, toolSessionId);
@@ -675,45 +727,148 @@
 	return new ToolCompletionStatus(learner.isSessionFinished() ? ToolCompletionStatus.ACTIVITY_COMPLETED
 		: ToolCompletionStatus.ACTIVITY_ATTEMPTED, null, null);
     }
-    
+
     @Override
-    public String getEtherpadReadOnlyId(String padId) throws DokumaranConfigurationException {
+    public Cookie createEtherpadCookieForLearner(DokumaranUser user, DokumaranSession session)
+	    throws DokumaranConfigurationException, URISyntaxException {
 
-	Map etherpadReadOnlyId = null;
-	try {
-	    etherpadReadOnlyId = initializeEPLiteClient().getReadOnlyID(padId);
-	} catch (EPLiteException e) {
-//	    if (!"padID does already exist".equals(e.getMessage())) {
-		throw e;
-//	    }
+	EPLiteClient client = initializeEPLiteClient();
+	String groupId = session.getEtherpadGroupId();
+
+	String userName = user.getFirstName() + " " + user.getLastName();
+	Map<String, String> map = client.createAuthorIfNotExistsFor(user.getUserId().toString(), userName);
+	String authorId = map.get("authorID");
+
+	// search for already existing user's session at Etherpad server
+	Map sessionsMap = client.listSessionsOfAuthor(authorId);
+	String userSessionId = null;
+	for (String sessionId : (Set<String>) sessionsMap.keySet()) {
+	    Map<String, String> sessessionAttributes = (Map<String, String>) sessionsMap.get(sessionId);
+	    String groupIdIter = sessessionAttributes.get("groupID");
+	    if (groupIdIter.equals(groupId)) {
+		userSessionId = sessionId;
+	    }
 	}
-	
-	return etherpadReadOnlyId == null ? null : (String)etherpadReadOnlyId.get("readOnlyID");
+
+	// if session doesn't exist yet - create it
+	if (userSessionId == null) {
+	    Map<String, String> map2 = client.createSession(groupId, authorId, 24);
+	    userSessionId = (String) map2.get("sessionID");
+	}
+
+	DokumaranConfigItem etherpadServerUrlConfig = getConfigItem(DokumaranConfigItem.KEY_ETHERPAD_URL);
+	String etherpadServerUrl = etherpadServerUrlConfig.getConfigValue();
+	URI uri = new URI(etherpadServerUrl);
+	String domain = uri.getHost();
+
+	Cookie etherpadSessionCookie = new Cookie("sessionID", userSessionId);
+	etherpadSessionCookie.setDomain(domain);
+	// A negative value means that the cookie is not stored persistently and will be deleted when the Web browser
+	// exits. A zero value causes the cookie to be deleted.
+	etherpadSessionCookie.setMaxAge(-1);
+	etherpadSessionCookie.setPath("/");
+
+	return etherpadSessionCookie;
     }
-    
+
     @Override
-    public void setEtherpadReadOnlyId(Long toolSessionId, String etherpadReadOnlyId) {
-	DokumaranSession session = dokumaranSessionDao.getSessionBySessionId(toolSessionId);
-	session.setEtherpadReadOnlyId(etherpadReadOnlyId);
-	dokumaranSessionDao.saveObject(session);
+    public Cookie createEtherpadCookieForMonitor(UserDTO user, Long contentId)
+	    throws DokumaranConfigurationException, URISyntaxException {
+
+	EPLiteClient client = initializeEPLiteClient();
+
+	String userName = user.getFirstName() + " " + user.getLastName();
+	Map<String, String> map = client.createAuthorIfNotExistsFor(user.getUserID().toString(), userName);
+	String authorId = map.get("authorID");
+
+	Map etherpadSessions = client.listSessionsOfAuthor(authorId);
+
+	List<DokumaranSession> sessionList = dokumaranSessionDao.getByContentId(contentId);
+	if (sessionList.isEmpty()) {
+	    return null;
+	}
+
+	// in case sharedPadId is present - all sessions will share the same padId - and thus show only one pad
+	Dokumaran dokumaran = getDokumaranByContentId(contentId);
+	if (StringUtils.isEmpty(dokumaran.getSharedPadId())) {
+	    sessionList = sessionList.subList(0, 0);
+	}
+
+	// find according session
+	String etherpadSessionIds = "";
+	for (DokumaranSession session : sessionList) {
+	    String groupId = session.getEtherpadGroupId();
+
+	    // search for already existing user's session
+	    String userSessionId = null;
+	    for (String etherpadSessionId : (Set<String>) etherpadSessions.keySet()) {
+		Map<String, String> sessessionAttributes = (Map<String, String>) etherpadSessions
+			.get(etherpadSessionId);
+		String groupIdIter = sessessionAttributes.get("groupID");
+		if (groupIdIter.equals(groupId)) {
+		    userSessionId = etherpadSessionId;
+		}
+	    }
+
+	    // if session doesn't exist yet - create it
+	    if (userSessionId == null) {
+		Map map2 = client.createSession(groupId, authorId, 24);
+		userSessionId = (String) map2.get("sessionID");
+	    }
+
+	    etherpadSessionIds += StringUtils.isEmpty(etherpadSessionIds) ? userSessionId : "," + userSessionId;
+	}
+
+	DokumaranConfigItem etherpadServerUrlConfig = getConfigItem(DokumaranConfigItem.KEY_ETHERPAD_URL);
+	String etherpadServerUrl = etherpadServerUrlConfig.getConfigValue();
+	URI uri = new URI(etherpadServerUrl);
+	String domain = uri.getHost();
+
+	Cookie etherpadSessionCookie = new Cookie("sessionID", etherpadSessionIds);
+	etherpadSessionCookie.setDomain(domain);
+	// A negative value means that the cookie is not stored persistently and will be deleted when the Web browser
+	// exits. A zero value causes the cookie to be deleted.
+	etherpadSessionCookie.setMaxAge(-1);
+	etherpadSessionCookie.setPath("/");
+
+	return etherpadSessionCookie;
     }
-    
+
     @Override
     public EPLiteClient initializeEPLiteClient() throws DokumaranConfigurationException {
 	if (client == null) {
-	    // get the API key from the config table and add it to the session
+	    // get the API key from the config table and create EPLiteClient using it
 	    DokumaranConfigItem etherpadServerUrlConfig = getConfigItem(DokumaranConfigItem.KEY_ETHERPAD_URL);
 	    DokumaranConfigItem etherpadApiKeyConfig = getConfigItem(DokumaranConfigItem.KEY_API_KEY);
 	    if (etherpadApiKeyConfig == null || etherpadApiKeyConfig.getConfigValue() == null
 		    || etherpadServerUrlConfig == null || etherpadServerUrlConfig.getConfigValue() == null) {
-		throw new DokumaranConfigurationException("Dokumaran settings are not configured. apiKeyConfig=" + etherpadApiKeyConfig
-			+ " etherpadServerUrlConfig=" + etherpadServerUrlConfig + " Please seek help from your administrator");
+		throw new DokumaranConfigurationException("Dokumaran settings are not configured. apiKeyConfig="
+			+ etherpadApiKeyConfig + " etherpadServerUrlConfig=" + etherpadServerUrlConfig
+			+ " Please seek help from your administrator");
 	    }
 
 	    // create EPLiteClient
 	    String etherpadServerUrl = etherpadServerUrlConfig.getConfigValue();
 	    String etherpadApiKey = etherpadApiKeyConfig.getConfigValue();
 	    client = new EPLiteClient(etherpadServerUrl, etherpadApiKey);
+
+	    // // get the API key from the config table and create EPLiteClient using it
+	    // DokumaranConfigItem lamsServerUrlConfig = getConfigItem(ConfigurationKeys.SERVER_URL);
+	    // DokumaranConfigItem etherpadApiKeyConfig = getConfigItem(DokumaranConfigItem.KEY_API_KEY);
+	    // if (etherpadApiKeyConfig == null || etherpadApiKeyConfig.getConfigValue() == null
+	    // || lamsServerUrlConfig == null || lamsServerUrlConfig.getConfigValue() == null) {
+	    // throw new DokumaranConfigurationException("Dokumaran settings are not configured. apiKeyConfig=" +
+	    // etherpadApiKeyConfig
+	    // + " etherpadServerUrlConfig=" + lamsServerUrlConfig + " Please seek help from your administrator");
+	    // }
+	    //
+	    // // create EPLiteClient
+	    // String lamsServerUrl = lamsServerUrlConfig.getConfigValue();
+	    // URI uri = new URI(url);
+	    // String domain = uri.getHost();
+	    // String etherpadServerUrl = lamsServerUrlConfig.getConfigValue();
+	    // String etherpadApiKey = etherpadApiKeyConfig.getConfigValue();
+	    // client = new EPLiteClient(etherpadServerUrl, etherpadApiKey);
 	}
 	return client;
     }
@@ -869,6 +1024,7 @@
 
 	dokumaran.setShowChat(JsonUtil.opt(toolContentJSON, "showChat", Boolean.FALSE));
 	dokumaran.setShowLineNumbers(JsonUtil.opt(toolContentJSON, "showLineNumbers", Boolean.FALSE));
+	dokumaran.setSharedPadId(JsonUtil.opt(toolContentJSON, "sharedPadId", (String) null));
 	dokumaran.setLockWhenFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
 	dokumaran.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
 	dokumaran.setReflectInstructions(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, (String) null));
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java	(.../IDokumaranService.java)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java	(.../IDokumaranService.java)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -23,15 +23,19 @@
 
 package org.lamsfoundation.lams.tool.dokumaran.service;
 
+import java.net.URISyntaxException;
 import java.util.List;
 
+import javax.servlet.http.Cookie;
+
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.dokumaran.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.dokumaran.dto.SessionDTO;
 import org.lamsfoundation.lams.tool.dokumaran.model.Dokumaran;
 import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranConfigItem;
 import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranSession;
 import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranUser;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 
 import net.gjerull.etherpad.client.EPLiteClient;
 
@@ -68,15 +72,9 @@
      */
     DokumaranUser checkLeaderSelectToolForSessionLeader(DokumaranUser user, Long toolSessionId);
     
-    String getEtherpadReadOnlyId(String padId) throws DokumaranConfigurationException;
+    Cookie createEtherpadCookieForLearner(DokumaranUser user, DokumaranSession session) throws DokumaranConfigurationException, URISyntaxException;
     
-    /**
-     * Stores etherpadReadOnlyId to the session.
-     * 
-     * @param toolSessionId
-     * @param etherpadReadOnlyId
-     */
-    void setEtherpadReadOnlyId(Long toolSessionId, String etherpadReadOnlyId);
+    Cookie createEtherpadCookieForMonitor(UserDTO user, Long contentId) throws DokumaranConfigurationException, URISyntaxException;
     
     /**
      * Creates EPLiteClient that will make calls to Etherpad server. Throws DokumaranConfigurationException tf the tool
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java	(.../LearningAction.java)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java	(.../LearningAction.java)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -24,11 +24,13 @@
 package org.lamsfoundation.lams.tool.dokumaran.web.action;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -52,6 +54,7 @@
 import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranUser;
 import org.lamsfoundation.lams.tool.dokumaran.service.DokumaranApplicationException;
 import org.lamsfoundation.lams.tool.dokumaran.service.DokumaranConfigurationException;
+import org.lamsfoundation.lams.tool.dokumaran.service.DokumaranService;
 import org.lamsfoundation.lams.tool.dokumaran.service.IDokumaranService;
 import org.lamsfoundation.lams.tool.dokumaran.web.form.ReflectionForm;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -75,7 +78,7 @@
 
     @Override
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, JSONException, DokumaranConfigurationException {
+	    HttpServletResponse response) throws IOException, ServletException, JSONException, DokumaranConfigurationException, URISyntaxException {
 
 	String param = mapping.getParameter();
 	// -----------------------Dokumaran Learner function ---------------------------
@@ -106,10 +109,11 @@
      *
      * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
      * @throws DokumaranConfigurationException 
+     * @throws URISyntaxException 
      *
      */
     private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws DokumaranConfigurationException {
+	    HttpServletResponse response) throws DokumaranConfigurationException, URISyntaxException {
 
 	// initial Session Map
 	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
@@ -211,7 +215,7 @@
 	String etherpadServerUrl = etherpadServerUrlConfig.getConfigValue();
 	request.setAttribute(DokumaranConstants.KEY_ETHERPAD_SERVER_URL, etherpadServerUrl);
 	
-	String padId = HashUtil.sha1(DokumaranConstants.PAD_ID_PREFIX + toolSessionId);
+	String padId = session.getPadId();
 	//in case of non-leader or finished lock - show Etherpad in readonly mode
 	if (dokumaran.isUseSelectLeaderToolOuput() && !isUserLeader || finishedLock) {
 	    padId = session.getEtherpadReadOnlyId();
@@ -221,6 +225,10 @@
 	    }
 	}
 	request.setAttribute(DokumaranConstants.ATTR_PAD_ID, padId);
+	
+	//add new sessionID cookie in order to access pad
+	Cookie etherpadSessionCookie = service.createEtherpadCookieForLearner(user, session);
+	response.addCookie(etherpadSessionCookie);
 
 	return mapping.findForward(DokumaranConstants.SUCCESS);
     }
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -25,11 +25,14 @@
 package org.lamsfoundation.lams.tool.dokumaran.web.action;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.util.List;
 
 import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
@@ -46,8 +49,11 @@
 import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranConfigItem;
 import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranSession;
 import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranUser;
+import org.lamsfoundation.lams.tool.dokumaran.service.DokumaranConfigurationException;
 import org.lamsfoundation.lams.tool.dokumaran.service.IDokumaranService;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
@@ -58,23 +64,20 @@
 
     @Override
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, JSONException {
+	    HttpServletResponse response) throws IOException, ServletException, JSONException, DokumaranConfigurationException, URISyntaxException {
 	String param = mapping.getParameter();
 
 	request.setAttribute("initialTabId", WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true));
 
 	if (param.equals("summary")) {
 	    return summary(mapping, form, request, response);
 	}
-	if (param.equals("viewReflection")) {
-	    return viewReflection(mapping, form, request, response);
-	}
 
 	return mapping.findForward(DokumaranConstants.ERROR);
     }
 
     private ActionForward summary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
+	    HttpServletResponse response) throws DokumaranConfigurationException, URISyntaxException {
 	// initial Session Map
 	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
@@ -110,39 +113,24 @@
 	String etherpadServerUrl = etherpadServerUrlConfig.getConfigValue();
 	request.setAttribute(DokumaranConstants.KEY_ETHERPAD_SERVER_URL, etherpadServerUrl);
 	
+	HttpSession ss = SessionManager.getSession();
+	// get back login user DTO
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	
+	//no need to store cookie if there are no sessions created yet
+	if (!groupList.isEmpty()) {
+	    // add new sessionID cookie in order to access pad
+	    Cookie etherpadSessionCookie = service.createEtherpadCookieForMonitor(user, contentId);
+	    response.addCookie(etherpadSessionCookie);
+	}
+	
 	return mapping.findForward(DokumaranConstants.SUCCESS);
     }
 
-    private ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-
-	Long uid = WebUtil.readLongParam(request, DokumaranConstants.ATTR_USER_UID);
-	Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
-
-	IDokumaranService service = getDokumaranService();
-	DokumaranUser user = service.getUser(uid);
-	NotebookEntry notebookEntry = service.getEntry(sessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
-		DokumaranConstants.TOOL_SIGNATURE, user.getUserId().intValue());
-
-	DokumaranSession session = service.getDokumaranSessionBySessionId(sessionID);
-
-	ReflectDTO refDTO = new ReflectDTO(user);
-	if (notebookEntry == null) {
-	    refDTO.setFinishReflection(false);
-	    refDTO.setReflect(null);
-	} else {
-	    refDTO.setFinishReflection(true);
-	    refDTO.setReflect(notebookEntry.getEntry());
-	}
-	refDTO.setReflectInstrctions(session.getDokumaran().getReflectInstructions());
-
-	request.setAttribute("userDTO", refDTO);
-	return mapping.findForward("success");
-    }
-
     // *************************************************************************************
     // Private method
     // *************************************************************************************
+    
     private IDokumaranService getDokumaranService() {
 	WebApplicationContext wac = WebApplicationContextUtils
 		.getRequiredWebApplicationContext(getServlet().getServletContext());
Index: lams_tool_doku/web/pages/authoring/advance.jsp
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -27,6 +27,18 @@
 			<fmt:message key="label.show.line.numbers" />
 		</label>
 	</div>
+	
+	<div class="checkbox">
+		<label for="shared-pad-id-on">
+			<input type="checkbox" id="shared-pad-id-on" 
+				<c:if test="${not empty formBean.dokumaran.sharedPadId}">checked="checked"</c:if>/>
+			<fmt:message key="label.shared.pad.id" />
+		</label>
+	</div>
+	
+	<div class="form-group">
+		<html:text property="dokumaran.sharedPadId" styleClass="form-control" styleId="shared-pad-id" />
+	</div>
 
 </lams:SimplePanel>
 
@@ -40,30 +52,26 @@
 	</div>
 	
 	<div class="checkbox">
-		<label for="reflectOn"><html:checkbox property="dokumaran.reflectOnActivity" styleId="reflectOn"/>
+		<label for="reflect-on">
+			<html:checkbox property="dokumaran.reflectOnActivity" styleId="reflect-on"/>
 			<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 		</label>
 	</div>
 	
 	<div class="form-group">
-		<html:textarea property="dokumaran.reflectInstructions" styleClass="form-control" styleId="reflectInstructions" rows="3" />
+		<html:textarea property="dokumaran.reflectInstructions" styleClass="form-control" styleId="reflect-instructions" rows="3" />
 	</div>
 	
 </lams:SimplePanel>
 
 <script type="text/javascript">
 	//automatically turn on refect option if there are text input in refect instruction area
-	var ra = document.getElementById("reflectInstructions");
-	var rao = document.getElementById("reflectOn");
-	function turnOnRefect(){
-		if(isEmpty(ra.value)){
-		//turn off	
-			rao.checked = false;
-		}else{
-		//turn on
-			rao.checked = true;		
-		}
-	}
-
-	ra.onkeyup=turnOnRefect;
+	$('#reflect-instructions').keyup(function(){
+		$('#reflect-on').prop('checked', !isEmpty($(this).val()));
+	});
+	
+	//automatically turn on shared-pad-id-on option if there are text input in shared-pad-id area
+	$('#shared-pad-id').keyup(function(){
+		$('#shared-pad-id-on').prop('checked', !isEmpty($(this).val()));
+	});
 </script>
Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r28ca2bf32e4d4d665d188f5ac18d16cce4770aed
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 28ca2bf32e4d4d665d188f5ac18d16cce4770aed)
@@ -10,20 +10,21 @@
 <c:set var="dokumaran" value="${sessionMap.dokumaran}" />
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 <c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
 	
 <lams:html>
 <lams:head>
-	<title><fmt:message key="label.learning.title" />
-	</title>
+	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/etherpad.js'/>"></script>
 	<script type="text/javascript">
 		$(document).ready(function(){
+			
 			$('#etherpad-container').pad({
 				'padId':'${padId}',
 				'host':'${etherpadServerUrl}',
-				//'lang':'',
+				'lang':'${fn:toLowerCase(localeLanguage)}',
 				'showControls':'${hasEditRight}',
 				'showChat':'${dokumaran.showChat}',
 				'showLineNumbers':'${dokumaran.showLineNumbers}',