Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf6d56ca541fb7a6d7004cfc2b42f052e1990564d -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f6d56ca541fb7a6d7004cfc2b42f052e1990564d)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -265,6 +265,88 @@
 msg.num.created.users  ={0} users were created in LAMS.
 msg.num.updated.users  ={0} users already existed in LAMS and were updated.
 msg.num.disabled.users  ={0} users were disabled in LAMS.
+config.header.system = System Configuration
+config.header.email = Email
+config.header.uploads = Uploaded Files
+config.header.chat = Chat Server
+config.header.ldap = LDAP
+config.header.ldap.attributes = LDAP Attribute Mapping
+config.header.features = Features
+config.header.look.feel = Look and Feel
+config.header.versions = Versions
+config.server.url = Server URL
+config.server.url.context.path = Server URL Context Path 
+config.version = Version
+config.temp.dir = Temporary Files Directory
+config.dump.dir = Flash Dump Files Directory
+config.ear.dir = EAR Directory
+config.smtp.server = SMTP Server
+config.lams.support.email = LAMS Support Email
+config.content.repository.path = Content Repository Directory
+config.upload.file.max.size = Maximum Upload Size
+config.upload.large.file.max.size = Maximum Large Upload Size
+config.upload.file.max.memory.size = Maximum Memory Used When Uploading
+config.executable.extensions = Executable Extensions
+config.user.inactive.timeout = Inactive User Timeout
+config.use.cache.debug.listener = Cache Debug Listener
+config.cleanup.preview.older.than.days = Number of Days to Keep Preview
+config.authoring.activities.colour = Authoring Activities Colour
+config.authoring.client.version = Authoring Client Version
+config.monitor.client.version = Monitoring Client Version
+config.learner.client.version = Learner Client Version
+config.server.version.number = Server Version Number
+config.server.language = Locale
+config.server.page.direction = Locale Page Direction
+config.dictionary.date.created = Language Pack Install Date
+config.help.url = Help URL
+config.xmpp.domain = Chat Server Domain
+config.xmpp.conference = Chat Server Conference
+config.xmpp.admin = Chat Server Admin Username
+config.xmpp.password = Chat Server Admin Password
+config.default.flash.theme = Default Flash Theme
+config.default.html.theme = Default HTML Theme
+config.allow.direct.lesson.launch = Allow Direct Lesson Launch
+config.community.enable = Enable LAMS Community
+config.allow.live.edit = Allow Live Edit
+config.ldap.provisioning.enabled = Enable Provisioning
+config.ldap.provider.url = LDAP Server URL
+config.ldap.security.authentication = Authentication Mechanism
+config.ldap.principal.dn.prefix = User's Distinguished Name Prefix
+config.ldap.principal.dn.suffix = User's Distinguished Name Suffixes
+config.ldap.security.protocol = Security Protocol
+config.ldap.truststore.path = SSL Certificate Path
+config.ldap.truststore.password = SSL Certificate Password
+config.ldap.login.attr = Login
+config.ldap.fname.attr = First Name
+config.ldap.lname.attr = Last Name
+config.ldap.email.attr = Email
+config.ldap.addr1.attr = Address Line 1
+config.ldap.addr2.attr = Address Line 2
+config.ldap.addr3.attr = Address Line 3
+config.ldap.city.attr = City
+config.ldap.state.attr = State
+config.ldap.postcode.attr = Postcode
+config.ldap.country.attr = Country
+config.ldap.day.phone.attr = Day Phone
+config.ldap.evening.phone.attr = Evening Phone
+config.ldap.fax.attr = Fax
+config.ldap.mobile.attr = Mobile
+config.ldap.locale.attr = Locale
+config.ldap.disabled.attr = Disabled
+config.ldap.org.attr = Group
+config.ldap.roles.attr = Roles
+config.ldap.learner.map = Learner Role Map
+config.ldap.monitor.map = Monitor Role Map
+config.ldap.author.map = Author Role Map
+config.ldap.group.admin.map = Group Admin Role Map
+config.ldap.group.manager.map = Group Manager Role Map
+config.ldap.update.on.login = Update on Login
+config.ldap.org.field = Group Field Map
+config.ldap.only.one.org = Only One Group
+config.ldap.encrypt.password.from.browser = Encrypt Password From Browser 
+config.ldap.search.results.page.size = Search Results Page Size
+error.required = This item is required: {0}
+error.numeric = This item only accepts numeric characters: {0}
 
 
 #======= End labels: Exported 258 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rf6d56ca541fb7a6d7004cfc2b42f052e1990564d -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f6d56ca541fb7a6d7004cfc2b42f052e1990564d)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -265,6 +265,88 @@
 msg.num.created.users  ={0} users were created in LAMS.
 msg.num.updated.users  ={0} users already existed in LAMS and were updated.
 msg.num.disabled.users  ={0} users were disabled in LAMS.
+config.header.system = System Configuration
+config.header.email = Email
+config.header.uploads = Uploaded Files
+config.header.chat = Chat Server
+config.header.ldap = LDAP
+config.header.ldap.attributes = LDAP Attribute Mapping
+config.header.features = Features
+config.header.look.feel = Look and Feel
+config.header.versions = Versions
+config.server.url = Server URL
+config.server.url.context.path = Server URL Context Path 
+config.version = Version
+config.temp.dir = Temporary Files Directory
+config.dump.dir = Flash Dump Files Directory
+config.ear.dir = EAR Directory
+config.smtp.server = SMTP Server
+config.lams.support.email = LAMS Support Email
+config.content.repository.path = Content Repository Directory
+config.upload.file.max.size = Maximum Upload Size
+config.upload.large.file.max.size = Maximum Large Upload Size
+config.upload.file.max.memory.size = Maximum Memory Used When Uploading
+config.executable.extensions = Executable Extensions
+config.user.inactive.timeout = Inactive User Timeout
+config.use.cache.debug.listener = Cache Debug Listener
+config.cleanup.preview.older.than.days = Number of Days to Keep Preview
+config.authoring.activities.colour = Authoring Activities Colour
+config.authoring.client.version = Authoring Client Version
+config.monitor.client.version = Monitoring Client Version
+config.learner.client.version = Learner Client Version
+config.server.version.number = Server Version Number
+config.server.language = Locale
+config.server.page.direction = Locale Page Direction
+config.dictionary.date.created = Language Pack Install Date
+config.help.url = Help URL
+config.xmpp.domain = Chat Server Domain
+config.xmpp.conference = Chat Server Conference
+config.xmpp.admin = Chat Server Admin Username
+config.xmpp.password = Chat Server Admin Password
+config.default.flash.theme = Default Flash Theme
+config.default.html.theme = Default HTML Theme
+config.allow.direct.lesson.launch = Allow Direct Lesson Launch
+config.community.enable = Enable LAMS Community
+config.allow.live.edit = Allow Live Edit
+config.ldap.provisioning.enabled = Enable Provisioning
+config.ldap.provider.url = LDAP Server URL
+config.ldap.security.authentication = Authentication Mechanism
+config.ldap.principal.dn.prefix = User's Distinguished Name Prefix
+config.ldap.principal.dn.suffix = User's Distinguished Name Suffixes
+config.ldap.security.protocol = Security Protocol
+config.ldap.truststore.path = SSL Certificate Path
+config.ldap.truststore.password = SSL Certificate Password
+config.ldap.login.attr = Login
+config.ldap.fname.attr = First Name
+config.ldap.lname.attr = Last Name
+config.ldap.email.attr = Email
+config.ldap.addr1.attr = Address Line 1
+config.ldap.addr2.attr = Address Line 2
+config.ldap.addr3.attr = Address Line 3
+config.ldap.city.attr = City
+config.ldap.state.attr = State
+config.ldap.postcode.attr = Postcode
+config.ldap.country.attr = Country
+config.ldap.day.phone.attr = Day Phone
+config.ldap.evening.phone.attr = Evening Phone
+config.ldap.fax.attr = Fax
+config.ldap.mobile.attr = Mobile
+config.ldap.locale.attr = Locale
+config.ldap.disabled.attr = Disabled
+config.ldap.org.attr = Group
+config.ldap.roles.attr = Roles
+config.ldap.learner.map = Learner Role Map
+config.ldap.monitor.map = Monitor Role Map
+config.ldap.author.map = Author Role Map
+config.ldap.group.admin.map = Group Admin Role Map
+config.ldap.group.manager.map = Group Manager Role Map
+config.ldap.update.on.login = Update on Login
+config.ldap.org.field = Group Field Map
+config.ldap.only.one.org = Only One Group
+config.ldap.encrypt.password.from.browser = Encrypt Password From Browser 
+config.ldap.search.results.page.size = Search Results Page Size
+error.required = This item is required: {0}
+error.numeric = This item only accepts numeric characters: {0}
 
 
 #======= End labels: Exported 258 labels for en AU =====
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -rb7008b95e3f3054ee6f3696a0579e34a197201ca -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision b7008b95e3f3054ee6f3696a0579e34a197201ca)
+++ lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -80,8 +80,8 @@
 </form-bean>
 
 <form-bean name="ConfigForm" type="org.apache.struts.action.DynaActionForm">
-	<form-property name="cKey" type="java.lang.String[]" />
-	<form-property name="cValue" type="java.lang.String[]" />
+	<form-property name="key" type="java.lang.String[]" />
+	<form-property name="value" type="java.lang.String[]" />
 	<form-property name="method" type="java.lang.String" />
 </form-bean>
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java
===================================================================
diff -u -r498dc2bacfaa94ca75f1ff49f5d14382334fd33b -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java	(.../ConfigAction.java)	(revision 498dc2bacfaa94ca75f1ff49f5d14382334fd33b)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java	(.../ConfigAction.java)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -23,21 +23,20 @@
 package org.lamsfoundation.lams.admin.web;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.config.ConfigurationItem;
 import org.lamsfoundation.lams.util.Configuration;
-import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -57,6 +56,7 @@
 public class ConfigAction extends LamsDispatchAction {
 
 	private static Configuration configurationService;
+	private static MessageService messageService;
 
 	private Configuration getConfiguration() {
 		if (configurationService == null) {
@@ -67,13 +67,20 @@
 		}
 		return configurationService;
 	}
+	
+	private MessageService getMessageService() {
+		if (messageService == null) {
+			messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+		}
+		return messageService;
+	}
 
 	public ActionForward unspecified(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws Exception{
 		
-		request.setAttribute("config", Configuration.getAll());
+		request.setAttribute("config", arrangeItems());
 		
 		return mapping.findForward("config");
 	}
@@ -88,15 +95,60 @@
 		}
 		
 		DynaActionForm configForm = (DynaActionForm) form;
-		String[] keys = (String[])configForm.get("cKey");
-		String[] values = (String[])configForm.get("cValue");
+		String[] keys = (String[])configForm.get("key");
+		String[] values = (String[])configForm.get("value");
 		
 		for(int i=0; i<keys.length; i++) {
+			ConfigurationItem item = getConfiguration().getConfigItemByKey(keys[i]);
+			if (item.getRequired()) {
+				if (!(values[i]!=null && values[i].length()>0)) {
+					request.setAttribute("error", getRequiredError(item.getDescriptionKey()));
+					request.setAttribute("config", arrangeItems());
+					return mapping.findForward("config");
+				}
+			}
+			if (item.getFormat().equals(ConfigurationItem.LONG_FORMAT)) {
+				try {
+					Long.parseLong(values[i]);
+				} catch (NumberFormatException e) {
+					request.setAttribute("error", getNumericError(item.getDescriptionKey()));
+					request.setAttribute("config", arrangeItems());
+					return mapping.findForward("config");
+				}
+			}
 			Configuration.updateItem(keys[i], values[i]);
 		}
 		
-		getConfiguration().persistUpdate();
-		
 		return mapping.findForward("sysadmin");
 	}
+	
+	private String getRequiredError(String arg) {
+		String[] args = new String[1];
+		args[0] = getMessageService().getMessage(arg);
+		return getMessageService().getMessage("error.required", args);
+	}
+	
+	private String getNumericError(String arg) {
+		String[] args = new String[1];
+		args[0] = getMessageService().getMessage(arg);
+		return getMessageService().getMessage("error.numeric", args);
+	}
+	
+	// get contents of lams_configuration and group them using header names as key
+	private HashMap<String, ArrayList<ConfigurationItem>> arrangeItems() {
+		List originalList = getConfiguration().getAllItems();
+		HashMap<String, ArrayList<ConfigurationItem>> groupedList = new HashMap<String, ArrayList<ConfigurationItem>>();
+		
+		for (int i=0; i<originalList.size(); i++) {
+			ConfigurationItem item = (ConfigurationItem)originalList.get(i);
+			String header = item.getHeaderName();
+			if (!groupedList.containsKey(header)) {
+				groupedList.put(header, new ArrayList<ConfigurationItem>());
+			}
+			ArrayList<ConfigurationItem> currentList = groupedList.get(header);
+			currentList.add(item);
+			groupedList.put(header, currentList);
+		}
+		return groupedList;
+	}
 }
Index: lams_admin/web/config/editconfig.jsp
===================================================================
diff -u -r9139fadf8c6f7687ffbf50e249474be95c84db07 -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 9139fadf8c6f7687ffbf50e249474be95c84db07)
+++ lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -1,32 +1,52 @@
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.config.ConfigurationItem" %>
 <%@ include file="/taglibs.jsp"%>
 
-<html:form action="/config" method="post">
-	<html:hidden property="method" value="save"/>
-	<h2 class="align-left">
+<h2 class="align-left">
 		<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> :  
 		<fmt:message key="sysadmin.config.settings.edit" />
 	</h2>
 	<lams:help style="no-tabs" page="<%= Configuration.CONFIGURATION_HELP_PAGE %>"/>
 	<br/>
-	<table class="alternative-color" width=100% cellspacing="0">
-		<tr>
-			<th><fmt:message key="admin.config.key"/></th>
-			<th><fmt:message key="admin.config.value"/></th>
-		</tr>
-		<c:forEach var="itemEntry" items="${config}">
+
+<div align="center">
+<c:if test="${not empty error}">
+	<p class='warning'><c:out value="${error}"/></p>
+</c:if>
+</div>
+
+<html:form action="/config" method="post">
+	<html:hidden property="method" value="save"/>
+	
+	<logic:iterate name="config" id="group">
+		<h2 align="center"><fmt:message key="${group.key}"/></h2>
+		<table class="alternative-color" width=100% cellspacing="0">
+		<logic:iterate name="group" property="value" id="row">
 			<tr>
-				<td>
-					<c:out value="${itemEntry.key}"/>
+				<td align="right" width="50%">
+					<fmt:message key="${row.descriptionKey}"/>
+					<c:if test="${row.required}">&nbsp;&nbsp;*</c:if>
 				</td>
 				<td>
-					<html:hidden property="cKey" name="cKey" value="${itemEntry.key}"/>
-					<html:text property="cValue" name="cValue" value="${itemEntry.value.value}" size="50"/>
-					<BR>
+					<html:hidden property="key" name="key" value="${row.key}"/>
+					<c:set var="BOOLEAN"><%= ConfigurationItem.BOOLEAN_FORMAT %></c:set>
+					<c:choose>
+					<c:when test="${row.format==BOOLEAN}">
+						<html:select name="row" property="value">
+						<html:option value="true">true</html:option>
+						<html:option value="false">false&nbsp;&nbsp;</html:option>
+						</html:select>
+					</c:when>
+					<c:otherwise>
+						<html:text property="value" name="row" value="${row.value}" size="50" maxlength="255"/>
+					</c:otherwise>
+					</c:choose>
 				</td>
 			</tr>
-		</c:forEach>
-	</table>
+		</logic:iterate>
+		</table>
+	</logic:iterate>
+	
 	<p align="center">
 		<html:submit styleClass="button"><fmt:message key="admin.save" /></html:submit>
 		<html:reset styleClass="button"><fmt:message key="admin.reset" /></html:reset>
Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
diff -u -r053b3694d8631a983eb8e95e3f0374a22540b43a -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision 053b3694d8631a983eb8e95e3f0374a22540b43a)
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -1,71 +1,212 @@
-insert into lams_configuration (config_key, config_value) values ('ServerURL','http://shaun.melcoe.mq.edu.au/lams/');
-insert into lams_configuration (config_key, config_value) values ('ServerURLContextPath','lams/');
-insert into lams_configuration (config_key, config_value) values ('Version','2.0.4 DEV');
-insert into lams_configuration (config_key, config_value) values ('TempDir','/var/opt/lams/temp');
-insert into lams_configuration (config_key, config_value) values ('DumpDir','/var/opt/lams/dump');
-insert into lams_configuration (config_key, config_value) values ('EARDir','/usr/local/jboss-4.0.2/server/default/deploy/lams.ear');
-insert into lams_configuration (config_key, config_value) values ('SMTPServer','');
-insert into lams_configuration (config_key, config_value) values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au');
-insert into lams_configuration (config_key, config_value) values ('ContentRepositoryPath','/var/opt/lams/repository');
-insert into lams_configuration (config_key, config_value) values ('UploadFileMaxSize','1048576');
-insert into lams_configuration (config_key, config_value) values ('UploadLargeFileMaxSize','10485760');
-insert into lams_configuration (config_key, config_value) values ('UploadFileMaxMemorySize','4096');
-insert into lams_configuration (config_key, config_value) values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs');
-insert into lams_configuration (config_key, config_value) values ('UserInactiveTimeout','86400');
-insert into lams_configuration (config_key, config_value) values ('UseCacheDebugListener','false');
-insert into lams_configuration (config_key, config_value) values ('CleanupPreviewOlderThanDays','7');
-insert into lams_configuration (config_key, config_value) values ('AuthoringActivitiesColour', 'true');
-insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','2.0.4.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.4.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.4.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','2.0.4.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('ServerLanguage','en_AU');
-insert into lams_configuration (config_key, config_value) values ('ServerPageDirection','LTR');
-insert into lams_configuration (config_key, config_value) values ('DictionaryDateCreated','2007-05-24');
-insert into lams_configuration (config_key, config_value) values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/');
-insert into lams_configuration (config_key, config_value) values ('XmppDomain','shaun.melcoe.mq.edu.au');
-insert into lams_configuration (config_key, config_value) values ('XmppConference','conference.shaun.melcoe.mq.edu.au');
-insert into lams_configuration (config_key, config_value) values ('XmppAdmin','admin');
-insert into lams_configuration (config_key, config_value) values ('XmppPassword','wildfire');
-insert into lams_configuration (config_key, config_value) values ('DefaultFlashTheme','default');
-insert into lams_configuration (config_key, config_value) values ('DefaultHTMLTheme','defaultHTML');
-insert into lams_configuration (config_key, config_value) values ('AllowDirectLessonLaunch','false');
-insert into lams_configuration (config_key, config_value) values ('LAMS_Community_enable','false');
-insert into lams_configuration (config_key, config_value) values ('AllowLiveEdit','true');
-insert into lams_configuration (config_key, config_value) values ('LDAPProvisioningEnabled','false');
-insert into lams_configuration (config_key, config_value) values ('LDAPProviderURL','ldap://192.168.111.15');
-insert into lams_configuration (config_key, config_value) values ('LDAPSecurityAuthentication','simple');
-insert into lams_configuration (config_key, config_value) values ('LDAPPrincipalDNPrefix','cn=');
-insert into lams_configuration (config_key, config_value) values ('LDAPPrincipalDNSuffix',',ou=Users,dc=melcoe,dc=mq,dc=edu,dc=au');
-insert into lams_configuration (config_key, config_value) values ('LDAPSecurityProtocol','');
-insert into lams_configuration (config_key, config_value) values ('LDAPTruststorePath','');
-insert into lams_configuration (config_key, config_value) values ('LDAPTruststorePassword','');
-insert into lams_configuration (config_key, config_value) values ('LDAPLoginAttr','uid');
-insert into lams_configuration (config_key, config_value) values ('LDAPFNameAttr','givenName');
-insert into lams_configuration (config_key, config_value) values ('LDAPLNameAttr','sn');
-insert into lams_configuration (config_key, config_value) values ('LDAPEmailAttr','mail');
-insert into lams_configuration (config_key, config_value) values ('LDAPAddr1Attr','postalAddress');
-insert into lams_configuration (config_key, config_value) values ('LDAPAddr2Attr','');
-insert into lams_configuration (config_key, config_value) values ('LDAPAddr3Attr','');
-insert into lams_configuration (config_key, config_value) values ('LDAPCityAttr','l');
-insert into lams_configuration (config_key, config_value) values ('LDAPStateAttr','st');
-insert into lams_configuration (config_key, config_value) values ('LDAPPostcodeAttr','postalCode');
-insert into lams_configuration (config_key, config_value) values ('LDAPCountryAttr','');
-insert into lams_configuration (config_key, config_value) values ('LDAPDayPhoneAttr','telephoneNumber');
-insert into lams_configuration (config_key, config_value) values ('LDAPEveningPhoneAttr','homePhone');
-insert into lams_configuration (config_key, config_value) values ('LDAPFaxAttr','facsimileTelephoneNumber');
-insert into lams_configuration (config_key, config_value) values ('LDAPMobileAttr','mobile');
-insert into lams_configuration (config_key, config_value) values ('LDAPLocaleAttr','preferredLanguage');
-insert into lams_configuration (config_key, config_value) values ('LDAPDisabledAttr','!accountStatus');
-insert into lams_configuration (config_key, config_value) values ('LDAPOrgAttr','deetITSchoolCode');
-insert into lams_configuration (config_key, config_value) values ('LDAPRolesAttr','memberOf');
-insert into lams_configuration (config_key, config_value) values ('LDAPLearnerMap','Student;SchoolSupportStaff;Teacher;SeniorStaff;Principal');
-insert into lams_configuration (config_key, config_value) values ('LDAPMonitorMap','SchoolSupportStaff;Teacher;SeniorStaff;Principal');
-insert into lams_configuration (config_key, config_value) values ('LDAPAuthorMap','Teacher;SeniorStaff;Principal');
-insert into lams_configuration (config_key, config_value) values ('LDAPGroupAdminMap','Teacher;SeniorStaff');
-insert into lams_configuration (config_key, config_value) values ('LDAPGroupManagerMap','Principal');
-insert into lams_configuration (config_key, config_value) values ('LDAPUpdateOnLogin', 'true');
-insert into lams_configuration (config_key, config_value) values ('LDAPOrgField', 'code');
-insert into lams_configuration (config_key, config_value) values ('LDAPOnlyOneOrg', 'true');
-insert into lams_configuration (config_key, config_value) values ('LDAPEncryptPasswordFromBrowser', 'true');
-insert into lams_configuration (config_key, config_value) values ('LDAPSearchResultsPageSize', '100');
\ No newline at end of file
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerURL','http://shaun.melcoe.mq.edu.au/lams/', 'config.server.url', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerURLContextPath','lams/', 'config.server.url.context.path', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('Version','2.0.4 DEV', 'config.version', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('TempDir','/var/opt/lams/temp', 'config.temp.dir', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DumpDir','/var/opt/lams/dump', 'config.dump.dir', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('EARDir','/usr/local/jboss-4.0.2/server/default/deploy/lams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au', 'config.lams.support.email', 'config.header.email', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ContentRepositoryPath','/var/opt/lams/repository', 'config.content.repository.path', 'config.header.uploads', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UploadFileMaxSize','1048576', 'config.upload.file.max.size', 'config.header.uploads', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UploadLargeFileMaxSize','10485760', 'config.upload.large.file.max.size', 'config.header.uploads', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UploadFileMaxMemorySize','4096', 'config.upload.file.max.memory.size', 'config.header.uploads', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs', 'config.executable.extensions', 'config.header.uploads', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UserInactiveTimeout','86400', 'config.user.inactive.timeout', 'config.header.system', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UseCacheDebugListener','false', 'config.use.cache.debug.listener', 'config.header.system', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('CleanupPreviewOlderThanDays','7', 'config.cleanup.preview.older.than.days', 'config.header.system', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AuthoringActivitiesColour', 'true', 'config.authoring.activities.colour', 'config.header.look.feel', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AuthoringClientVersion','2.0.4.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('MonitorClientVersion','2.0.4.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LearnerClientVersion','2.0.4.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerVersionNumber','2.0.4.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerLanguage','en_AU', 'config.server.language', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerPageDirection','LTR', 'config.server.page.direction', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DictionaryDateCreated','2007-05-24', 'config.dictionary.date.created', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/', 'config.help.url', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppDomain','shaun.melcoe.mq.edu.au', 'config.xmpp.domain', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppConference','conference.shaun.melcoe.mq.edu.au', 'config.xmpp.conference', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppAdmin','admin', 'config.xmpp.admin', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppPassword','wildfire', 'config.xmpp.password', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DefaultFlashTheme','default', 'config.default.flash.theme', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DefaultHTMLTheme','defaultHTML', 'config.default.html.theme', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AllowDirectLessonLaunch','false', 'config.allow.direct.lesson.launch', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LAMS_Community_enable','false', 'config.community.enable', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AllowLiveEdit','true', 'config.allow.live.edit', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPProvisioningEnabled','false', 'config.ldap.provisioning.enabled', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPProviderURL','ldap://192.168.111.15', 'config.ldap.provider.url', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPSecurityAuthentication','simple', 'config.ldap.security.authentication', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPPrincipalDNPrefix','cn=', 'config.ldap.principal.dn.prefix', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPPrincipalDNSuffix',',ou=Users,dc=melcoe,dc=mq,dc=edu,dc=au', 'config.ldap.principal.dn.suffix', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPSecurityProtocol','', 'config.ldap.security.protocol', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPTruststorePath','', 'config.ldap.truststore.path', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPTruststorePassword','', 'config.ldap.truststore.password', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLoginAttr','uid', 'config.ldap.login.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPFNameAttr','givenName', 'config.ldap.fname.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLNameAttr','sn', 'config.ldap.lname.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPEmailAttr','mail', 'config.ldap.email.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAddr1Attr','postalAddress', 'config.ldap.addr1.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAddr2Attr','', 'config.ldap.addr2.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAddr3Attr','', 'config.ldap.addr3.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPCityAttr','l', 'config.ldap.city.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPStateAttr','st', 'config.ldap.state.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPPostcodeAttr','postalCode', 'config.ldap.postcode.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPCountryAttr','', 'config.ldap.country.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPDayPhoneAttr','telephoneNumber', 'config.ldap.day.phone.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPEveningPhoneAttr','homePhone', 'config.ldap.evening.phone.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPFaxAttr','facsimileTelephoneNumber', 'config.ldap.fax.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPMobileAttr','mobile', 'config.ldap.mobile.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLocaleAttr','preferredLanguage', 'config.ldap.locale.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPDisabledAttr','!accountStatus', 'config.ldap.disabled.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPOrgAttr','deetITSchoolCode', 'config.ldap.org.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPRolesAttr','memberOf', 'config.ldap.roles.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLearnerMap','Student;SchoolSupportStaff;Teacher;SeniorStaff;Principal', 'config.ldap.learner.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPMonitorMap','SchoolSupportStaff;Teacher;SeniorStaff;Principal', 'config.ldap.monitor.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAuthorMap','Teacher;SeniorStaff;Principal', 'config.ldap.author.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPGroupAdminMap','Teacher;SeniorStaff', 'config.ldap.group.admin.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPGroupManagerMap','Principal', 'config.ldap.group.manager.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPUpdateOnLogin', 'true', 'config.ldap.update.on.login', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPOrgField', 'code', 'config.ldap.org.field', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPOnlyOneOrg', 'true', 'config.ldap.only.one.org', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPEncryptPasswordFromBrowser', 'true', 'config.ldap.encrypt.password.from.browser', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPSearchResultsPageSize', '100', 'config.ldap.search.results.page.size', 'config.header.ldap', 'LONG', 0);
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
diff -u -r053b3694d8631a983eb8e95e3f0374a22540b43a -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 053b3694d8631a983eb8e95e3f0374a22540b43a)
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -1,71 +1,212 @@
-insert into lams_configuration (config_key, config_value) values ('ServerURL','http://localhost:8080/lams/');
-insert into lams_configuration (config_key, config_value) values ('ServerURLContextPath','lams/');
-insert into lams_configuration (config_key, config_value) values ('Version','2.0.4');
-insert into lams_configuration (config_key, config_value) values ('TempDir','C:/lams/temp');
-insert into lams_configuration (config_key, config_value) values ('DumpDir','C:/lams/dump');
-insert into lams_configuration (config_key, config_value) values ('EARDir','C:/jboss-4.0.2/server/default/deploy/lams.ear');
-insert into lams_configuration (config_key, config_value) values ('SMTPServer','');
-insert into lams_configuration (config_key, config_value) values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au');
-insert into lams_configuration (config_key, config_value) values ('ContentRepositoryPath','C:/lams/repository');
-insert into lams_configuration (config_key, config_value) values ('UploadFileMaxSize','1048576');
-insert into lams_configuration (config_key, config_value) values ('UploadLargeFileMaxSize','10485760');
-insert into lams_configuration (config_key, config_value) values ('UploadFileMaxMemorySize','4096');
-insert into lams_configuration (config_key, config_value) values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs');
-insert into lams_configuration (config_key, config_value) values ('UserInactiveTimeout','86400');
-insert into lams_configuration (config_key, config_value) values ('UseCacheDebugListener','false');
-insert into lams_configuration (config_key, config_value) values ('CleanupPreviewOlderThanDays','7');
-insert into lams_configuration (config_key, config_value) values ('AuthoringActivitiesColour', 'true');
-insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','2.0.4.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.4.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.4.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','2.0.4.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('ServerLanguage','en_AU');
-insert into lams_configuration (config_key, config_value) values ('ServerPageDirection','LTR');
-insert into lams_configuration (config_key, config_value) values ('DictionaryDateCreated','2007-05-24');
-insert into lams_configuration (config_key, config_value) values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/');
-insert into lams_configuration (config_key, config_value) values ('XmppDomain','shaun.melcoe.mq.edu.au');
-insert into lams_configuration (config_key, config_value) values ('XmppConference','conference.shaun.melcoe.mq.edu.au');
-insert into lams_configuration (config_key, config_value) values ('XmppAdmin','admin');
-insert into lams_configuration (config_key, config_value) values ('XmppPassword','wildfire');
-insert into lams_configuration (config_key, config_value) values ('DefaultFlashTheme','default');
-insert into lams_configuration (config_key, config_value) values ('DefaultHTMLTheme','defaultHTML');
-insert into lams_configuration (config_key, config_value) values ('AllowDirectLessonLaunch','false'); 
-insert into lams_configuration (config_key, config_value) values ('LAMS_Community_enable','false');
-insert into lams_configuration (config_key, config_value) values ('AllowLiveEdit','true');
-insert into lams_configuration (config_key, config_value) values ('LDAPProvisioningEnabled','false');
-insert into lams_configuration (config_key, config_value) values ('LDAPProviderURL','ldap://192.168.111.15');
-insert into lams_configuration (config_key, config_value) values ('LDAPSecurityAuthentication','simple');
-insert into lams_configuration (config_key, config_value) values ('LDAPPrincipalDNPrefix','cn=');
-insert into lams_configuration (config_key, config_value) values ('LDAPPrincipalDNSuffix',',ou=Users,dc=melcoe,dc=mq,dc=edu,dc=au');
-insert into lams_configuration (config_key, config_value) values ('LDAPSecurityProtocol','');
-insert into lams_configuration (config_key, config_value) values ('LDAPTruststorePath','');
-insert into lams_configuration (config_key, config_value) values ('LDAPTruststorePassword','');
-insert into lams_configuration (config_key, config_value) values ('LDAPLoginAttr','uid');
-insert into lams_configuration (config_key, config_value) values ('LDAPFNameAttr','givenName');
-insert into lams_configuration (config_key, config_value) values ('LDAPLNameAttr','sn');
-insert into lams_configuration (config_key, config_value) values ('LDAPEmailAttr','mail');
-insert into lams_configuration (config_key, config_value) values ('LDAPAddr1Attr','postalAddress');
-insert into lams_configuration (config_key, config_value) values ('LDAPAddr2Attr','');
-insert into lams_configuration (config_key, config_value) values ('LDAPAddr3Attr','');
-insert into lams_configuration (config_key, config_value) values ('LDAPCityAttr','l');
-insert into lams_configuration (config_key, config_value) values ('LDAPStateAttr','st');
-insert into lams_configuration (config_key, config_value) values ('LDAPPostcodeAttr','postalCode');
-insert into lams_configuration (config_key, config_value) values ('LDAPCountryAttr','');
-insert into lams_configuration (config_key, config_value) values ('LDAPDayPhoneAttr','telephoneNumber');
-insert into lams_configuration (config_key, config_value) values ('LDAPEveningPhoneAttr','homePhone');
-insert into lams_configuration (config_key, config_value) values ('LDAPFaxAttr','facsimileTelephoneNumber');
-insert into lams_configuration (config_key, config_value) values ('LDAPMobileAttr','mobile');
-insert into lams_configuration (config_key, config_value) values ('LDAPLocaleAttr','preferredLanguage');
-insert into lams_configuration (config_key, config_value) values ('LDAPDisabledAttr','!accountStatus');
-insert into lams_configuration (config_key, config_value) values ('LDAPOrgAttr','deetITSchoolCode');
-insert into lams_configuration (config_key, config_value) values ('LDAPRolesAttr','memberOf');
-insert into lams_configuration (config_key, config_value) values ('LDAPLearnerMap','Student;SchoolSupportStaff;Teacher;SeniorStaff;Principal');
-insert into lams_configuration (config_key, config_value) values ('LDAPMonitorMap','SchoolSupportStaff;Teacher;SeniorStaff;Principal');
-insert into lams_configuration (config_key, config_value) values ('LDAPAuthorMap','Teacher;SeniorStaff;Principal');
-insert into lams_configuration (config_key, config_value) values ('LDAPGroupAdminMap','Teacher;SeniorStaff');
-insert into lams_configuration (config_key, config_value) values ('LDAPGroupManagerMap','Principal');
-insert into lams_configuration (config_key, config_value) values ('LDAPUpdateOnLogin', 'true');
-insert into lams_configuration (config_key, config_value) values ('LDAPOrgField', 'code');
-insert into lams_configuration (config_key, config_value) values ('LDAPOnlyOneOrg', 'true');
-insert into lams_configuration (config_key, config_value) values ('LDAPEncryptPasswordFromBrowser', 'false');
-insert into lams_configuration (config_key, config_value) values ('LDAPSearchResultsPageSize', '100');
\ No newline at end of file
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerURL','http://localhost:8080/lams/', 'config.server.url', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerURLContextPath','lams/', 'config.server.url.context.path', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('Version','2.0.4', 'config.version', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('TempDir','C:/lams/temp', 'config.temp.dir', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DumpDir','C:/lams/dump', 'config.dump.dir', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('EARDir','C:/jboss-4.0.2/server/default/deploy/lams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au', 'config.lams.support.email', 'config.header.email', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ContentRepositoryPath','C:/lams/repository', 'config.content.repository.path', 'config.header.uploads', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UploadFileMaxSize','1048576', 'config.upload.file.max.size', 'config.header.uploads', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UploadLargeFileMaxSize','10485760', 'config.upload.large.file.max.size', 'config.header.uploads', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UploadFileMaxMemorySize','4096', 'config.upload.file.max.memory.size', 'config.header.uploads', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs', 'config.executable.extensions', 'config.header.uploads', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UserInactiveTimeout','86400', 'config.user.inactive.timeout', 'config.header.system', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UseCacheDebugListener','false', 'config.use.cache.debug.listener', 'config.header.system', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('CleanupPreviewOlderThanDays','7', 'config.cleanup.preview.older.than.days', 'config.header.system', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AuthoringActivitiesColour', 'true', 'config.authoring.activities.colour', 'config.header.look.feel', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AuthoringClientVersion','2.0.4.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('MonitorClientVersion','2.0.4.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LearnerClientVersion','2.0.4.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerVersionNumber','2.0.4.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerLanguage','en_AU', 'config.server.language', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerPageDirection','LTR', 'config.server.page.direction', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DictionaryDateCreated','2007-05-24', 'config.dictionary.date.created', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/', 'config.help.url', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppDomain','shaun.melcoe.mq.edu.au', 'config.xmpp.domain', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppConference','conference.shaun.melcoe.mq.edu.au', 'config.xmpp.conference', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppAdmin','admin', 'config.xmpp.admin', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppPassword','wildfire', 'config.xmpp.password', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DefaultFlashTheme','default', 'config.default.flash.theme', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DefaultHTMLTheme','defaultHTML', 'config.default.html.theme', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AllowDirectLessonLaunch','false', 'config.allow.direct.lesson.launch', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LAMS_Community_enable','false', 'config.community.enable', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AllowLiveEdit','true', 'config.allow.live.edit', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPProvisioningEnabled','false', 'config.ldap.provisioning.enabled', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPProviderURL','ldap://192.168.111.15', 'config.ldap.provider.url', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPSecurityAuthentication','simple', 'config.ldap.security.authentication', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPPrincipalDNPrefix','cn=', 'config.ldap.principal.dn.prefix', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPPrincipalDNSuffix',',ou=Users,dc=melcoe,dc=mq,dc=edu,dc=au', 'config.ldap.principal.dn.suffix', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPSecurityProtocol','', 'config.ldap.security.protocol', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPTruststorePath','', 'config.ldap.truststore.path', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPTruststorePassword','', 'config.ldap.truststore.password', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLoginAttr','uid', 'config.ldap.login.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPFNameAttr','givenName', 'config.ldap.fname.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLNameAttr','sn', 'config.ldap.lname.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPEmailAttr','mail', 'config.ldap.email.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAddr1Attr','postalAddress', 'config.ldap.addr1.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAddr2Attr','', 'config.ldap.addr2.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAddr3Attr','', 'config.ldap.addr3.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPCityAttr','l', 'config.ldap.city.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPStateAttr','st', 'config.ldap.state.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPPostcodeAttr','postalCode', 'config.ldap.postcode.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPCountryAttr','', 'config.ldap.country.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPDayPhoneAttr','telephoneNumber', 'config.ldap.day.phone.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPEveningPhoneAttr','homePhone', 'config.ldap.evening.phone.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPFaxAttr','facsimileTelephoneNumber', 'config.ldap.fax.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPMobileAttr','mobile', 'config.ldap.mobile.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLocaleAttr','preferredLanguage', 'config.ldap.locale.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPDisabledAttr','!accountStatus', 'config.ldap.disabled.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPOrgAttr','deetITSchoolCode', 'config.ldap.org.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPRolesAttr','memberOf', 'config.ldap.roles.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLearnerMap','Student;SchoolSupportStaff;Teacher;SeniorStaff;Principal', 'config.ldap.learner.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPMonitorMap','SchoolSupportStaff;Teacher;SeniorStaff;Principal', 'config.ldap.monitor.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAuthorMap','Teacher;SeniorStaff;Principal', 'config.ldap.author.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPGroupAdminMap','Teacher;SeniorStaff', 'config.ldap.group.admin.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPGroupManagerMap','Principal', 'config.ldap.group.manager.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPUpdateOnLogin', 'true', 'config.ldap.update.on.login', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPOrgField', 'code', 'config.ldap.org.field', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPOnlyOneOrg', 'true', 'config.ldap.only.one.org', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPEncryptPasswordFromBrowser', 'true', 'config.ldap.encrypt.password.from.browser', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPSearchResultsPageSize', '100', 'config.ldap.search.results.page.size', 'config.header.ldap', 'LONG', 0);
Index: lams_common/db/sql/insert_rams_unix_config_data.sql
===================================================================
diff -u -re9eb94cfaf1cbbe9736dc5dc63aed57d4cccd57e -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_common/db/sql/insert_rams_unix_config_data.sql	(.../insert_rams_unix_config_data.sql)	(revision e9eb94cfaf1cbbe9736dc5dc63aed57d4cccd57e)
+++ lams_common/db/sql/insert_rams_unix_config_data.sql	(.../insert_rams_unix_config_data.sql)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -1,34 +1,212 @@
-insert into lams_configuration (config_key, config_value) values ('ServerURL','http://shaun.melcoe.mq.edu.au/rams/');
-insert into lams_configuration (config_key, config_value) values ('ServerURLContextPath','rams/');
-insert into lams_configuration (config_key, config_value) values ('Version','1.0 Beta');
-insert into lams_configuration (config_key, config_value) values ('TempDir','/var/opt/rams/temp');
-insert into lams_configuration (config_key, config_value) values ('DumpDir','/var/opt/rams/dump');
-insert into lams_configuration (config_key, config_value) values ('EARDir','/usr/local/jboss-4.0.2/server/default/deploy/rams.ear');
-insert into lams_configuration (config_key, config_value) values ('SMTPServer','');
-insert into lams_configuration (config_key, config_value) values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au');
-insert into lams_configuration (config_key, config_value) values ('ContentRepositoryPath','/var/opt/rams/repository');
-insert into lams_configuration (config_key, config_value) values ('UploadFileMaxSize','1048576');
-insert into lams_configuration (config_key, config_value) values ('UploadLargeFileMaxSize','10485760');
-insert into lams_configuration (config_key, config_value) values ('UploadFileMaxMemorySize','4096');
-insert into lams_configuration (config_key, config_value) values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs');
-insert into lams_configuration (config_key, config_value) values ('UserInactiveTimeout','86400');
-insert into lams_configuration (config_key, config_value) values ('UseCacheDebugListener','false');
-insert into lams_configuration (config_key, config_value) values ('CleanupPreviewOlderThanDays','7');
-insert into lams_configuration (config_key, config_value) values ('AuthoringActivitiesColour', 'true');
-insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','0.8.1.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','0.8.1.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','0.8.1.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','0.8.1.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('ServerLanguage','en_AU');
-insert into lams_configuration (config_key, config_value) values ('ServerPageDirection','LTR');
-insert into lams_configuration (config_key, config_value) values ('DictionaryDateCreated','2007-05-24');
-insert into lams_configuration (config_key, config_value) values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/');
-insert into lams_configuration (config_key, config_value) values ('XmppDomain','shaun.melcoe.mq.edu.au');
-insert into lams_configuration (config_key, config_value) values ('XmppConference','conference.shaun.melcoe.mq.edu.au');
-insert into lams_configuration (config_key, config_value) values ('XmppAdmin','admin');
-insert into lams_configuration (config_key, config_value) values ('XmppPassword','wildfire');
-insert into lams_configuration (config_key, config_value) values ('DefaultFlashTheme','rams');
-insert into lams_configuration (config_key, config_value) values ('DefaultHTMLTheme','ramsthemeHTML');
-insert into lams_configuration (config_key, config_value) values ('AllowDirectLessonLaunch','false');
-insert into lams_configuration (config_key, config_value) values ('LAMS_Community_enable','false');
-insert into lams_configuration (config_key, config_value) values ('AllowLiveEdit','true');
\ No newline at end of file
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerURL','http://shaun.melcoe.mq.edu.au/rams/', 'config.server.url', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerURLContextPath','rams/', 'config.server.url.context.path', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('Version','1.0 Beta', 'config.version', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('TempDir','/var/opt/rams/temp', 'config.temp.dir', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DumpDir','/var/opt/rams/dump', 'config.dump.dir', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('EARDir','/usr/local/jboss-4.0.2/server/default/deploy/rams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au', 'config.lams.support.email', 'config.header.email', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ContentRepositoryPath','/var/opt/rams/repository', 'config.content.repository.path', 'config.header.uploads', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UploadFileMaxSize','1048576', 'config.upload.file.max.size', 'config.header.uploads', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UploadLargeFileMaxSize','10485760', 'config.upload.large.file.max.size', 'config.header.uploads', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UploadFileMaxMemorySize','4096', 'config.upload.file.max.memory.size', 'config.header.uploads', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs', 'config.executable.extensions', 'config.header.uploads', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UserInactiveTimeout','86400', 'config.user.inactive.timeout', 'config.header.system', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UseCacheDebugListener','false', 'config.use.cache.debug.listener', 'config.header.system', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('CleanupPreviewOlderThanDays','7', 'config.cleanup.preview.older.than.days', 'config.header.system', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AuthoringActivitiesColour', 'true', 'config.authoring.activities.colour', 'config.header.look.feel', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AuthoringClientVersion','0.8.1.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('MonitorClientVersion','0.8.1.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LearnerClientVersion','0.8.1.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerVersionNumber','0.8.1.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerLanguage','en_AU', 'config.server.language', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerPageDirection','LTR', 'config.server.page.direction', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DictionaryDateCreated','2007-05-24', 'config.dictionary.date.created', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/', 'config.help.url', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppDomain','shaun.melcoe.mq.edu.au', 'config.xmpp.domain', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppConference','conference.shaun.melcoe.mq.edu.au', 'config.xmpp.conference', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppAdmin','admin', 'config.xmpp.admin', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppPassword','wildfire', 'config.xmpp.password', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DefaultFlashTheme','default', 'config.default.flash.theme', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DefaultHTMLTheme','defaultHTML', 'config.default.html.theme', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AllowDirectLessonLaunch','false', 'config.allow.direct.lesson.launch', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LAMS_Community_enable','false', 'config.community.enable', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AllowLiveEdit','true', 'config.allow.live.edit', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPProvisioningEnabled','false', 'config.ldap.provisioning.enabled', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPProviderURL','ldap://192.168.111.15', 'config.ldap.provider.url', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPSecurityAuthentication','simple', 'config.ldap.security.authentication', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPPrincipalDNPrefix','cn=', 'config.ldap.principal.dn.prefix', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPPrincipalDNSuffix',',ou=Users,dc=melcoe,dc=mq,dc=edu,dc=au', 'config.ldap.principal.dn.suffix', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPSecurityProtocol','', 'config.ldap.security.protocol', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPTruststorePath','', 'config.ldap.truststore.path', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPTruststorePassword','', 'config.ldap.truststore.password', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLoginAttr','uid', 'config.ldap.login.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPFNameAttr','givenName', 'config.ldap.fname.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLNameAttr','sn', 'config.ldap.lname.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPEmailAttr','mail', 'config.ldap.email.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAddr1Attr','postalAddress', 'config.ldap.addr1.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAddr2Attr','', 'config.ldap.addr2.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAddr3Attr','', 'config.ldap.addr3.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPCityAttr','l', 'config.ldap.city.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPStateAttr','st', 'config.ldap.state.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPPostcodeAttr','postalCode', 'config.ldap.postcode.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPCountryAttr','', 'config.ldap.country.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPDayPhoneAttr','telephoneNumber', 'config.ldap.day.phone.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPEveningPhoneAttr','homePhone', 'config.ldap.evening.phone.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPFaxAttr','facsimileTelephoneNumber', 'config.ldap.fax.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPMobileAttr','mobile', 'config.ldap.mobile.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLocaleAttr','preferredLanguage', 'config.ldap.locale.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPDisabledAttr','!accountStatus', 'config.ldap.disabled.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPOrgAttr','deetITSchoolCode', 'config.ldap.org.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPRolesAttr','memberOf', 'config.ldap.roles.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLearnerMap','Student;SchoolSupportStaff;Teacher;SeniorStaff;Principal', 'config.ldap.learner.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPMonitorMap','SchoolSupportStaff;Teacher;SeniorStaff;Principal', 'config.ldap.monitor.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAuthorMap','Teacher;SeniorStaff;Principal', 'config.ldap.author.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPGroupAdminMap','Teacher;SeniorStaff', 'config.ldap.group.admin.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPGroupManagerMap','Principal', 'config.ldap.group.manager.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPUpdateOnLogin', 'true', 'config.ldap.update.on.login', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPOrgField', 'code', 'config.ldap.org.field', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPOnlyOneOrg', 'true', 'config.ldap.only.one.org', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPEncryptPasswordFromBrowser', 'true', 'config.ldap.encrypt.password.from.browser', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPSearchResultsPageSize', '100', 'config.ldap.search.results.page.size', 'config.header.ldap', 'LONG', 0);
Index: lams_common/db/sql/insert_rams_windows_config_data.sql
===================================================================
diff -u -re9eb94cfaf1cbbe9736dc5dc63aed57d4cccd57e -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_common/db/sql/insert_rams_windows_config_data.sql	(.../insert_rams_windows_config_data.sql)	(revision e9eb94cfaf1cbbe9736dc5dc63aed57d4cccd57e)
+++ lams_common/db/sql/insert_rams_windows_config_data.sql	(.../insert_rams_windows_config_data.sql)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -1,34 +1,212 @@
-insert into lams_configuration (config_key, config_value) values ('ServerURL','http://localhost:8080/rams/');
-insert into lams_configuration (config_key, config_value) values ('ServerURLContextPath','rams/');
-insert into lams_configuration (config_key, config_value) values ('Version','1.0 Beta');
-insert into lams_configuration (config_key, config_value) values ('TempDir','C:/rams/temp');
-insert into lams_configuration (config_key, config_value) values ('DumpDir','C:/rams/dump');
-insert into lams_configuration (config_key, config_value) values ('EARDir','C:/jboss-4.0.2/server/default/deploy/rams.ear/');
-insert into lams_configuration (config_key, config_value) values ('SMTPServer','');
-insert into lams_configuration (config_key, config_value) values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au');
-insert into lams_configuration (config_key, config_value) values ('ContentRepositoryPath','C:/rams/repository');
-insert into lams_configuration (config_key, config_value) values ('UploadFileMaxSize','1048576');
-insert into lams_configuration (config_key, config_value) values ('UploadLargeFileMaxSize','10485760');
-insert into lams_configuration (config_key, config_value) values ('UploadFileMaxMemorySize','4096');
-insert into lams_configuration (config_key, config_value) values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs');
-insert into lams_configuration (config_key, config_value) values ('UserInactiveTimeout','86400');
-insert into lams_configuration (config_key, config_value) values ('UseCacheDebugListener','false');
-insert into lams_configuration (config_key, config_value) values ('CleanupPreviewOlderThanDays','7');
-insert into lams_configuration (config_key, config_value) values ('AuthoringActivitiesColour', 'true');
-insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','0.8.1.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','0.8.1.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','0.8.1.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','0.8.1.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('ServerLanguage','en_AU');
-insert into lams_configuration (config_key, config_value) values ('ServerPageDirection','LTR');
-insert into lams_configuration (config_key, config_value) values ('DictionaryDateCreated','2007-05-24');
-insert into lams_configuration (config_key, config_value) values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/');
-insert into lams_configuration (config_key, config_value) values ('XmppDomain','shaun.melcoe.mq.edu.au');
-insert into lams_configuration (config_key, config_value) values ('XmppConference','conference.shaun.melcoe.mq.edu.au');
-insert into lams_configuration (config_key, config_value) values ('XmppAdmin','admin');
-insert into lams_configuration (config_key, config_value) values ('XmppPassword','wildfire');
-insert into lams_configuration (config_key, config_value) values ('DefaultFlashTheme','rams');
-insert into lams_configuration (config_key, config_value) values ('DefaultHTMLTheme','ramsthemeHTML');
-insert into lams_configuration (config_key, config_value) values ('AllowDirectLessonLaunch','false'); 
-insert into lams_configuration (config_key, config_value) values ('LAMS_Community_enable','false');
-insert into lams_configuration (config_key, config_value) values ('AllowLiveEdit','true');
\ No newline at end of file
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerURL','http://localhost:8080/rams/', 'config.server.url', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerURLContextPath','rams/', 'config.server.url.context.path', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('Version','1.0 Beta', 'config.version', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('TempDir','C:/rams/temp', 'config.temp.dir', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DumpDir','C:/rams/dump', 'config.dump.dir', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('EARDir','C:/jboss-4.0.2/server/default/deploy/rams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au', 'config.lams.support.email', 'config.header.email', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ContentRepositoryPath','C:/rams/repository', 'config.content.repository.path', 'config.header.uploads', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UploadFileMaxSize','1048576', 'config.upload.file.max.size', 'config.header.uploads', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UploadLargeFileMaxSize','10485760', 'config.upload.large.file.max.size', 'config.header.uploads', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UploadFileMaxMemorySize','4096', 'config.upload.file.max.memory.size', 'config.header.uploads', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs', 'config.executable.extensions', 'config.header.uploads', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UserInactiveTimeout','86400', 'config.user.inactive.timeout', 'config.header.system', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('UseCacheDebugListener','false', 'config.use.cache.debug.listener', 'config.header.system', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('CleanupPreviewOlderThanDays','7', 'config.cleanup.preview.older.than.days', 'config.header.system', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AuthoringActivitiesColour', 'true', 'config.authoring.activities.colour', 'config.header.look.feel', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AuthoringClientVersion','0.8.1.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('MonitorClientVersion','0.8.1.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LearnerClientVersion','0.8.1.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerVersionNumber','0.8.1.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerLanguage','en_AU', 'config.server.language', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('ServerPageDirection','LTR', 'config.server.page.direction', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DictionaryDateCreated','2007-05-24', 'config.dictionary.date.created', 'config.header.versions', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/', 'config.help.url', 'config.header.system', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppDomain','shaun.melcoe.mq.edu.au', 'config.xmpp.domain', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppConference','conference.shaun.melcoe.mq.edu.au', 'config.xmpp.conference', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppAdmin','admin', 'config.xmpp.admin', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('XmppPassword','wildfire', 'config.xmpp.password', 'config.header.chat', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DefaultFlashTheme','default', 'config.default.flash.theme', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('DefaultHTMLTheme','defaultHTML', 'config.default.html.theme', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AllowDirectLessonLaunch','false', 'config.allow.direct.lesson.launch', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LAMS_Community_enable','false', 'config.community.enable', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('AllowLiveEdit','true', 'config.allow.live.edit', 'config.header.features', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPProvisioningEnabled','false', 'config.ldap.provisioning.enabled', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPProviderURL','ldap://192.168.111.15', 'config.ldap.provider.url', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPSecurityAuthentication','simple', 'config.ldap.security.authentication', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPPrincipalDNPrefix','cn=', 'config.ldap.principal.dn.prefix', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPPrincipalDNSuffix',',ou=Users,dc=melcoe,dc=mq,dc=edu,dc=au', 'config.ldap.principal.dn.suffix', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPSecurityProtocol','', 'config.ldap.security.protocol', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPTruststorePath','', 'config.ldap.truststore.path', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPTruststorePassword','', 'config.ldap.truststore.password', 'config.header.ldap', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLoginAttr','uid', 'config.ldap.login.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPFNameAttr','givenName', 'config.ldap.fname.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLNameAttr','sn', 'config.ldap.lname.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPEmailAttr','mail', 'config.ldap.email.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAddr1Attr','postalAddress', 'config.ldap.addr1.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAddr2Attr','', 'config.ldap.addr2.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAddr3Attr','', 'config.ldap.addr3.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPCityAttr','l', 'config.ldap.city.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPStateAttr','st', 'config.ldap.state.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPPostcodeAttr','postalCode', 'config.ldap.postcode.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPCountryAttr','', 'config.ldap.country.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPDayPhoneAttr','telephoneNumber', 'config.ldap.day.phone.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPEveningPhoneAttr','homePhone', 'config.ldap.evening.phone.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPFaxAttr','facsimileTelephoneNumber', 'config.ldap.fax.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPMobileAttr','mobile', 'config.ldap.mobile.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLocaleAttr','preferredLanguage', 'config.ldap.locale.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPDisabledAttr','!accountStatus', 'config.ldap.disabled.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPOrgAttr','deetITSchoolCode', 'config.ldap.org.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPRolesAttr','memberOf', 'config.ldap.roles.attr', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPLearnerMap','Student;SchoolSupportStaff;Teacher;SeniorStaff;Principal', 'config.ldap.learner.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPMonitorMap','SchoolSupportStaff;Teacher;SeniorStaff;Principal', 'config.ldap.monitor.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPAuthorMap','Teacher;SeniorStaff;Principal', 'config.ldap.author.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPGroupAdminMap','Teacher;SeniorStaff', 'config.ldap.group.admin.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPGroupManagerMap','Principal', 'config.ldap.group.manager.map', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPUpdateOnLogin', 'true', 'config.ldap.update.on.login', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPOrgField', 'code', 'config.ldap.org.field', 'config.header.ldap.attributes', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPOnlyOneOrg', 'true', 'config.ldap.only.one.org', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPEncryptPasswordFromBrowser', 'true', 'config.ldap.encrypt.password.from.browser', 'config.header.ldap', 'BOOLEAN', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('LDAPSearchResultsPageSize', '100', 'config.ldap.search.results.page.size', 'config.header.ldap', 'LONG', 0);
Index: lams_common/db/sql/updatescripts/alter_21_branching.sql
===================================================================
diff -u -r1e741053dedb977b7207ee80cbb3c2821b7a5cd6 -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_common/db/sql/updatescripts/alter_21_branching.sql	(.../alter_21_branching.sql)	(revision 1e741053dedb977b7207ee80cbb3c2821b7a5cd6)
+++ lams_common/db/sql/updatescripts/alter_21_branching.sql	(.../alter_21_branching.sql)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -105,50 +105,75 @@
 , ADD COLUMN format VARCHAR(30)
 , ADD COLUMN required TINYINT NOT NULL DEFAULT 0;
 
-update lams_configuration set description_key = 'config.server.url', header_name='config.header.system', format='STRING', required=1
-where config_key = 'ServerURL';
+update lams_configuration st description_key='config.server.url', header_name='config.header.system', format='STRING', required=1 where config_key='ServerURL';
+update lams_configuration set description_key='config.server.url.context.path', header_name='config.header.system', format='STRING', required=1 where config_key='ServerURLContextPath';
+update lams_configuration set description_key='config.version', header_name='config.header.system', format='STRING', required=1 where config_key='Version';
+update lams_configuration set description_key='config.temp.dir', header_name='config.header.system', format='STRING', required=1 where config_key='TempDir';
+update lams_configuration set description_key='config.dump.dir', header_name='config.header.system', format='STRING', required=1 where config_key='DumpDir';
+update lams_configuration set description_key='config.ear.dir', header_name='config.header.system', format='STRING', required=1 where config_key='EARDir';
+update lams_configuration set description_key='config.smtp.server', header_name='config.header.email', format='STRING', required=1 where config_key='SMTPServer';
+update lams_configuration set description_key='config.lams.support.email', header_name='config.header.email', format='STRING', required=1 where config_key='LamsSupportEmail';
+update lams_configuration set description_key='config.content.repository.path', header_name='config.header.uploads', format='STRING', required=1 where config_key='ContentRepositoryPath';
+update lams_configuration set description_key='config.upload.file.max.size', header_name='config.header.uploads', format='LONG', required=1 where config_key='UploadFileMaxSize';
+update lams_configuration set description_key='config.upload.large.file.max.size', header_name='config.header.uploads', format='LONG', required=1 where config_key='UploadLargeFileMaxSize';
+update lams_configuration set description_key='config.upload.file.max.memory.size', header_name='config.header.uploads', format='LONG', required=1 where config_key='UploadFileMaxMemorySize';
+update lams_configuration set description_key='config.executable.extensions', header_name='config.header.uploads', format='STRING', required=1 where config_key='ExecutableExtensions';
+update lams_configuration set description_key='config.user.inactive.timeout', header_name='config.header.system', format='LONG', required=1 where config_key='UserInactiveTimeout';
+update lams_configuration set description_key='config.use.cache.debug.listener', header_name='config.header.system', format='BOOLEAN', required=1 where config_key='UseCacheDebugListener';
+update lams_configuration set description_key='config.cleanup.preview.older.than.days', header_name='config.header.system', format='LONG', required=1 where config_key='CleanupPreviewOlderThanDays';
+update lams_configuration set description_key='config.authoring.activities.colour', header_name='config.header.look.feel', format='BOOLEAN', required=1 where config_key='AuthoringActivitiesColour';
+update lams_configuration set description_key='config.authoring.client.version', header_name='config.header.versions', format='STRING', required=1 where config_key='AuthoringClientVersion';
+update lams_configuration set description_key='config.monitor.client.version', header_name='config.header.versions', format='STRING', required=1 where config_key='MonitorClientVersion';
+update lams_configuration set description_key='config.learner.client.version', header_name='config.header.versions', format='STRING', required=1 where config_key='LearnerClientVersion';
+update lams_configuration set description_key='config.server.version.number', header_name='config.header.versions', format='STRING', required=1 where config_key='ServerVersionNumber';
+update lams_configuration set description_key='config.server.language', header_name='config.header.look.feel', format='STRING', required=1 where config_key='ServerLanguage';
+update lams_configuration set description_key='config.server.page.direction', header_name='config.header.look.feel', format='STRING', required=1 where config_key='ServerPageDirection';
+update lams_configuration set description_key='config.dictionary.date.created', header_name='config.header.versions', format='STRING', required=1 where config_key='DictionaryDateCreated';
+update lams_configuration set description_key='config.help.url', header_name='config.header.system', format='STRING', required=1 where config_key='HelpURL';
+update lams_configuration set description_key='config.xmpp.domain', header_name='config.header.chat', format='STRING', required=1 where config_key='XmppDomain';
+update lams_configuration set description_key='config.xmpp.conference', header_name='config.header.chat', format='STRING', required=1 where config_key='XmppConference';
+update lams_configuration set description_key='config.xmpp.admin', header_name='config.header.chat', format='STRING', required=1 where config_key='XmppAdmin';
+update lams_configuration set description_key='config.xmpp.password', header_name='config.header.chat', format='STRING', required=1 where config_key='XmppPassword';
+update lams_configuration set description_key='config.default.flash.theme', header_name='config.header.look.feel', format='STRING', required=1 where config_key='DefaultFlashTheme';
+update lams_configuration set description_key='config.default.html.theme', header_name='config.header.look.feel', format='STRING', required=1 where config_key='DefaultHTMLTheme';
+update lams_configuration set description_key='config.allow.direct.lesson.launch', header_name='config.header.features', format='BOOLEAN', required=1 where config_key='AllowDirectLessonLaunch';
+update lams_configuration set description_key='config.community.enable', header_name='config.header.features', format='BOOLEAN', required=1 where config_key='LAMS_Community_enable';
+update lams_configuration set description_key='config.allow.live.edit', header_name='config.header.features', format='BOOLEAN', required=1 where config_key='AllowLiveEdit';
+update lams_configuration set description_key='config.ldap.provisioning.enabled', header_name='config.header.ldap', format='BOOLEAN', required=1 where config_key='LDAPProvisioningEnabled';
+update lams_configuration set description_key='config.ldap.provider.url', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPProviderURL';
+update lams_configuration set description_key='config.ldap.security.authentication', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPSecurityAuthentication';
+update lams_configuration set description_key='config.ldap.principal.dn.prefix', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPPrincipalDNPrefix';
+update lams_configuration set description_key='config.ldap.principal.dn.suffix', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPPrincipalDNSuffix';
+update lams_configuration set description_key='config.ldap.security.protocol', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPSecurityProtocol';
+update lams_configuration set description_key='config.ldap.truststore.path', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPTruststorePath';
+update lams_configuration set description_key='config.ldap.truststore.password', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPTruststorePassword';
+update lams_configuration set description_key='config.ldap.login.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPLoginAttr';
+update lams_configuration set description_key='config.ldap.fname.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPFNameAttr';
+update lams_configuration set description_key='config.ldap.lname.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPLNameAttr';
+update lams_configuration set description_key='config.ldap.email.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPEmailAttr';
+update lams_configuration set description_key='config.ldap.addr1.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPAddr1Attr';
+update lams_configuration set description_key='config.ldap.addr2.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPAddr2Attr';
+update lams_configuration set description_key='config.ldap.addr3.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPAddr3Attr';
+update lams_configuration set description_key='config.ldap.city.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPCityAttr';
+update lams_configuration set description_key='config.ldap.state.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPStateAttr';
+update lams_configuration set description_key='config.ldap.postcode.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPPostcodeAttr';
+update lams_configuration set description_key='config.ldap.country.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPCountryAttr';
+update lams_configuration set description_key='config.ldap.day.phone.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPDayPhoneAttr';
+update lams_configuration set description_key='config.ldap.evening.phone.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPEveningPhoneAttr';
+update lams_configuration set description_key='config.ldap.fax.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPFaxAttr';
+update lams_configuration set description_key='config.ldap.mobile.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPMobileAttr';
+update lams_configuration set description_key='config.ldap.locale.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPLocaleAttr';
+update lams_configuration set description_key='config.ldap.disabled.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPDisabledAttr';
+update lams_configuration set description_key='config.ldap.org.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPOrgAttr';
+update lams_configuration set description_key='config.ldap.roles.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPRolesAttr';
+update lams_configuration set description_key='config.ldap.learner.map', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPLearnerMap';
+update lams_configuration set description_key='config.ldap.monitor.map', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPMonitorMap';
+update lams_configuration set description_key='config.ldap.author.map', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPAuthorMap';
+update lams_configuration set description_key='config.ldap.group.admin.map', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPGroupAdminMap';
+update lams_configuration set description_key='config.ldap.group.manager.map', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPGroupManagerMap';
+update lams_configuration set description_key='config.ldap.update.on.login', header_name='config.header.ldap', format='BOOLEAN', required=1 where config_key='LDAPUpdateOnLogin';
+update lams_configuration set description_key='config.ldap.org.field', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPOrgField';
+update lams_configuration set description_key='config.ldap.only.one.org', header_name='config.header.ldap', format='BOOLEAN', required=1 where config_key='LDAPOnlyOneOrg';
+update lams_configuration set description_key='config.ldap.encrypt.password.from.browser', header_name='config.header.ldap', format='BOOLEAN', required=1 where config_key='LDAPEncryptPasswordFromBrowser';
+update lams_configuration set description_key='config.ldap.search.results.page.size', header_name='config.header.ldap', format='LONG', required=0 where config_key='LDAPSearchResultsPageSize';
 
-update lams_configuration set description_key = 'config.server.url.context.path', header_name='config.header.system', format='STRING', required=1
-where config_key = 'ServerURLContextPath';
-
-update lams_configuration set description_key = 'config.version', header_name='config.header.system', format='STRING', required=1
-where config_key = 'Version';
-
-update lams_configuration set description_key = 'config.temp.dir', header_name='config.header.system', format='STRING', required=1
-where config_key = 'TempDir';
-
-update lams_configuration set description_key = 'config.dump.dir', header_name='config.header.system', format='STRING', required=1
-where config_key = 'DumpDir';
-
-update lams_configuration set description_key = 'config.ear.dir', header_name='config.header.system', format='STRING', required=1
-where config_key = 'EARDir';
-
-update lams_configuration set description_key = 'config.smtp.server', header_name='config.header.system', format='STRING', required=0
-where config_key = 'SMTPServer';
-
-update lams_configuration set description_key = 'config.lams.support.email', header_name='config.header.system', format='STRING', required=0
-where config_key = 'LamsSupportEmail';
-
-update lams_configuration set description_key = 'config.content.repository.path', header_name='config.header.system', format='STRING', required=1
-where config_key = 'ContentRepositoryPath';
-
-update lams_configuration set description_key = 'config.upload.file.max.size', header_name='config.header.system', format='LONG', required=1
-where config_key = 'UploadFileMaxSize';
-
-update lams_configuration set description_key = 'config.upload.large.file.max.size', header_name='config.header.system', format='LONG', required=1
-where config_key = 'UploadLargeFileMaxSize';
-
-update lams_configuration set description_key = 'config.upload.file.max.memory.size', header_name='config.header.system', format='LONG', required=1
-where config_key = 'UploadFileMaxMemorySize';
-
-update lams_configuration set description_key = 'config.executable.extensions', header_name='config.header.system', format='STRING', required=1
-where config_key = 'ExecutableExtensions';
-
-update lams_configuration set description_key = 'config.user.inactive.timeout', header_name='config.header.system', format='LONG', required=1
-where config_key = 'UserInactiveTimeout';
-
-update lams_configuration set description_key = 'config.use.cache.debug.listener', header_name='config.header.system', format='BOOLEAN', required=1
-where config_key = 'UseCacheDebugListener';
-
-update lams_configuration set description_key = 'config.cleanup.preview.older.than.days', header_name='config.header.system', format='LONG', required=1
-where config_key = 'CleanupPreviewOlderThanDays';
Index: lams_common/src/java/org/lamsfoundation/lams/config/ConfigurationItem.java
===================================================================
diff -u -r5eaa43d63738b6e4bfa6d42f3c8842cdacb9c798 -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_common/src/java/org/lamsfoundation/lams/config/ConfigurationItem.java	(.../ConfigurationItem.java)	(revision 5eaa43d63738b6e4bfa6d42f3c8842cdacb9c798)
+++ lams_common/src/java/org/lamsfoundation/lams/config/ConfigurationItem.java	(.../ConfigurationItem.java)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -129,7 +129,7 @@
 	/** 
      * @hibernate.property column="required" not-null="true"
      */
-	public Boolean isRequired() {
+	public Boolean getRequired() {
 		return required;
 	}
 
Index: lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java
===================================================================
diff -u -re136309c831c4509819e7651ce2f565747bccb57 -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java	(.../ConfigurationDAO.java)	(revision e136309c831c4509819e7651ce2f565747bccb57)
+++ lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java	(.../ConfigurationDAO.java)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -31,7 +31,6 @@
 import org.lamsfoundation.lams.config.dao.IConfigurationDAO;
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.springframework.orm.hibernate3.HibernateCallback;
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 
 /**
@@ -41,7 +40,8 @@
  */
 public class ConfigurationDAO extends BaseDAO implements IConfigurationDAO
 {
-	private static final String LOAD_CONFIG_ITEM_BY_KEY = "from configuration in class " + ConfigurationItem.class.getName() + " where configuration.key=:key";
+	private static final String LOAD_CONFIG_ITEM_BY_KEY = "from configuration in class " + ConfigurationItem.class.getName() 
+		+ " where configuration.key=:key";
 	
 	
     /**
Index: lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java
===================================================================
diff -u -r1c6f143c4fac1afe0405abad822e10e91c446682 -r7248fb9335792be231dcc498f37b28ffa0c794dc
--- lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java	(.../Configuration.java)	(revision 1c6f143c4fac1afe0405abad822e10e91c446682)
+++ lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java	(.../Configuration.java)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
@@ -97,6 +97,10 @@
 		return items;
 	}
 	
+	public ConfigurationItem getConfigItemByKey(String key) {
+		return configurationDAO.getConfigItemByKey(key);
+	}
+	
 	public static String getItemValue(Object obj) {
 		ConfigurationItem item = (ConfigurationItem) obj;
 		if(item.getValue() != null)