Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.123 -r1.124
--- lams_build/build.xml	28 Nov 2014 22:41:30 -0000	1.123
+++ lams_build/build.xml	4 Dec 2014 23:06:50 -0000	1.124
@@ -154,7 +154,6 @@
 		<ant antfile="../${lams_common}/build.xml"            target="_build-jar"     inheritAll="false" />
 		<ant antfile="../${lams_contentrepository}/build.xml" target="_build-jar"     inheritAll="false" />
 		<ant antfile="../${lams_central}/build.xml"           target="_build-product" inheritAll="false" />
-		<ant antfile="../${lams_launchlearnerurl}/build.xml"  target="_build-war"     inheritAll="false" />
 		<ant antfile="../${lams_learning}/build.xml"          target="_build-product" inheritAll="false" />
 		<ant antfile="../${lams_monitoring}/build.xml"        target="_build-product" inheritAll="false" />
 		<ant antfile="../${lams_admin}/build.xml"             target="_build-product" inheritAll="false" />
@@ -271,9 +270,6 @@
 		<copy todir="${jboss.deploy}">
 			<fileset dir="${assembly}/${lams.ear}" />
 		</copy>
-		
-		<echo>Deploying ROOT.war responsible for launching learner url</echo>
-		<ant antfile="../${lams_launchlearnerurl}/build.xml" target="deploy-war" inheritAll="false" />
 	</target>
 	
 	
Index: lams_build/shared.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_build/shared.properties,v
diff -u -r1.44 -r1.45
--- lams_build/shared.properties	28 Nov 2014 22:41:30 -0000	1.44
+++ lams_build/shared.properties	4 Dec 2014 23:06:50 -0000	1.45
@@ -32,7 +32,6 @@
 lams_common=lams_common
 lams_contentrepository=lams_contentrepository
 lams_gradebook=lams_gradebook
-lams_launchlearnerurl=lams_launchlearnerurl
 lams_learning=lams_learning
 lams_monitoring=lams_monitoring
 lams_planner=lams_planner
Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.436 -r1.437
Binary files differ
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/LaunchLearnerAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/web/LaunchLearnerUrlServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LaunchLearnerUrlServlet.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/src/java/org/lamsfoundation/lams/web/LaunchLearnerUrlServlet.java	4 Dec 2014 23:06:55 -0000	1.1
@@ -0,0 +1,130 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+/* $$Id: LaunchLearnerUrlServlet.java,v 1.1 2014/12/04 23:06:55 andreyb Exp $$ */
+package org.lamsfoundation.lams.web;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsAction;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * Sends redirect to lams learner. Format: launchlearner.do?lessonID=<encodedLessonId>
+ * 
+ * @web:servlet name="LaunchLearnerUrlServlet"
+ * @web:servlet-mapping url-pattern="/r/*"
+ */
+public class LaunchLearnerUrlServlet extends HttpServlet {
+
+    private static Logger log = Logger.getLogger(LaunchLearnerUrlServlet.class);
+
+    private static ILessonService lessonService;
+
+    private ILessonService getLessonService() {
+	if (lessonService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServletContext());
+	    lessonService = (ILessonService) ctx.getBean("lessonService");
+	}
+	return lessonService;
+    }
+
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	String encodedLessonId = request.getPathInfo();
+
+	// redirect to login page if accessing / URL
+	if (StringUtils.isBlank(encodedLessonId) || encodedLessonId.length() < 2) {
+	    String lamsUrl = Configuration.get(ConfigurationKeys.SERVER_URL);
+	    response.sendRedirect(lamsUrl);
+	    return;
+	}
+
+	// cut off the first '/'
+	encodedLessonId = encodedLessonId.substring(1);
+	
+	Long lessonId;
+	try {
+	    String decodedLessonId = WebUtil.decodeLessonId(encodedLessonId);
+	    lessonId = Long.valueOf(decodedLessonId);
+	    
+	} catch (IllegalArgumentException e) {
+	    log.warn("Supplied lessonId: " + encodedLessonId + " has wrong format.");
+	     response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Supplied lessonId: " + encodedLessonId + " has wrong format.");
+//	     return mapping.findForward("error");
+//	    displayMessage(request, response, "error.lessonid.has.wrong.format");
+	    return;
+	}
+	    
+	
+
+	Lesson lesson = lessonId != null ? getLessonService().getLesson(lessonId) : null;
+	if (lesson != null) {
+	    // return displayMessage(mapping, req, "message.lesson.not.started.cannot.participate");
+	}
+
+	request.setAttribute("name", lesson.getLessonName());
+	request.setAttribute("description", lesson.getLessonDescription());
+	request.setAttribute("status", lesson.getLessonStateId());
+	request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
+
+	request.getRequestDispatcher("/launchlearner.jsp").forward(request, response);
+
+	// getServletContext().getContext(serverURLContextPath + "learning")
+	// .getRequestDispatcher("/main.jsp").forward(req, res);
+	// return null;
+	//
+	//
+	// request.setAttribute( AttributeNames.PARAM_LESSON_ID, encodedLessonId);
+	// request.getRequestDispatcher("/launchlearner.do").forward(request, response);
+    }
+
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	doPost(request, response);
+    }
+
+    private void displayMessage(HttpServletRequest request, HttpServletResponse response, String messageKey)
+	    throws ServletException, IOException {
+	request.setAttribute("messageKey", messageKey);
+	request.getRequestDispatcher("/.message").forward(request, response);
+    }
+}
\ No newline at end of file
Index: lams_central/web/launchlearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/launchlearner.jsp,v
diff -u -r1.6 -r1.7
--- lams_central/web/launchlearner.jsp	2 Jul 2009 08:19:14 -0000	1.6
+++ lams_central/web/launchlearner.jsp	4 Dec 2014 23:06:54 -0000	1.7
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ page import="org.lamsfoundation.lams.lesson.Lesson" %>
@@ -11,9 +10,9 @@
 <lams:head>
 	<title><fmt:message key="index.welcome" /></title>
 	<lams:css />
-	<script language="JavaScript" type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
-	<script language="javascript" type="text/javascript" src="loadVars.jsp"></script>
-	<script language="JavaScript" type="text/javascript" src="includes/javascript/openUrls.js"></script>
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL />includes/javascript/getSysInfo.js"></script>
+	<script language="javascript" type="text/javascript" src="<lams:LAMSURL />loadVars.jsp"></script>
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL />includes/javascript/openUrls.js"></script>
 </lams:head>
 
 <body class="stripes">
@@ -26,50 +25,51 @@
 		<h1 class="no-tabs-below"><c:out value="${name}"/></h1>
 		<p><c:out value="${description}" escapeXml="false"/></p>
 		<p>
-		<!-- defined Lesson states -->
-		<c:set var="created"><%= Lesson.CREATED %></c:set>
-		<c:set var="notstarted"><%= Lesson.NOT_STARTED_STATE %></c:set>
-		<c:set var="started"><%= Lesson.STARTED_STATE %></c:set>
-		<c:set var="finished"><%= Lesson.FINISHED_STATE %></c:set>
-		<c:set var="suspended"><%= Lesson.SUSPENDED_STATE %></c:set>
-		<c:set var="archived"><%= Lesson.ARCHIVED_STATE %></c:set>
-		<c:set var="removed"><%= Lesson.REMOVED_STATE %></c:set>
+		
+			<!-- defined Lesson states -->
+			<c:set var="created"><%= Lesson.CREATED %></c:set>
+			<c:set var="notstarted"><%= Lesson.NOT_STARTED_STATE %></c:set>
+			<c:set var="started"><%= Lesson.STARTED_STATE %></c:set>
+			<c:set var="finished"><%= Lesson.FINISHED_STATE %></c:set>
+			<c:set var="suspended"><%= Lesson.SUSPENDED_STATE %></c:set>
+			<c:set var="archived"><%= Lesson.ARCHIVED_STATE %></c:set>
+			<c:set var="removed"><%= Lesson.REMOVED_STATE %></c:set>
 
-				<c:if test="${status == created || status == notstarted}">
-					<fmt:message key="label.msg.status">
-						<fmt:param>
-							<fmt:message key="msg.status.not.stated"/>
-						</fmt:param>
-					</fmt:message>
-					<c:set var="button" value="false"/>
-				</c:if>
-				<c:if test="${status == started}">
-					<c:set var="button" value="true"/>
-				</c:if>
-				<c:if test="${status == suspended}">
-					<fmt:message key="label.msg.status">
-						<fmt:param>
-							<fmt:message key="msg.status.disabled"/>
-						</fmt:param>
-					</fmt:message>
-					<c:set var="button" value="false"/>
-				</c:if>
-				<c:if test="${status == finished || status == archived}">
-					<fmt:message key="label.msg.status">
-						<fmt:param>
-							<fmt:message key="msg.status.finished"/>
-						</fmt:param>
-					</fmt:message>
-					<c:set var="button" value="true"/>
-				</c:if>
-				<c:if test="${status == removed}">
-					<fmt:message key="label.msg.status">
-						<fmt:param>
-							<fmt:message key="msg.status.removed"/>
-						</fmt:param>
-					</fmt:message>
-					<c:set var="button" value="false"/>
-				</c:if>
+			<c:if test="${status == created || status == notstarted}">
+				<fmt:message key="label.msg.status">
+					<fmt:param>
+						<fmt:message key="msg.status.not.stated"/>
+					</fmt:param>
+				</fmt:message>
+				<c:set var="button" value="false"/>
+			</c:if>
+			<c:if test="${status == started}">
+				<c:set var="button" value="true"/>
+			</c:if>
+			<c:if test="${status == suspended}">
+				<fmt:message key="label.msg.status">
+					<fmt:param>
+						<fmt:message key="msg.status.disabled"/>
+					</fmt:param>
+				</fmt:message>
+				<c:set var="button" value="false"/>
+			</c:if>
+			<c:if test="${status == finished || status == archived}">
+				<fmt:message key="label.msg.status">
+					<fmt:param>
+						<fmt:message key="msg.status.finished"/>
+					</fmt:param>
+				</fmt:message>
+				<c:set var="button" value="true"/>
+			</c:if>
+			<c:if test="${status == removed}">
+				<fmt:message key="label.msg.status">
+					<fmt:param>
+						<fmt:message key="msg.status.removed"/>
+					</fmt:param>
+				</fmt:message>
+				<c:set var="button" value="false"/>
+			</c:if>
 		</p>
 		<c:if test="${button}">
 			<a href='javascript:openLearner(<c:out value="${lessonID}"/>)' class='button'><fmt:message key="label.open.lesson"/></a>
@@ -80,6 +80,4 @@
 		
 	</div>
 </body>
-
-
 </lams:html>
\ No newline at end of file
Index: lams_central/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/login.jsp,v
diff -u -r1.52 -r1.53
--- lams_central/web/login.jsp	8 Oct 2014 05:50:55 -0000	1.52
+++ lams_central/web/login.jsp	4 Dec 2014 23:06:55 -0000	1.53
@@ -39,8 +39,8 @@
 	<lams:css  style="core"/>
 	<link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
-	<script language="javascript" type="text/javascript" src="includes/javascript/browser_detect.js"></script>
-	<script language="JavaScript" type="text/javascript" src="includes/javascript/sha1.js"></script>
+	<script language="javascript" type="text/javascript" src="<lams:LAMSURL />includes/javascript/browser_detect.js"></script>
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL />includes/javascript/sha1.js"></script>
 	<script>
 		function submitForm(){
 			  var password=document.loginForm.j_password.value;
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v
diff -u -r1.38 -r1.39
--- lams_central/web/includes/javascript/openUrls.js	3 Mar 2010 04:24:01 -0000	1.38
+++ lams_central/web/includes/javascript/openUrls.js	4 Dec 2014 23:06:55 -0000	1.39
@@ -182,18 +182,18 @@
 		{
 			if(isMac)
 			{
-				learnWin = window.open('home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,status=yes');
+				learnWin = window.open('../home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,status=yes');
 			}
 			else
 			{
 				if(learnWin && !learnWin.closed )
 				{
-					learnWin.location = 'home.do?method=learner&lessonID='+lessonId;		
+					learnWin.location = '../home.do?method=learner&lessonID='+lessonId;		
 					learnWin.focus();
 				}
 				else
 				{
-					learnWin = window.open('home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,status=yes');
+					learnWin = window.open('../home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,status=yes');
 				}
 			}
 		}
Index: lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java,v
diff -u -r1.29 -r1.30
--- lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java	6 Jan 2014 08:42:18 -0000	1.29
+++ lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java	4 Dec 2014 23:06:56 -0000	1.30
@@ -42,6 +42,8 @@
      * <code>(?:<BR>|<br>|<BR />|<br />)</code> . Right now CKeditor creates only the first option.
      */
     private static final String SPACE_TAG_REGEX = "(?:<BR>)|(?:&nbsp;)|(?:</div><div>)";
+    
+    private static final String URL_SHORTENING_CYPHER = "jbdnuteywk";
 
     /**
      */
@@ -656,4 +658,55 @@
 	// "https://" is 8 characters, so next "/" should be context
 	return serverURL.substring(0, serverURL.indexOf('/', 9));
     }
+    
+    /**
+     * Converse lessonId into alphabetic sequence for using it in URL shortening
+     * 
+     * @param lessonId
+     * @return
+     */
+    public static String encodeLessonId(Long lessonId) {
+	
+	String encodedLessonId = lessonId.toString();
+	encodedLessonId = encodedLessonId.replace('0', URL_SHORTENING_CYPHER.charAt(0));
+	encodedLessonId = encodedLessonId.replace('1', URL_SHORTENING_CYPHER.charAt(1));
+	encodedLessonId = encodedLessonId.replace('2', URL_SHORTENING_CYPHER.charAt(2));
+	encodedLessonId = encodedLessonId.replace('3', URL_SHORTENING_CYPHER.charAt(3));
+	encodedLessonId = encodedLessonId.replace('4', URL_SHORTENING_CYPHER.charAt(4));
+	encodedLessonId = encodedLessonId.replace('5', URL_SHORTENING_CYPHER.charAt(5));
+	encodedLessonId = encodedLessonId.replace('6', URL_SHORTENING_CYPHER.charAt(6));
+	encodedLessonId = encodedLessonId.replace('7', URL_SHORTENING_CYPHER.charAt(7));
+	encodedLessonId = encodedLessonId.replace('8', URL_SHORTENING_CYPHER.charAt(8));
+	encodedLessonId = encodedLessonId.replace('9', URL_SHORTENING_CYPHER.charAt(9));
+	
+	return encodedLessonId;
+    }
+    
+    /**
+     * Decodes alphabetic sequence (that is lessonId encoded for URL shortening purposes)
+     * 
+     * @param encodedlessonId
+     * @return
+     */
+    public static String decodeLessonId(String encodedLessonId) throws IllegalArgumentException{
+	
+	// it should contain only the characters from URL_SHORTENING_CYPHER
+	if (!encodedLessonId.matches("[" + URL_SHORTENING_CYPHER + "]*")) {
+	    throw new IllegalArgumentException("LessonId: " + encodedLessonId + " has wrong format.");
+	}
+	
+	String decodedLessonId = encodedLessonId;
+	decodedLessonId = decodedLessonId.replace(URL_SHORTENING_CYPHER.charAt(0), '0');
+	decodedLessonId = decodedLessonId.replace(URL_SHORTENING_CYPHER.charAt(1), '1');
+	decodedLessonId = decodedLessonId.replace(URL_SHORTENING_CYPHER.charAt(2), '2');
+	decodedLessonId = decodedLessonId.replace(URL_SHORTENING_CYPHER.charAt(3), '3');
+	decodedLessonId = decodedLessonId.replace(URL_SHORTENING_CYPHER.charAt(4), '4');
+	decodedLessonId = decodedLessonId.replace(URL_SHORTENING_CYPHER.charAt(5), '5');
+	decodedLessonId = decodedLessonId.replace(URL_SHORTENING_CYPHER.charAt(6), '6');
+	decodedLessonId = decodedLessonId.replace(URL_SHORTENING_CYPHER.charAt(7), '7');
+	decodedLessonId = decodedLessonId.replace(URL_SHORTENING_CYPHER.charAt(8), '8');
+	decodedLessonId = decodedLessonId.replace(URL_SHORTENING_CYPHER.charAt(9), '9');
+	
+	return decodedLessonId;
+    }
 }
\ No newline at end of file
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringUtils.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.129 -r1.130
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	28 Nov 2014 22:43:21 -0000	1.129
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	4 Dec 2014 23:06:38 -0000	1.130
@@ -74,7 +74,6 @@
 import org.lamsfoundation.lams.monitoring.dto.ContributeActivityDTO;
 import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
 import org.lamsfoundation.lams.monitoring.service.MonitoringServiceProxy;
-import org.lamsfoundation.lams.monitoring.service.MonitoringUtils;
 import org.lamsfoundation.lams.security.ISecurityService;
 import org.lamsfoundation.lams.timezone.service.ITimezoneService;
 import org.lamsfoundation.lams.tool.exception.LamsToolServiceException;
@@ -903,7 +902,7 @@
 	    lessonDTO.setCreateDateTimeStr(sfm.format(lessonDTO.getCreateDateTime()));
 	}
 	//prepare encoded lessonId for shortened learner URL
-	lessonDTO.setEncodedLessonID(MonitoringUtils.encodeLessonId(lessonId));
+	lessonDTO.setEncodedLessonID(WebUtil.encodeLessonId(lessonId));
 
 	if (!getSecurityService().isLessonMonitor(lessonId, user.getUserID(), "monitor lesson", false)) {
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the lesson");
Index: lams_monitoring/web/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.28 -r1.29
--- lams_monitoring/web/monitor.jsp	28 Nov 2014 22:43:21 -0000	1.28
+++ lams_monitoring/web/monitor.jsp	4 Dec 2014 23:06:38 -0000	1.29
@@ -5,8 +5,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
-<c:set var="url">${pageContext.request.requestURL}</c:set>
-<c:set var="uri" value="${pageContext.request.requestURI}" />
 
 <!DOCTYPE HTML>
 <lams:html>
@@ -169,6 +167,11 @@
 				</td>
 				<td id="learnersStartedPossibleCell"></td>
 			</tr>
+			
+			<c:set var="serverURL"><%=Configuration.get(ConfigurationKeys.SERVER_URL)%></c:set>
+			<c:if test="${fn:substring(serverURL, fn:length(serverURL)-1, fn:length(serverURL)) != '/'}">
+				<c:set var="serverURL">${serverURL}/</c:set>
+			</c:if>
 			<c:set var="showLearnerURL"><%=Configuration.get(ConfigurationKeys.ALLOW_DIRECT_LESSON_LAUNCH)%></c:set>
 			<c:if test="${showLearnerURL}">
 				<tr>
@@ -177,14 +180,15 @@
 					</td>
 					<td>
 						<input id="learnerURLField" class="lessonManageField"
-						       value="${fn:substring(url, 0, fn:length(url) - fn:length(uri))}/${lesson.encodedLessonID}"
+						       value="${serverURL}r/${lesson.encodedLessonID}"
 						       readonly="readonly" />
 						<a class="button lessonManageField" href="#"
 						   onClick="javascript:selectLearnerURL()"><fmt:message key="button.select"/></a>
 						<span id="copyLearnerURL"><fmt:message key="lesson.copy.prompt"/></span>
 					</td>
 				</tr>
 			</c:if>
+			
 			<tr>
 				<td class="fieldLabel">
 					<fmt:message key="lesson.class"/>