Index: lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -re686259177d09bfb23c125b78ef1209d7d7f7e69
--- lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e686259177d09bfb23c125b78ef1209d7d7f7e69)
@@ -53,8 +53,9 @@
 label.show.chat = Enable chat
 label.show.line.numbers = Show the line numbers
 admin.formError = Missing values, please make sure all required fields are entered.
-admin.whiteboard.url = Whiteboard server URL
-admin.success = Configuration successfully saved.
+admin.whiteboard.url = Whiteboard server URL (use [LAMS_SERVER_URL] to mimic LAMS URL without its port)
+admin.access.token = Whiteboard access token
+admin.success = Configuration successfully saved
 admin.return = Return to maintain LAMS
 error.tool.is.not.configured = In order to proceed please set up tool admin settings.
 label.group.leader = Team leader: {0}
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/model/WhiteboardConfigItem.java
===================================================================
diff -u -rb1bfbd4d153f417655f051047d69a0dbb3582d11 -re686259177d09bfb23c125b78ef1209d7d7f7e69
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/model/WhiteboardConfigItem.java	(.../WhiteboardConfigItem.java)	(revision b1bfbd4d153f417655f051047d69a0dbb3582d11)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/model/WhiteboardConfigItem.java	(.../WhiteboardConfigItem.java)	(revision e686259177d09bfb23c125b78ef1209d7d7f7e69)
@@ -37,7 +37,7 @@
     public static final String KEY_SERVER_URL = "ServerURL";
     public static final String KEY_ACCESS_TOKEN = "AccessToken";
     
-    public static final String SERVER_URL_PLACEHOLDER = "<LAMS_SERVER_URL>";
+    public static final String SERVER_URL_PLACEHOLDER = "[LAMS_SERVER_URL]";
 
     @Id
     @Column(name = "uid")
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/IWhiteboardService.java
===================================================================
diff -u -rb1bfbd4d153f417655f051047d69a0dbb3582d11 -re686259177d09bfb23c125b78ef1209d7d7f7e69
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/IWhiteboardService.java	(.../IWhiteboardService.java)	(revision b1bfbd4d153f417655f051047d69a0dbb3582d11)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/IWhiteboardService.java	(.../IWhiteboardService.java)	(revision e686259177d09bfb23c125b78ef1209d7d7f7e69)
@@ -129,5 +129,5 @@
 
     WhiteboardConfigItem getConfigItem(String key);
 
-    void saveOrUpdateScratchieConfigItem(WhiteboardConfigItem item);
+    void saveOrUpdateWhiteboardConfigItem(WhiteboardConfigItem item);
 }
\ No newline at end of file
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java
===================================================================
diff -u -rb1bfbd4d153f417655f051047d69a0dbb3582d11 -re686259177d09bfb23c125b78ef1209d7d7f7e69
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(.../WhiteboardService.java)	(revision b1bfbd4d153f417655f051047d69a0dbb3582d11)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(.../WhiteboardService.java)	(revision e686259177d09bfb23c125b78ef1209d7d7f7e69)
@@ -435,7 +435,7 @@
     }
 
     @Override
-    public void saveOrUpdateScratchieConfigItem(WhiteboardConfigItem item) {
+    public void saveOrUpdateWhiteboardConfigItem(WhiteboardConfigItem item) {
 	whiteboardConfigItemDao.saveOrUpdate(item);
     }
 
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/AdminController.java
===================================================================
diff -u
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/AdminController.java	(revision 0)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/AdminController.java	(revision e686259177d09bfb23c125b78ef1209d7d7f7e69)
@@ -0,0 +1,95 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.whiteboard.web.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+import org.lamsfoundation.lams.tool.whiteboard.model.WhiteboardConfigItem;
+import org.lamsfoundation.lams.tool.whiteboard.service.IWhiteboardService;
+import org.lamsfoundation.lams.tool.whiteboard.web.form.AdminForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@Controller
+@RequestMapping("/admin")
+public class AdminController {
+
+    @Autowired
+    private IWhiteboardService whiteboardService;
+
+    @RequestMapping("/start")
+    public String start(@ModelAttribute("whiteboardAdminForm") AdminForm whiteboardAdminForm,
+	    HttpServletRequest request) {
+
+	WhiteboardConfigItem whiteboardServerUrlConfigItem = whiteboardService
+		.getConfigItem(WhiteboardConfigItem.KEY_SERVER_URL);
+	if (whiteboardServerUrlConfigItem != null
+		&& StringUtils.isNotBlank(whiteboardServerUrlConfigItem.getConfigValue())) {
+	    whiteboardAdminForm.setWhiteboardServerUrl(whiteboardServerUrlConfigItem.getConfigValue());
+	}
+
+	WhiteboardConfigItem whiteboardAccessTokenConfigItem = whiteboardService
+		.getConfigItem(WhiteboardConfigItem.KEY_ACCESS_TOKEN);
+	if (whiteboardAccessTokenConfigItem != null
+		&& StringUtils.isNotBlank(whiteboardAccessTokenConfigItem.getConfigValue())) {
+	    whiteboardAdminForm.setWhiteboardServerUrl(whiteboardAccessTokenConfigItem.getConfigValue());
+	}
+
+	return "pages/admin/config";
+    }
+
+    @RequestMapping(value = "/saveContent", method = RequestMethod.POST)
+    public String saveContent(@ModelAttribute("whiteboardAdminForm") AdminForm whiteboardAdminForm,
+	    HttpServletRequest request) {
+
+	WhiteboardConfigItem whiteboardServerUrlConfigItem = whiteboardService
+		.getConfigItem(WhiteboardConfigItem.KEY_SERVER_URL);
+	if (whiteboardServerUrlConfigItem == null) {
+	    whiteboardServerUrlConfigItem = new WhiteboardConfigItem();
+	    whiteboardServerUrlConfigItem.setConfigKey(WhiteboardConfigItem.KEY_SERVER_URL);
+	}
+	whiteboardServerUrlConfigItem
+		.setConfigValue(StringUtils.isBlank(whiteboardAdminForm.getWhiteboardServerUrl()) ? null
+			: whiteboardAdminForm.getWhiteboardServerUrl().strip());
+	whiteboardService.saveOrUpdateWhiteboardConfigItem(whiteboardServerUrlConfigItem);
+
+	WhiteboardConfigItem whiteboardAccessTokenConfigItem = whiteboardService
+		.getConfigItem(WhiteboardConfigItem.KEY_ACCESS_TOKEN);
+	if (whiteboardAccessTokenConfigItem == null) {
+	    whiteboardAccessTokenConfigItem = new WhiteboardConfigItem();
+	    whiteboardAccessTokenConfigItem.setConfigKey(WhiteboardConfigItem.KEY_ACCESS_TOKEN);
+	}
+	whiteboardAccessTokenConfigItem
+		.setConfigValue(StringUtils.isBlank(whiteboardAdminForm.getWhiteboardAccessToken()) ? null
+			: whiteboardAdminForm.getWhiteboardAccessToken().strip());
+	whiteboardService.saveOrUpdateWhiteboardConfigItem(whiteboardAccessTokenConfigItem);
+
+	request.setAttribute("savedSuccess", true);
+	return "pages/admin/config";
+
+    }
+}
\ No newline at end of file
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/form/AdminForm.java
===================================================================
diff -u
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/form/AdminForm.java	(revision 0)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/form/AdminForm.java	(revision e686259177d09bfb23c125b78ef1209d7d7f7e69)
@@ -0,0 +1,45 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.whiteboard.web.form;
+
+public class AdminForm {
+
+    private String whiteboardServerUrl;
+    private String whiteboardAccessToken;
+
+    public String getWhiteboardServerUrl() {
+	return whiteboardServerUrl;
+    }
+
+    public void setWhiteboardServerUrl(String whiteboardServerUrl) {
+	this.whiteboardServerUrl = whiteboardServerUrl;
+    }
+
+    public String getWhiteboardAccessToken() {
+	return whiteboardAccessToken;
+    }
+
+    public void setWhiteboardAccessToken(String whiteboardAccessToken) {
+	this.whiteboardAccessToken = whiteboardAccessToken;
+    }
+}
\ No newline at end of file
Index: lams_tool_whiteboard/web/pages/admin/config.jsp
===================================================================
diff -u
--- lams_tool_whiteboard/web/pages/admin/config.jsp	(revision 0)
+++ lams_tool_whiteboard/web/pages/admin/config.jsp	(revision e686259177d09bfb23c125b78ef1209d7d7f7e69)
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<html>
+	<lams:head>
+		<title><fmt:message key="pageTitle.admin" /></title>
+		<lams:css/>
+		<style>
+			table {
+				margin-bottom: 20px;
+			}
+			
+			table td {
+				padding: 10px;
+			}
+		</style>
+	</lams:head>
+	
+	<body class="stripes">
+
+		<c:set var="title"><fmt:message key="pageTitle.admin" /></c:set>
+		<lams:Page type="admin" title="${title}">
+			
+			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.return" /></a>
+			
+			<lams:errors/>
+		
+			<c:if test="${savedSuccess}">
+				<lams:Alert type="info" id="admin-success" close="false">
+					<fmt:message key="admin.success" />
+				</lams:Alert>
+			</c:if>
+			
+			<form:form action="/lams/tool/lawhiteboard11/admin/saveContent.do" modelAttribute="whiteboardAdminForm"
+					   id="whiteboardAdminForm" method="post">
+				<table>
+					<tr>
+						<td>
+							<label for="whiteboardServerUrl"><fmt:message key="admin.whiteboard.url" /></label>
+						</td>
+						<td>
+							<form:input path="whiteboardServerUrl" size="50" maxlength="255" cssClass="form-control form-control-inline" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<label for="whiteboardAccessToken"><fmt:message key="admin.access.token" /></label>
+						</td>
+						<td>
+							<form:input path="whiteboardAccessToken" size="50" maxlength="255" cssClass="form-control form-control-inline" />
+						</td>
+					</tr>
+					
+				</table>
+				<button class="btn btn-primary  pull-right"><fmt:message key="label.save" /></button>
+			</form:form>
+			
+		<div id="footer"></div>
+		</lams:Page>
+	</body>
+</head>
\ No newline at end of file