Index: lams_admin/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/build.xml,v
diff -u -r1.14 -r1.14.2.1
--- lams_admin/build.xml	15 Dec 2006 00:29:14 -0000	1.14
+++ lams_admin/build.xml	12 Mar 2007 04:39:37 -0000	1.14.2.1
@@ -184,6 +184,7 @@
 	   			<fileset dir="${conf.web.dir}">
 						<include name="**/*.jsp"/>
 						<include name="file/*.xls"/>
+	   					<include name="file/*.sql"/>
 				</fileset>
 	   			
 	   	   </war>
Fisheye: Tag 1.64.2.1 refers to a dead (removed) revision in file `lams_admin/conf/language/ApplicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `lams_admin/conf/language/ApplicationResources_da_DK.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_admin/conf/language/ApplicationResources_el_GR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_admin/conf/language/ApplicationResources_en_AU.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.7.2.1 refers to a dead (removed) revision in file `lams_admin/conf/language/ApplicationResources_es_ES.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_admin/conf/language/ApplicationResources_fr_FR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_admin/conf/language/ApplicationResources_it_IT.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `lams_admin/conf/language/ApplicationResources_ko_KR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `lams_admin/conf/language/ApplicationResources_no_NO.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_admin/conf/language/ApplicationResources_pl_PL.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `lams_admin/conf/language/ApplicationResources_sv_SE.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_admin/conf/language/ApplicationResources_vi_VN.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml,v
diff -u -r1.2 -r1.2.2.1
--- lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	14 Dec 2006 23:44:51 -0000	1.2
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	12 Mar 2007 04:39:38 -0000	1.2.2.1
@@ -8,7 +8,7 @@
 		<property name="messageSource"><ref local="adminMessageSource"/></property>										
 	</bean>
 	
-	<bean id="spreadsheetService" class="org.lamsfoundation.lams.admin.service.SpreadsheetService">
+	<bean id="importService" class="org.lamsfoundation.lams.admin.service.ImportService">
    		<property name="service">
    			<ref bean="userManagementService"/>
    		</property>
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java,v
diff -u -r1.3 -r1.3.2.1
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java	14 Dec 2006 23:44:51 -0000	1.3
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java	12 Mar 2007 04:39:36 -0000	1.3.2.1
@@ -43,7 +43,7 @@
 	private static MessageService messageService;
 	private static IIntegrationService integrationService;
 	private static IAuditService auditService;
-	private static ISpreadsheetService spreadsheetService;
+	private static IImportService importService;
 	
 	public static final IUserManagementService getService(ServletContext servletContext){
 		if (manageService == null) {
@@ -79,11 +79,11 @@
 		return auditService;
 	}
 	
-	public static final ISpreadsheetService getSpreadsheetService(ServletContext servletContext){
-		if(spreadsheetService==null){
+	public static final IImportService getImportService(ServletContext servletContext){
+		if(importService==null){
 			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
-			spreadsheetService = (ISpreadsheetService)ctx.getBean("spreadsheetService");
+			importService = (IImportService)ctx.getBean("importService");
 		}
-		return spreadsheetService;
+		return importService;
 	}
 }
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/service/ISpreadsheetService.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/service/SpreadsheetService.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java,v
diff -u -r1.5 -r1.5.2.1
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java	14 Dec 2006 23:44:51 -0000	1.5
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java	12 Mar 2007 04:39:37 -0000	1.5.2.1
@@ -35,7 +35,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
-import org.lamsfoundation.lams.admin.service.ISpreadsheetService;
+import org.lamsfoundation.lams.admin.service.IImportService;
 import org.lamsfoundation.lams.util.MessageService;
 
 /**
@@ -63,12 +63,12 @@
 		}
 		
 		MessageService messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
-		ISpreadsheetService spreadsheetService = AdminServiceProxy.getSpreadsheetService(getServlet().getServletContext());
+		IImportService importService = AdminServiceProxy.getImportService(getServlet().getServletContext());
 		ImportExcelForm importExcelForm = (ImportExcelForm)form;
 		FormFile file = importExcelForm.getFile();
 		
-		List results = spreadsheetService.parseSpreadsheet(file);
-		String successMessageKey = (spreadsheetService.isUserSpreadsheet(file) ? "msg.users.created" : "msg.users.added");
+		List results = importService.parseSpreadsheet(file);
+		String successMessageKey = (importService.isUserSpreadsheet(file) ? "msg.users.created" : "msg.users.added");
 		
 		int successful = 0;
 		for(int i=0; i<results.size(); i++) {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java,v
diff -u -r1.19 -r1.19.4.1
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	29 Nov 2006 03:59:22 -0000	1.19
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	12 Mar 2007 04:39:37 -0000	1.19.4.1
@@ -23,6 +23,7 @@
 package org.lamsfoundation.lams.admin.web;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -149,6 +150,7 @@
 				orgManageBeans.add(orgManageBean);
 			}
 		}
+		Collections.sort(orgManageBeans);
 		orgManageForm.setOrgManageBeans(orgManageBeans);
 		request.setAttribute("OrgManageForm",orgManageForm);
 		// let the jsp know whether to display links
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageBean.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageBean.java,v
diff -u -r1.3 -r1.3.4.1
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageBean.java	17 Sep 2006 06:10:13 -0000	1.3
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageBean.java	12 Mar 2007 04:39:37 -0000	1.3.4.1
@@ -24,6 +24,7 @@
 
 import java.util.Date;
 
+import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.SupportedLocale;
 
 /**
@@ -37,7 +38,7 @@
  *
  * Created at 22:55:01 on 2006-6-6
  */
-public class OrgManageBean {
+public class OrgManageBean implements Comparable {
 
 	/**
 	 * OrgManageBean Constructor
@@ -106,5 +107,8 @@
 	public void setEditable(boolean editable) {
 		this.editable = editable;
 	}
+	public int compareTo(Object o) {
+		return name.compareToIgnoreCase(((OrgManageBean)o).getName());
+	}
 
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java,v
diff -u -r1.4 -r1.4.2.1
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java	2 Jan 2007 06:03:48 -0000	1.4
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java	12 Mar 2007 04:39:35 -0000	1.4.2.1
@@ -66,6 +66,8 @@
 			links.add(linkBean);
 			linkBean = new LinkBean("importexcel.do", "admin.user.import");
 			links.add(linkBean);
+			linkBean = new LinkBean("importv1.do", "admin.importv1.title");
+			links.add(linkBean);
 			linkBean = new LinkBean("disabledmanage.do", "admin.list.disabled.users");
 			links.add(linkBean);
 			linkBean = new LinkBean("loginmaintain.do", "sysadmin.maintain.loginpage");
@@ -84,6 +86,8 @@
 			links.add(linkBean);
 			linkBean = new LinkBean("importexcel.do", "admin.user.import");
 			links.add(linkBean);
+			linkBean = new LinkBean("importv1.do", "admin.importv1.title");
+			links.add(linkBean);
 			linkBean = new LinkBean("disabledmanage.do", "admin.list.disabled.users");
 			links.add(linkBean);
 		} else {
Index: lams_admin/web/librarylist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/librarylist.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_admin/web/librarylist.jsp	2 Jan 2007 23:57:02 -0000	1.2
+++ lams_admin/web/librarylist.jsp	12 Mar 2007 04:39:36 -0000	1.2.2.1
@@ -12,7 +12,7 @@
 	<tr>
 		<th><fmt:message key="sysadmin.library.activity.title" /></th>
 		<th><fmt:message key="sysadmin.library.activity.description" /></th>
-		<th><fmt:message key="sysadmin.library.createtime" /></th>
+		<th><fmt:message key="sysadmin.library.createtim" /></th>
 		<th><fmt:message key="sysadmin.function" /></th>
 	</tr>
 	<c:forEach items="${libraries}" var="library">
Index: lams_admin/web/orglist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/orglist.jsp,v
diff -u -r1.19 -r1.19.4.1
--- lams_admin/web/orglist.jsp	28 Nov 2006 03:31:10 -0000	1.19
+++ lams_admin/web/orglist.jsp	12 Mar 2007 04:39:37 -0000	1.19.4.1
@@ -42,6 +42,7 @@
 </logic:equal>
 <table class=alternative-color width=100%>
 <tr>
+	<th>Id</th>
 	<th><fmt:message key="admin.organisation.name"/></th>
 	<th><fmt:message key="admin.organisation.code"/></th>
 	<th><fmt:message key="admin.organisation.description"/></th>
@@ -50,6 +51,7 @@
 </tr>
 <logic:iterate id="orgManageBean" name="OrgManageForm" property="orgManageBeans" indexId="idx">
 	<tr>
+		<td><bean:write name="orgManageBean" property="organisationId" /></td>
 		<td>
 			<logic:equal name="OrgManageForm" property="type" value="1">
 				<a href="orgmanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>"><bean:write name="orgManageBean" property="name" /></a>
Index: lams_admin/web/user.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/user.jsp,v
diff -u -r1.22 -r1.22.4.1
--- lams_admin/web/user.jsp	24 Nov 2006 02:09:34 -0000	1.22
+++ lams_admin/web/user.jsp	12 Mar 2007 04:39:37 -0000	1.22.4.1
@@ -36,75 +36,75 @@
 			<table>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.login"/> *:</td>
-					<td><html-el:text property="login" size="20" maxlength="20" /></td>
+					<td><html-el:text property="login" size="50" maxlength="255" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.password"/> *:</td>
-					<td><html-el:password property="password" size="20" maxlength="50" /></td>
+					<td><html-el:password property="password" size="50" maxlength="50" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.password.confirm"/> *:</td>
-					<td><html-el:password property="password2" size="20" maxlength="50" /></td>
+					<td><html-el:password property="password2" size="50" maxlength="50" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.title"/>:</td>
-					<td><html-el:text property="title" size="20" maxlength="32" /></td>
+					<td><html-el:text property="title" size="32" maxlength="32" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.first_name"/> *:</td>
-					<td><html-el:text property="firstName" size="20" maxlength="64" /></td>
+					<td><html-el:text property="firstName" size="50" maxlength="128" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.last_name"/> *:</td>
-					<td><html-el:text property="lastName" size="20" maxlength="128" /></td>
+					<td><html-el:text property="lastName" size="50" maxlength="128" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.email"/> *:</td>
-					<td><html-el:text property="email" size="20" maxlength="128" /></td>
+					<td><html-el:text property="email" size="50" maxlength="128" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.address_line_1"/>:</td>
-					<td><html-el:text property="addressLine1" size="20" maxlength="64" /></td>
+					<td><html-el:text property="addressLine1" size="50" maxlength="64" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.address_line_2"/>:</td>
-					<td><html-el:text property="addressLine2" size="20" maxlength="64" /></td>
+					<td><html-el:text property="addressLine2" size="50" maxlength="64" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.address_line_3"/>:</td>
-					<td><html-el:text property="addressLine3" size="20" maxlength="64" /></td>
+					<td><html-el:text property="addressLine3" size="50" maxlength="64" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.city"/>:</td>
-					<td><html-el:text property="city" size="20" maxlength="64" /></td>
+					<td><html-el:text property="city" size="50" maxlength="64" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.postcode"/>:</td>
-					<td><html-el:text property="postcode" size="20" maxlength="10" /></td>
+					<td><html-el:text property="postcode" size="10" maxlength="10" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.state"/>:</td>
-					<td><html-el:text property="state" size="20" maxlength="64" /></td>
+					<td><html-el:text property="state" size="50" maxlength="64" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.country"/>:</td>
-					<td><html-el:text property="country" size="20" maxlength="64" /></td>
+					<td><html-el:text property="country" size="50" maxlength="64" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.day_phone"/>:</td>
-					<td><html-el:text property="dayPhone" size="20" maxlength="64" /></td>
+					<td><html-el:text property="dayPhone" size="50" maxlength="64" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.evening_phone"/>:</td>
-					<td><html-el:text property="eveningPhone" size="20" maxlength="64" /></td>
+					<td><html-el:text property="eveningPhone" size="50" maxlength="64" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.mobile_phone"/>:</td>
-					<td><html-el:text property="mobilePhone" size="20" maxlength="64" /></td>
+					<td><html-el:text property="mobilePhone" size="50" maxlength="64" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.fax"/>:</td>
-					<td><html-el:text property="fax" size="20" maxlength="64" /></td>
+					<td><html-el:text property="fax" size="50" maxlength="64" /></td>
 				</tr>
 				<tr>
 					<td class="align-right"><fmt:message key="admin.organisation.locale"/>:</td>
Index: lams_admin/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tiles/Attic/tiles-defs.xml,v
diff -u -r1.25 -r1.25.2.1
--- lams_admin/web/WEB-INF/tiles/tiles-defs.xml	2 Jan 2007 06:03:48 -0000	1.25
+++ lams_admin/web/WEB-INF/tiles/tiles-defs.xml	12 Mar 2007 04:39:37 -0000	1.25.2.1
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <tiles-definitions>
+	<definition name=".importv1result" path="/template.jsp">
+		<put name="title" value="admin.user.management"/>
+		<put name="content" value="import/importv1result.jsp" />	
+	</definition>
+
+	<definition name=".importv1contents" path="/template.jsp">
+		<put name="title" value="admin.user.management"/>
+		<put name="content" value="import/importv1contents.jsp" />	
+	</definition>
+
+	<definition name=".importv1" path="/template.jsp">
+		<put name="title" value="admin.user.management"/>
+		<put name="content" value="import/importv1.jsp" />	
+	</definition>
+
 	<definition name=".toolcontentlist" path="/template.jsp">
 		<put name="title" value="sysadmin.edit.default.tool.content"/>
 		<put name="content" value="toolcontent/toolcontentlist.jsp" />	
Index: lams_admin/web/import/importexcel.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/import/importexcel.jsp,v
diff -u -r1.7 -r1.7.2.1
--- lams_admin/web/import/importexcel.jsp	15 Dec 2006 00:29:29 -0000	1.7
+++ lams_admin/web/import/importexcel.jsp	12 Mar 2007 04:39:35 -0000	1.7.2.1
@@ -1,12 +1,12 @@
 <%@ include file="/taglibs.jsp"%>
-<%@ page import="org.lamsfoundation.lams.admin.service.ISpreadsheetService" %>
+<%@ page import="org.lamsfoundation.lams.admin.service.IImportService" %>
 
 <h2>
 	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
 	: <fmt:message key="admin.user.import" />
 </h2>
 
-<lams:help page="<%= ISpreadsheetService.IMPORT_HELP_PAGE %>"/>
+<lams:help page="<%= IImportService.IMPORT_HELP_PAGE %>"/>
 
 <p>&nbsp;</p>
 
@@ -18,11 +18,11 @@
 	</li>
 	<li>
 		<fmt:message key="msg.import.2"/>
-		<ul><li><a href="file/lams_users_template.xls">lams_users_template.xls</a></li></ul>
+		<ul><li><p><a href="file/lams_users_template.xls">lams_users_template.xls</a></p></li></ul>
 	</li>
 	<li>
 		<fmt:message key="msg.import.3"/>
-		<ul><li><a href="file/lams_roles_template.xls">lams_roles_template.xls</a></li></ul>
+		<ul><li><p><a href="file/lams_roles_template.xls">lams_roles_template.xls</a></p></li></ul>
 	</li>
 </ul>
 </p>
Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.50 -r1.50.2.1
--- lams_build/build.xml	12 Jan 2007 04:59:05 -0000	1.50
+++ lams_build/build.xml	12 Mar 2007 04:37:15 -0000	1.50.2.1
@@ -197,29 +197,25 @@
 	<!-- ============================================================================== -->
 
 	<target name="deploy-ear" 
-		description="Deploys previously assembled ear to jboss">
+		description="Delete any old versions of the ear directory">
+		<delete dir="${jboss.deploy}"/>
 		<copy todir="${jboss.ear.deploy}" overwrite="true"
 			failonerror="true">
 			<fileset dir="${assembly}">
 				<include name="${lams.ear}/**/*.*" />
 			</fileset>
-
 		</copy>
 	</target>
 
 	<!-- ============================================================================== -->
-	<!-- Deploy IMS Content Package tool to the depoloyed ear 							-->
+	<!-- Deploy the LAMS or RAMS set of tools to the deployed ear 				               			-->
 	<!--  Relies on the tools using the parameter jboss.deploy							-->						
 	<!-- ============================================================================== -->
-	<target name="deploy-tools" description="Deploy the tools, including any special parallel activities">
- 		<ant antfile="../${tool_forum_dir}/build.xml" target="deploy-tool"
+	<target name="deploy-common-tools" description="Deploy the tools shared between LAMS and RAMS. Called by deploy-lams-tools and deploy-rams-tools">
+		<ant antfile="../${tool_forum_dir}/build.xml" target="deploy-tool"
 				inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 		</ant>
-		<ant antfile="../${tool_lamc_dir}/build.xml" target="deploy-tool"
-				inheritAll="false" >
-			<property name="jboss.deploy" location="${jboss.deploy}"/>
-		</ant> 
 		<ant antfile="../${tool_lanb_dir}/build.xml" target="deploy-tool"
 				inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
@@ -256,9 +252,40 @@
 				inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 		</ant>
-		<ant target="deploy-learning-libraries"/>
 	</target>
+
+	<target name="deploy-lams-tools" depends="test-application, deploy-common-tools" if="isLAMS"
+			description="Deploy the LAMS tools. Called by deploy-tools.">
+		<echo>Building the LAMS set of tools.</echo>
+		<ant antfile="../${tool_lamc_dir}/build.xml" target="deploy-tool"
+				inheritAll="false" >
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
+		</ant> 
+	</target>
+			
+	<target name="deploy-rams-tools" depends="test-application, deploy-common-tools" if="isRAMS"
+			description="Deploys the RAMS tools. Called by deploy-tools.">
+		<echo>Building the RAMS set of tools.</echo>
+		<!-- No RAMS specific tools yet -->
+	</target>
 	
+	<target name="test-application">
+		  <condition property="isLAMS">
+		  	<equals arg1="${conf.application}" arg2="lams" />
+		  </condition>
+		  <condition property="isRAMS">
+		  	<equals arg1="${conf.application}" arg2="rams" />
+		  </condition>
+		  <echo>isLAMS ${isLAMS}</echo>
+		  <echo>isRAMS ${isRAMS}</echo>
+	</target>
+	
+	<target name="deploy-tools" depends="deploy-lams-tools,deploy-rams-tools" 
+		description="Deploys the desired tools, working out automatically whether they should be the LAMS or RAMS set of tools. Includes any special parallel activities">
+		<ant target="deploy-learning-libraries"/>
+	</target>
+
+
 	<!-- ============================================================================== -->
 	<!--  Rebuild the LAMS Database														-->						
 	<!-- ============================================================================== -->
Index: lams_build/buildcombinedtasks.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/Attic/buildcombinedtasks.xml,v
diff -u -r1.1 -r1.1.4.1
--- lams_build/buildcombinedtasks.xml	19 Oct 2006 07:44:39 -0000	1.1
+++ lams_build/buildcombinedtasks.xml	12 Mar 2007 04:37:15 -0000	1.1.4.1
@@ -35,7 +35,7 @@
 			</copy>
 
 			<copy overwrite="yes" todir="${assembly.activity}/language">
-				<fileset dir="${package.cfg}/language">
+				<fileset dir="${package.cfg}/language/${conf.application}">
 					<include name="*.*"/>
 				</fileset>
 			</copy>
Index: lams_build/common.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_build/common.properties,v
diff -u -r1.18 -r1.18.4.1
--- lams_build/common.properties	21 Nov 2006 06:15:40 -0000	1.18
+++ lams_build/common.properties	12 Mar 2007 04:37:25 -0000	1.18.4.1
@@ -21,6 +21,10 @@
 project=LAMS
 project_version=2.0beta1
 
+# which application are we trying to build? LAMS or RAMS
+conf.application=lams
+#conf.application=rams
+
 # which o/s related property file do you want? valid values "windows" or "unix"
 osPropertiesName=windows
 
@@ -68,9 +72,11 @@
 conf.web.dir=${basedir}/web
 conf.webinf.dir=${conf.web.dir}/WEB-INF
 conf.struts.dir=${conf.webinf.dir}/struts
-##Language Files
-conf.language.dir=${conf.dir}/language
 
+##Language Files 
+# conf.language.dir is the directory containing all the language files for all the tools, learning, monitoring, etc.
+conf.language.dir=${conf.dir}/language/${conf.application}
+
 # Build directory
 build=${basedir}/build
 build.classes.java=${build}/classes/java
Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/deploy-tool/lib/lams-tool-deploy.jar,v
diff -u -r1.9 -r1.9.4.1
Binary files differ
Index: lams_build/lib/lams/lams-learning.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-learning.jar,v
diff -u -r1.35 -r1.35.4.1
Binary files differ
Index: lams_build/lib/lams/lams-monitoring.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-monitoring.jar,v
diff -u -r1.36 -r1.36.4.1
Binary files differ
Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_ar_JO.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_cy_GB.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_da_DK.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_el_GR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_en_AU.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_es_ES.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_fr_FR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_it_IT.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_ko_KR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_mi_NZ.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_no_NO.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_pl_PL.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_pt_BR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_ru_RU.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_sv_SE.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_vi_VN.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_build/librarypackages/chatscribe/language/ApplicationResources_zh_TW.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_cy_GB.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_da_DK.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_el_GR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_en_AU.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_es_ES.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_fr_FR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_it_IT.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_ko_KR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_mi_NZ.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_no_NO.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_pl_PL.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_pt_BR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_sv_SE.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_vi_VN.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_build/librarypackages/forumscribe/language/ApplicationResources_zh_TW.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_ar_JO.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_cy_GB.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_da_DK.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_de_DE.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_el_GR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_en_AU.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_es_ES.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_fr_FR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_it_IT.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_ko_KR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_mi_NZ.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_nl_BE.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_no_NO.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_pl_PL.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_pt_BR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_ru_RU.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_sv_SE.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_vi_VN.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_zh_CN.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_build/librarypackages/shareresourcesforum/language/ApplicationResources_zh_TW.properties'.
Fisheye: No comparison available.  Pass `N' to diff?