Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.341 -r1.342
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v
diff -u -r1.36 -r1.37
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	19 Mar 2012 20:51:57 -0000	1.36
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	29 Mar 2012 12:52:50 -0000	1.37
@@ -25,6 +25,8 @@
 
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import javax.servlet.ServletException;
@@ -162,7 +164,11 @@
 		req.setAttribute(AttributeNames.PARAM_PRESENCE_ENABLED, lesson.getLearnerPresenceAvailable());
 		req.setAttribute(AttributeNames.PARAM_PRESENCE_IM_ENABLED, lesson.getLearnerImAvailable());
 		req.setAttribute(AttributeNames.PARAM_TITLE, lesson.getLessonName());
-		req.setAttribute(AttributeNames.PARAM_CREATE_DATE_TIME, lesson.getCreateDateTime());
+		
+		/* Date Format for Chat room append */
+		DateFormat sfm = new SimpleDateFormat("yyyyMMdd_HHmmss");
+		req.setAttribute(AttributeNames.PARAM_CREATE_DATE_TIME, sfm.format(lesson.getCreateDateTime()));
+		
 		String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL);
 		req.setAttribute("serverUrl", serverUrl);
 		String presenceUrl = Configuration.get(ConfigurationKeys.XMPP_DOMAIN);
Index: lams_central/src/java/org/lamsfoundation/lams/web/PresenceServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PresenceServlet.java,v
diff -u -r1.3 -r1.4
--- lams_central/src/java/org/lamsfoundation/lams/web/PresenceServlet.java	24 Nov 2008 22:20:28 -0000	1.3
+++ lams_central/src/java/org/lamsfoundation/lams/web/PresenceServlet.java	29 Mar 2012 12:52:50 -0000	1.4
@@ -26,6 +26,8 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.Vector;
 
 import javax.servlet.ServletException;
@@ -40,6 +42,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceProxy;
+import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.dto.LessonDTO;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.dto.UserFlashDTO;
@@ -108,9 +111,13 @@
 		
 		ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
 		
+		/* Date Format for Chat room append */
+		DateFormat sfm = new SimpleDateFormat("yyyyMMdd_HHmmss");
 		Long lessonId = (Long)WebUtil.readLongParam(request,"lessonId");
-		LessonDTO dto = learnerService.getLessonData(lessonId);
-		String xmppRoomName = lessonId + dto.getCreateDateTimeString() + "@" + Configuration.get(ConfigurationKeys.XMPP_CONFERENCE);
+		Lesson lesson = learnerService.getLesson(lessonId);
+		String createDateTimeStr = sfm.format(lesson.getCreateDateTime());
+		
+		String xmppRoomName = lessonId + "_" + createDateTimeStr + "@" + Configuration.get(ConfigurationKeys.XMPP_CONFERENCE);
 		xmppRoomName = xmppRoomName.replace(" ", "_");
 		xmppRoomName = xmppRoomName.replace(":", "_");
 		Boolean xmppRoomCreated = XMPPUtil.createMultiUserChat(xmppRoomName);
Index: lams_central/web/learner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/Attic/learner.jsp,v
diff -u -r1.22 -r1.23
--- lams_central/web/learner.jsp	19 Mar 2012 20:51:57 -0000	1.22
+++ lams_central/web/learner.jsp	29 Mar 2012 12:52:50 -0000	1.23
@@ -9,17 +9,27 @@
 <lams:html>
 <lams:head>
 
-<c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
-	
-<c:choose>
-	<c:when test="${enableFlash}">
-		<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainflash.jsp?lessonID=<c:out value="${param.lessonID}"/>&portfolioEnabled=<c:out value="${param.portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${param.presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${param.presenceImEnabled}"/>&presenceUrl=<c:out value="${param.presenceUrl}"/>&createDateTime=<c:out value="${param.createDateTime}"/>&title=<c:out value="${param.title}"/><c:if test="${param.mode != null}">&mode=<c:out value="${param.mode}"/></c:if><c:if test="${param.param.notifyCloseURL != null}">&notifyCloseURL=<c:out value="${param.param.notifyCloseURL}"/></c:if>">
-	</c:when>
-	<c:otherwise>
-		<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainnoflash.jsp?lessonID=<c:out value="${param.lessonID}"/>&portfolioEnabled=<c:out value="${param.portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${param.presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${param.presenceImEnabled}"/>&presenceUrl=<c:out value="${param.presenceUrl}"/>&createDateTime=<c:out value="${param.createDateTime}"/>&title=<c:out value="${param.title}"/><c:if test="${param.mode != null}">&mode=<c:out value="${param.mode}"/></c:if><c:if test="${param.param.notifyCloseURL != null}">&notifyCloseURL=<c:out value="${param.param.notifyCloseURL}"/></c:if>">
-	</c:otherwise>
-</c:choose>
+	<%-- if coming from lessonIntro.jsp convert received parameters into page variables --%>
+	<c:if test="${not empty param.lessonID}"> <c:set var="lessonID" value="${param.lessonID}" /> </c:if>
+	<c:if test="${not empty param.portfolioEnabled}"> <c:set var="portfolioEnabled" value="${param.portfolioEnabled}" /> </c:if>
+	<c:if test="${not empty param.presenceEnabledPatch}"> <c:set var="presenceEnabledPatch" value="${param.presenceEnabledPatch}" /> </c:if>
+	<c:if test="${not empty param.presenceImEnabled}"> <c:set var="presenceImEnabled" value="${param.presenceImEnabled}" /> </c:if>
+	<c:if test="${not empty param.presenceUrl}"> <c:set var="presenceUrl" value="${param.presenceUrl}" /> </c:if>
+	<c:if test="${not empty param.createDateTime}"> <c:set var="createDateTime" value="${param.createDateTime}" /> </c:if>
+	<c:if test="${not empty param.title}"> <c:set var="title" value="${param.title}" /> </c:if>
+	<c:if test="${not empty param.mode}"> <c:set var="mode" value="${param.mode}" /> </c:if>
 
+	<c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
+		
+	<c:choose>
+		<c:when test="${enableFlash}">
+			<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainflash.jsp?lessonID=<c:out value="${lessonID}"/>&portfolioEnabled=<c:out value="${portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${presenceImEnabled}"/>&presenceUrl=<c:out value="${presenceUrl}"/>&createDateTime=<c:out value="${createDateTime}"/>&title=<c:out value="${title}"/><c:if test="${mode != null}">&mode=<c:out value="${mode}"/></c:if><c:if test="${param.notifyCloseURL != null}">&notifyCloseURL=<c:out value="${param.notifyCloseURL}"/></c:if>">
+		</c:when>
+		<c:otherwise>
+			<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainnoflash.jsp?lessonID=<c:out value="${lessonID}"/>&portfolioEnabled=<c:out value="${portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${presenceImEnabled}"/>&presenceUrl=<c:out value="${presenceUrl}"/>&createDateTime=<c:out value="${createDateTime}"/>&title=<c:out value="${title}"/><c:if test="${mode != null}">&mode=<c:out value="${mode}"/></c:if><c:if test="${param.notifyCloseURL != null}">&notifyCloseURL=<c:out value="${param.notifyCloseURL}"/></c:if>">
+		</c:otherwise>
+	</c:choose>
+
 	<TITLE><fmt:message key="title.learner.window"/></TITLE>
 	<lams:css/>
 </lams:head>
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java,v
diff -u -r1.16 -r1.17
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java	17 Mar 2010 01:22:00 -0000	1.16
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java	29 Mar 2012 12:53:02 -0000	1.17
@@ -39,6 +39,7 @@
     private String lessonDescription;
     private Integer lessonStateID;
     private Date createDateTime;
+    private String createDateTimeStr;
     private Date startDateTime;
     private String startDateTimeStr;
     private Date scheduleStartDate;
@@ -73,6 +74,7 @@
 
 	this.lessonStateID = lesson.getLessonStateId();
 	this.createDateTime = lesson.getCreateDateTime();
+	this.createDateTimeStr = null;
 	this.startDateTime = lesson.getStartDateTime();
 	this.startDateTimeStr = null;
 	this.scheduleStartDate = lesson.getScheduleStartDate();
@@ -145,7 +147,15 @@
     public Date getCreateDateTime() {
 	return createDateTime != null ? createDateTime : WDDXTAGS.DATE_NULL_VALUE;
     }
+    
+    public String getCreateDateTimeStr() {
+	return createDateTimeStr != null ? createDateTimeStr : WDDXTAGS.STRING_NULL_VALUE;
+    }
 
+    public void setCreateDateTimeStr(String createDateTimeStr) {
+	this.createDateTimeStr = createDateTimeStr;
+    }
+
     /**
      * @return Returns the duration.
      */
Index: lams_learning/web/mainflash.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/mainflash.jsp,v
diff -u -r1.9 -r1.10
--- lams_learning/web/mainflash.jsp	21 Mar 2012 17:16:45 -0000	1.9
+++ lams_learning/web/mainflash.jsp	29 Mar 2012 12:53:01 -0000	1.10
@@ -162,7 +162,8 @@
 				</object>
 			</noscript>
 		</div>
-		
+
+		<c:set var="presenceUrl" scope="request"><c:out value="${param.presenceUrl}"/></c:set>
 		<c:if test="${param.presenceEnabledPatch}">
     		<%@ include file="/includes/presenceChat.jsp" %>
 		</c:if>
Index: lams_learning/web/mainnoflash.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/mainnoflash.jsp,v
diff -u -r1.11 -r1.12
--- lams_learning/web/mainnoflash.jsp	19 Jun 2009 10:50:44 -0000	1.11
+++ lams_learning/web/mainnoflash.jsp	29 Mar 2012 12:53:00 -0000	1.12
@@ -67,6 +67,7 @@
 		<lams:help style="small" page="learner"/>
 		</div>
 		
+		<c:set var="presenceUrl" scope="request"><c:out value="${param.presenceUrl}"/></c:set>
 		<c:if test="${param.presenceEnabledPatch}">
 		    <%@ include file="/includes/presenceChat.jsp" %>
 		</c:if>
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v
diff -u -r1.167 -r1.168
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	20 Mar 2012 16:37:35 -0000	1.167
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	29 Mar 2012 12:52:56 -0000	1.168
@@ -1556,8 +1556,13 @@
 	Locale userLocale = new Locale(user.getLocale().getLanguageIsoCode(), user.getLocale().getCountryIsoCode());
 	TimeZone tz = TimeZone.getTimeZone(user.getTimeZone());
 	
-	DateFormat indfm = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss", userLocale);
+	/* Date Format for Chat room append */
+	DateFormat sfm = new SimpleDateFormat("yyyyMMdd_HHmmss");
+	if (dto.getCreateDateTime() != WDDXTAGS.DATE_NULL_VALUE && dto.getCreateDateTime() != null) {
+	    dto.setCreateDateTimeStr(sfm.format(dto.getCreateDateTime()));
+	}
 	
+	DateFormat indfm = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss", userLocale);
 	if (dto.getStartDateTime() != WDDXTAGS.DATE_NULL_VALUE && dto.getStartDateTime() != null) {
 		Date tzStartDate = DateUtil.convertToTimeZoneFromDefault(tz, dto.getStartDateTime());
 		dto.setStartDateTimeStr(indfm.format(tzStartDate) + " " + tz.getDisplayName(userLocale));