Index: lams_central/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/build.xml,v
diff -u -r1.36 -r1.36.2.1
--- lams_central/build.xml	28 Sep 2006 23:28:23 -0000	1.36
+++ lams_central/build.xml	12 Mar 2007 01:30:05 -0000	1.36.2.1
@@ -100,20 +100,21 @@
 		</javac>
 	</target>
 	
-	<target name="copyContext">
-		<copy overwrite="yes" todir="${build.web}">
-			<fileset dir="${conf.web.dir}">
+	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
+	<!-- Make the war archive  for deployment             -->
+	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
+	<target name="copyConfFlashFiles" description="Copy the Flash files from the conf directory to the web directory">
+		<!-- Clean out any old ones first so we don't get rams/lams confused -->
+		<delete dir="web/flashxml"/>
+		<mkdir dir="web/flashxml"/>
+		<copy overwrite="yes" todir="web/flashxml">
+			<fileset dir="${conf.dir}/flashxml/${conf.application}">
 				<include name="**/*.xml"/>
-				<include name="**/*.tld"/>
-				<include name="**/*.tag"/>
 			</fileset>
 		</copy>
 	</target>
-	
-	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<!-- Make the war archive  for deployment             -->
-	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="build-war" depends="webdoclet,build-jar" description="creates war file">
+
+	<target name="build-war" depends="webdoclet,build-jar,copyConfFlashFiles" description="creates war file">
 		<delete file="${build.lib}/${product}.war"/>
 		<war warfile="${build.lib}/${product}.war" manifest="${conf.dir}/war/META-INF/MANIFEST.MF"
   				webxml="${conf.webinf.dir}/web.xml">
@@ -149,7 +150,7 @@
 	<!-- ================================================================ -->
 	<!-- Make jar archive for deployment        		    	          -->
 	<!-- ================================================================ -->
-	<target name="build-jar" depends="compile,copyContext" description="creates jar file">
+	<target name="build-jar" depends="compile" description="creates jar file">
 		<delete file="${build.lib}/${product}.jar"/>
 		<jar jarfile="${build.lib}/${product}.jar"  manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
 			<fileset dir="${build.classes.java}"/>
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/authoring/Attic/DesignDataModel.as,v
diff -u -r1.46.2.1 -r1.46.2.2
Binary files differ
Index: lams_central/src/flash/org/lamsfoundation/lams/learner/Header.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/learner/Attic/Header.as,v
diff -u -r1.9 -r1.9.2.1
Binary files differ
Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Attic/Lesson.as,v
diff -u -r1.21 -r1.21.2.1
Binary files differ
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/LessonManagerDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/monitoring/Attic/LessonManagerDialog.as,v
diff -u -r1.13 -r1.13.2.1
Binary files differ
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/User.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/monitoring/Attic/User.as,v
diff -u -r1.6 -r1.6.2.1
Binary files differ
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Attic/Monitor.as,v
diff -u -r1.32 -r1.32.2.1
Binary files differ
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Attic/MonitorController.as,v
diff -u -r1.29 -r1.29.2.1
Binary files differ
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Attic/MonitorModel.as,v
diff -u -r1.36 -r1.36.2.1
Binary files differ
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/Attic/LessonTabView.as,v
diff -u -r1.52 -r1.52.2.1
Binary files differ
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/Attic/MonitorTabView.as,v
diff -u -r1.23 -r1.23.2.1
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java,v
diff -u -r1.40 -r1.40.2.1
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	27 Oct 2006 00:56:19 -0000	1.40
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	12 Mar 2007 01:29:24 -0000	1.40.2.1
@@ -133,8 +133,6 @@
 	public void setGroupingDAO(GroupingDAO groupingDAO) {
 		this.groupingDAO = groupingDAO;
 	}
-	/** for sending acknowledgment/error messages back to flash */
-	private FlashMessage flashMessage;
 	
 	/**
 	 * @param transitionDAO The transitionDAO  to set
@@ -249,6 +247,7 @@
 	 * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#getLearningDesignDetails(java.lang.Long)
 	 */
 	public String getLearningDesignDetails(Long learningDesignID)throws IOException{
+		FlashMessage flashMessage= null;
 		LearningDesignDTO learningDesignDTO = learningDesignService.getLearningDesignDTO(learningDesignID);
 		if(learningDesignDTO==null)
 			flashMessage = FlashMessage.getNoSuchLearningDesignExists("getLearningDesignDetails",learningDesignID);
@@ -558,7 +557,7 @@
 	public String getAllLearningDesignDetails()throws IOException{
 		Iterator iterator= getAllLearningDesigns().iterator();
 		ArrayList arrayList = createDesignDetailsPacket(iterator);
-		flashMessage = new FlashMessage("getAllLearningDesignDetails",arrayList);		
+		FlashMessage flashMessage = new FlashMessage("getAllLearningDesignDetails",arrayList);		
 		return flashMessage.serializeMessage();
 	}
 	/**
@@ -585,15 +584,15 @@
 	public String getLearningDesignsForUser(Long userID) throws IOException{
 		List list = learningDesignDAO.getLearningDesignByUserId(userID);
 		ArrayList arrayList = createDesignDetailsPacket(list.iterator());
-		flashMessage = new FlashMessage("getLearningDesignsForUser",arrayList);
+		FlashMessage flashMessage = new FlashMessage("getLearningDesignsForUser",arrayList);
 		return flashMessage.serializeMessage();
 	}	
 	/**
 	 * (non-Javadoc)
 	 * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#getAllLearningLibraryDetails()
 	 */
 	public String getAllLearningLibraryDetails()throws IOException{
-		flashMessage = new FlashMessage("getAllLearningLibraryDetails",learningDesignService.getAllLearningLibraryDetails());
+		FlashMessage flashMessage = new FlashMessage("getAllLearningLibraryDetails",learningDesignService.getAllLearningLibraryDetails());
 		return flashMessage.serializeMessage();
 	}
 	
@@ -609,7 +608,7 @@
 	   }
 	   
 	   Long newContentID = contentIDGenerator.getNextToolContentIDFor(tool);
-	   flashMessage = new FlashMessage("getToolContentID", newContentID);
+	   FlashMessage flashMessage = new FlashMessage("getToolContentID", newContentID);
 	   
 	   return flashMessage.serializeMessage();
 	}
@@ -667,8 +666,6 @@
 	public String generateUniqueContentFolder() throws FileUtilException, IOException {
 		
 		String newUniqueContentFolderID = null;
-		FlashMessage flashMessag = null;
-		
 		Properties props = new Properties();
 		
 		IdentifierGenerator uuidGen = new UUIDHexGenerator();
@@ -677,16 +674,17 @@
 		// lowercase to resolve OS issues
 		newUniqueContentFolderID = ((String) uuidGen.generate(null, null)).toLowerCase();
 		
-		flashMessage = new FlashMessage("createUniqueContentFolder", newUniqueContentFolderID);
+		FlashMessage flashMessage = new FlashMessage("createUniqueContentFolder", newUniqueContentFolderID);
 		
 		return flashMessage.serializeMessage();
 	}
 	
 	/** @see org.lamsfoundation.lams.authoring.service.IAuthoringService#getHelpURL() */
 	public String getHelpURL() throws Exception {
 		
-		String helpURL = Configuration.get(ConfigurationKeys.HELP_URL);
+		FlashMessage flashMessage =null;
 		
+		String helpURL = Configuration.get(ConfigurationKeys.HELP_URL);
 		if(helpURL != null)
 			flashMessage = new FlashMessage("getHelpURL", helpURL);
 		else 
Index: lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java,v
diff -u -r1.7 -r1.7.2.1
--- lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java	10 Oct 2006 05:17:36 -0000	1.7
+++ lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java	12 Mar 2007 01:29:24 -0000	1.7.2.1
@@ -56,9 +56,6 @@
 	private static Logger log = Logger.getLogger(StoreNBEntryServlet.class);
 	public static final String STORE_NBENTRY_MESSAGE_KEY = "storeNotebookEntry";
 	
-	/** for sending acknowledgment/error messages back to flash */
-	private FlashMessage flashMessage;
-
 	public ICoreNotebookService getNotebookService(){
 		WebApplicationContext webContext = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
 		return (ICoreNotebookService) webContext.getBean("coreNotebookService");		
@@ -81,7 +78,7 @@
 		{
 				
 		ICoreNotebookService notebookService = getNotebookService();
-		
+		FlashMessage flashMessage= null;
 
 		Hashtable table = (Hashtable)WDDXProcessor.deserialize(entryDetails);
 		NotebookEntry notebookEntry = new NotebookEntry();
Index: lams_central/src/java/org/lamsfoundation/lams/security/JspRedirectStrategy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/security/JspRedirectStrategy.java,v
diff -u -r1.7 -r1.7.2.1
--- lams_central/src/java/org/lamsfoundation/lams/security/JspRedirectStrategy.java	11 Oct 2006 05:43:55 -0000	1.7
+++ lams_central/src/java/org/lamsfoundation/lams/security/JspRedirectStrategy.java	12 Mar 2007 01:29:25 -0000	1.7.2.1
@@ -75,15 +75,10 @@
 		String checkStatus = (String) session.getAttribute(AUTH_OBJECT_NAME);
 		String id = session.getId();
 
-		if (checkStatus == null) {
-			log.debug("===>LOGIN PAGE: there is no auth obj in session, auth obj created. session id: " + id);
+		if (checkStatus == null || checkStatus.equals(SECURITY_CHECK_NOT_PASSED)) {
+			log.debug("===>LOGIN PAGE: there is no auth obj in session or accessing login page before login succeed, auth obj created. session id: " + id);
 			session.setAttribute(AUTH_OBJECT_NAME, SECURITY_CHECK_NOT_PASSED);
 		
-			response.sendRedirect(WELCOME_PAGE);
-			return true;
-		} else if (checkStatus.equals(SECURITY_CHECK_NOT_PASSED)) {
-			log.debug("===>LOGIN PAGE: accessing login page before login succeed, display login page. session id: "+ id);
-			//set local information for login page. Because login.jsp does not pass thru any filters.
 			try {
 				LocaleFilter filter = new LocaleFilter();
 				filter.doFilter(request, response, null);
Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java,v
diff -u -r1.18 -r1.18.2.1
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java	4 Dec 2006 01:12:38 -0000	1.18
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java	12 Mar 2007 01:29:24 -0000	1.18.2.1
@@ -92,13 +92,9 @@
 					if(pageDirection.toLowerCase().equals(RTL_DIR))
 						rtl = true;
 				
-				List themeList = CSSThemeUtil.getAllUserThemes();
+				List<String> themeList = CSSThemeUtil.getAllUserThemes();
 				
-				Iterator i = themeList.iterator();
-				
-				while (i.hasNext())
-				{
-					String theme = (String)i.next();
+				for ( String theme: themeList) {
 					if ( theme != null) {
 						theme = appendStyle(theme, rtl);
 						if (localLinkPath != null)
Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesTextareaTag.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesTextareaTag.java,v
diff -u -r1.5 -r1.5.2.1
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesTextareaTag.java	17 Sep 2006 06:12:05 -0000	1.5
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesTextareaTag.java	12 Mar 2007 01:29:24 -0000	1.5.2.1
@@ -114,10 +114,11 @@
             data = this.lookupProperty(this.name, this.property);
         }
     	if(data != null){
-    		//change back
-    		if(os.toLowerCase().indexOf("win") != -1)
-    			data = data.replaceAll("<BR>","\r\n");
-    		else
+    		//comment: although window OS should be \r\n format, but in some case, it only include "\n" as well.
+    		//so it is not safe to do replacement   
+//    		if(os.toLowerCase().indexOf("win") != -1)
+//    			data = data.replaceAll("<BR>","\r\n");
+//    		else
     			data = data.replaceAll("<BR>","\n");
     	}
     	return data == null?"":data;
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/Register.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/Register.java,v
diff -u -r1.1 -r1.1.2.1
--- lams_central/src/java/org/lamsfoundation/lams/webservice/Register.java	5 Oct 2006 00:54:40 -0000	1.1
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/Register.java	12 Mar 2007 01:29:24 -0000	1.1.2.1
@@ -8,5 +8,40 @@
 package org.lamsfoundation.lams.webservice;
 
 public interface Register extends java.rmi.Remote {
-    public boolean createUser(String username, String password, String firstName, String lastName, String email) throws java.rmi.RemoteException;
+    public boolean createUser(String username, 
+    		String password, 
+    		String firstName, 
+    		String lastName, 
+    		String email, 
+    		String serverId, 
+    		String datetime, 
+    		String hash) throws java.rmi.RemoteException;
+    
+    public boolean addUserToGroup(
+			String username, 
+			String serverId, 
+			String datetime, 
+			String hash,
+			Boolean isTeacher) throws java.rmi.RemoteException;
+    
+    public boolean addUserToGroupLessons(
+			String username, 
+			String serverId, 
+			String datetime, 
+			String hash) throws java.rmi.RemoteException;
+    
+    public boolean addUserToSubgroup(
+			String username,
+			String orgid,
+			String serverId, 
+			String datetime, 
+			String hash,
+			Boolean isTeacher) throws java.rmi.RemoteException;
+    
+    public boolean addUserToSubgroupLessons(
+			String username,
+			String orgId,
+			String serverId, 
+			String datetime, 
+			String hash) throws java.rmi.RemoteException;
 }
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java,v
diff -u -r1.7 -r1.7.2.1
--- lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java	29 Nov 2006 03:59:17 -0000	1.7
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java	12 Mar 2007 01:29:24 -0000	1.7.2.1
@@ -10,19 +10,21 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import javax.servlet.http.HttpServlet;
 
 import org.apache.axis.MessageContext;
 import org.apache.axis.transport.http.HTTPConstants;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.security.Authenticator;
+import org.lamsfoundation.lams.integration.service.IIntegrationService;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.Organisation;
-import org.lamsfoundation.lams.usermanagement.OrganisationState;
-import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.SupportedLocale;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -37,8 +39,6 @@
 
 	Logger log = Logger.getLogger(RegisterServiceSoapBindingImpl.class);
 
-	private static final String DEMO_ORG_NAME = "Demo Course";
-
 	private static MessageContext context = MessageContext.getCurrentContext();
 
 	private static IUserManagementService service = (IUserManagementService) WebApplicationContextUtils
@@ -51,9 +51,23 @@
 					((HttpServlet) context.getProperty(HTTPConstants.MC_HTTP_SERVLET))
 							.getServletContext()).getBean("lessonService");
 
-	public boolean createUser(String username, String password, String firstName, String lastName,
-			String email) throws java.rmi.RemoteException {
+	private static IIntegrationService integrationService = (IIntegrationService) WebApplicationContextUtils
+	.getRequiredWebApplicationContext(
+			((HttpServlet) context.getProperty(HTTPConstants.MC_HTTP_SERVLET))
+					.getServletContext()).getBean("integrationService");
+	
+	public boolean createUser(
+			String username,
+			String password,
+			String firstName,
+			String lastName,
+			String email,
+			String serverId,
+			String datetime,
+			String hash) throws java.rmi.RemoteException {
 		try {
+			ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId);
+			Authenticator.authenticate(extServer, datetime,	hash);
 			if (service.getUserByLogin(username) != null)
 				return false;
 			User user = new User();
@@ -80,29 +94,125 @@
 				user.setHtmlTheme(htmlTheme);
 			}
 			service.save(user);
-			Organisation org = getDemoOrg(user);
-			addMemberships(user, org);
-			addUserToLessons(user, org);
 			return true;
 		} catch (Exception e) {
 			log.debug(e.getMessage(), e);
 			throw new java.rmi.RemoteException(e.getMessage());
 		}
 	}
 
+	public boolean addUserToGroup(
+			String username, 
+			String serverId, 
+			String datetime, 
+			String hash,
+			Boolean isTeacher) throws java.rmi.RemoteException {
+		try {
+			ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId);
+			Authenticator.authenticate(extServer, datetime,	hash);
+			User user = service.getUserByLogin(username);
+			Organisation org = extServer.getOrganisation();
+			addMemberships(user, org, isTeacher);
+			return true;
+		} catch (Exception e) {
+			log.debug(e.getMessage(), e);
+			throw new java.rmi.RemoteException(e.getMessage());
+		}
+	}
+	
+	public boolean addUserToSubgroup(
+			String username,
+			String orgId,
+			String serverId, 
+			String datetime, 
+			String hash,
+			Boolean isTeacher) throws java.rmi.RemoteException {
+		try {
+			ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId);
+			Authenticator.authenticate(extServer, datetime,	hash);
+			User user = service.getUserByLogin(username);
+			Organisation group = extServer.getOrganisation();
+			Organisation subgroup = (Organisation)service.findById(Organisation.class, new Integer(orgId));
+			Set children = group.getChildOrganisations();
+			Iterator iter = children.iterator();
+			while (iter.hasNext()) {
+				Organisation child = (Organisation)iter.next();
+				if (child.getOrganisationId().equals(subgroup.getOrganisationId())) {
+					addMemberships(user, subgroup, isTeacher);
+					return true;
+				}
+			}
+			return false;
+		} catch (Exception e) {
+			log.debug(e.getMessage(), e);
+			throw new java.rmi.RemoteException(e.getMessage());
+		}
+	}
+	
+	public boolean addUserToGroupLessons(
+			String username, 
+			String serverId, 
+			String datetime, 
+			String hash) throws java.rmi.RemoteException {
+		try {
+			ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId);
+			Authenticator.authenticate(extServer, datetime,	hash);
+			User user = service.getUserByLogin(username);
+			Organisation org = extServer.getOrganisation();
+			addUserToLessons(user, org);
+			return true;
+		} catch (Exception e) {
+			log.debug(e.getMessage(), e);
+			throw new java.rmi.RemoteException(e.getMessage());
+		}
+	}
+	
+	public boolean addUserToSubgroupLessons(
+			String username,
+			String orgId,
+			String serverId, 
+			String datetime, 
+			String hash) throws java.rmi.RemoteException {
+		try {
+			ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(serverId);
+			Authenticator.authenticate(extServer, datetime,	hash);
+			User user = service.getUserByLogin(username);
+			Organisation group = extServer.getOrganisation();
+			
+			Organisation subgroup = (Organisation)service.findById(Organisation.class, new Integer(orgId));
+			Set children = group.getChildOrganisations();
+			Iterator iter = children.iterator();
+			while (iter.hasNext()) {
+				Organisation child = (Organisation)iter.next();
+				if (child.getOrganisationId().equals(subgroup.getOrganisationId())) {
+					addUserToLessons(user, subgroup);
+					return true;
+				}
+			}
+			return false;
+		} catch (Exception e) {
+			log.debug(e.getMessage(), e);
+			throw new java.rmi.RemoteException(e.getMessage());
+		}
+	}
+	
 	private SupportedLocale getLocale() {
 		String defaultLocale = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE);
 		return service
 				.getSupportedLocale(defaultLocale.substring(0, 2), defaultLocale.substring(3));
 	}
 
 	@SuppressWarnings("unchecked")
-	private void addMemberships(User user, Organisation org) {
+	private void addMemberships(User user, Organisation org, Boolean isTeacher) {
 		log.debug("adding memberships for user " + user.getUserId() + " in " + org.getName());
 		UserOrganisation uo = new UserOrganisation(user, org);
 		service.save(uo);
-		Integer[] roles = new Integer[] { Role.ROLE_AUTHOR, Role.ROLE_MONITOR,
-				Role.ROLE_GROUP_MANAGER, Role.ROLE_LEARNER };
+		Integer[] roles;
+		if (isTeacher) {
+			roles = new Integer[] { Role.ROLE_AUTHOR, Role.ROLE_MONITOR, Role.ROLE_LEARNER };
+		} else {
+			roles = new Integer[] { Role.ROLE_LEARNER };
+		}
 		for (Integer roleId : roles) {
 			UserOrganisationRole uor = new UserOrganisationRole(uo, (Role) service.findById(
 					Role.class, roleId));
@@ -125,25 +235,4 @@
 		}
 	}
 
-	private Organisation getDemoOrg(User user) {
-		Organisation org = null;
-		List list = service.findByProperty(Organisation.class, "name", DEMO_ORG_NAME);
-		if (list != null && list.size() > 0) {
-			org = (Organisation) list.get(0);
-		}
-		if (org == null) {
-			org = new Organisation();
-			org.setName(DEMO_ORG_NAME);
-			org.setParentOrganisation(service.getRootOrganisation());
-			org.setOrganisationType((OrganisationType) service.findById(OrganisationType.class,
-					OrganisationType.COURSE_TYPE));
-			org.setOrganisationState((OrganisationState) service.findById(OrganisationState.class,
-					OrganisationState.ACTIVE));
-			org.setLocale(getLocale());
-			service.saveOrganisation(org, user.getUserId());
-		}
-		log.debug(" Got org " + org.getOrganisationId());
-		return org;
-	}
-
 }
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingSkeleton.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingSkeleton.java,v
diff -u -r1.1 -r1.1.2.1
--- lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingSkeleton.java	5 Oct 2006 00:54:40 -0000	1.1
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingSkeleton.java	12 Mar 2007 01:29:24 -0000	1.1.2.1
@@ -7,6 +7,7 @@
 
 package org.lamsfoundation.lams.webservice;
 
+
 public class RegisterServiceSoapBindingSkeleton implements org.lamsfoundation.lams.webservice.Register, org.apache.axis.wsdl.Skeleton {
     private org.lamsfoundation.lams.webservice.Register impl;
     private static java.util.Map _myOperations = new java.util.Hashtable();
@@ -27,7 +28,15 @@
     }
 
     static {
-        org.apache.axis.description.OperationDesc _oper;
+        addCreateUser();
+        addAddUserToGroup();
+        addAddUserToGroupLessons();
+        addAddUserToSubgroup();
+        addAddUserToSubgroupLessons();
+    }
+    
+    private static void addCreateUser() {
+    	org.apache.axis.description.OperationDesc _oper;
         org.apache.axis.description.FaultDesc _fault;
         org.apache.axis.description.ParameterDesc [] _params;
         _params = new org.apache.axis.description.ParameterDesc [] {
@@ -36,6 +45,9 @@
             new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "firstName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
             new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "lastName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
             new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "email"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hash"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
         };
         _oper = new org.apache.axis.description.OperationDesc("createUser", _params, new javax.xml.namespace.QName("", "createUserReturn"));
         _oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
@@ -47,6 +59,94 @@
         }
         ((java.util.List)_myOperations.get("createUser")).add(_oper);
     }
+    
+    private static void addAddUserToGroup() {
+    	org.apache.axis.description.OperationDesc _oper;
+        org.apache.axis.description.FaultDesc _fault;
+        org.apache.axis.description.ParameterDesc [] _params;
+        _params = new org.apache.axis.description.ParameterDesc [] {
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "username"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false),
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hash"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "isTeacher"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "boolean"), java.lang.Boolean.class, false, false),
+        };
+        _oper = new org.apache.axis.description.OperationDesc("addUserToGroup", _params, new javax.xml.namespace.QName("", "addUserToGroupReturn"));
+        _oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        _oper.setElementQName(new javax.xml.namespace.QName("", "addUserToGroup"));
+        _oper.setSoapAction("");
+        _myOperationsList.add(_oper);
+        if (_myOperations.get("addUserToGroup") == null) {
+            _myOperations.put("addUserToGroup", new java.util.ArrayList());
+        }
+        ((java.util.List)_myOperations.get("addUserToGroup")).add(_oper);
+    }
+    
+    private static void addAddUserToGroupLessons() {
+    	org.apache.axis.description.OperationDesc _oper;
+        org.apache.axis.description.FaultDesc _fault;
+        org.apache.axis.description.ParameterDesc [] _params;
+        _params = new org.apache.axis.description.ParameterDesc [] {
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "username"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false),
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hash"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+        };
+        _oper = new org.apache.axis.description.OperationDesc("addUserToGroupLessons", _params, new javax.xml.namespace.QName("", "addUserToGroupLessonsReturn"));
+        _oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        _oper.setElementQName(new javax.xml.namespace.QName("", "addUserToGroupLessons"));
+        _oper.setSoapAction("");
+        _myOperationsList.add(_oper);
+        if (_myOperations.get("addUserToGroupLessons") == null) {
+            _myOperations.put("addUserToGroupLessons", new java.util.ArrayList());
+        }
+        ((java.util.List)_myOperations.get("addUserToGroupLessons")).add(_oper);
+    }
+    
+    private static void addAddUserToSubgroup() {
+    	org.apache.axis.description.OperationDesc _oper;
+        org.apache.axis.description.FaultDesc _fault;
+        org.apache.axis.description.ParameterDesc [] _params;
+        _params = new org.apache.axis.description.ParameterDesc [] {
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "username"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false),
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "orgId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hash"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "isTeacher"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "boolean"), java.lang.Boolean.class, false, false),
+        };
+        _oper = new org.apache.axis.description.OperationDesc("addUserToSubgroup", _params, new javax.xml.namespace.QName("", "addUserToSubgroupReturn"));
+        _oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        _oper.setElementQName(new javax.xml.namespace.QName("", "addUserToSubgroup"));
+        _oper.setSoapAction("");
+        _myOperationsList.add(_oper);
+        if (_myOperations.get("addUserToSubgroup") == null) {
+            _myOperations.put("addUserToSubgroup", new java.util.ArrayList());
+        }
+        ((java.util.List)_myOperations.get("addUserToSubgroup")).add(_oper);
+    }
+    
+    private static void addAddUserToSubgroupLessons() {
+    	org.apache.axis.description.OperationDesc _oper;
+        org.apache.axis.description.FaultDesc _fault;
+        org.apache.axis.description.ParameterDesc [] _params;
+        _params = new org.apache.axis.description.ParameterDesc [] {
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "username"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false),
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "orgId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+            new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hash"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false), 
+        };
+        _oper = new org.apache.axis.description.OperationDesc("addUserToSubgroupLessons", _params, new javax.xml.namespace.QName("", "addUserToSubgroupLessonsReturn"));
+        _oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        _oper.setElementQName(new javax.xml.namespace.QName("", "addUserToSubgroupLessons"));
+        _oper.setSoapAction("");
+        _myOperationsList.add(_oper);
+        if (_myOperations.get("addUserToSubgroupLessons") == null) {
+            _myOperations.put("addUserToSubgroupLessons", new java.util.ArrayList());
+        }
+        ((java.util.List)_myOperations.get("addUserToSubgroupLessons")).add(_oper);
+    }
 
     public RegisterServiceSoapBindingSkeleton() {
         this.impl = new org.lamsfoundation.lams.webservice.RegisterServiceSoapBindingImpl();
@@ -55,10 +155,30 @@
     public RegisterServiceSoapBindingSkeleton(org.lamsfoundation.lams.webservice.Register impl) {
         this.impl = impl;
     }
-    public boolean createUser(String username, String password, String firstName, String lastName, String email) throws java.rmi.RemoteException
+    
+    public boolean createUser(String username, String password, String firstName, String lastName, String email, String serverId, String datetime, String hash) throws java.rmi.RemoteException
     {
-        boolean ret = impl.createUser(username, password, firstName, lastName, email);
+        boolean ret = impl.createUser(username, password, firstName, lastName, email, serverId, datetime, hash);
         return ret;
     }
+    
+    public boolean addUserToGroup(String username, String serverId, String datetime, String hash, Boolean isTeacher) throws java.rmi.RemoteException {
+		boolean ret = impl.addUserToGroup(username, serverId, datetime, hash, isTeacher);
+		return ret;
+	}
+	
+	public boolean addUserToGroupLessons(String username, String serverId, String datetime, String hash) throws java.rmi.RemoteException {
+		boolean ret = impl.addUserToGroupLessons(username, serverId, datetime, hash);
+		return ret;
+	}
 
+	public boolean addUserToSubgroup(String username, String orgId, String serverId, String datetime, String hash, Boolean isTeacher) throws java.rmi.RemoteException {
+		boolean ret = impl.addUserToSubgroup(username, orgId, serverId, datetime, hash, isTeacher);
+		return ret;
+	}
+	
+	public boolean addUserToSubgroupLessons(String username, String orgId, String serverId, String datetime, String hash) throws java.rmi.RemoteException {
+		boolean ret = impl.addUserToSubgroupLessons(username, orgId, serverId, datetime, hash);
+		return ret;
+	}
 }
Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java,v
diff -u -r1.42 -r1.42.2.1
--- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	29 Nov 2006 03:59:17 -0000	1.42
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	12 Mar 2007 01:29:25 -0000	1.42.2.1
@@ -78,11 +78,8 @@
  */
 public class WorkspaceManagementService implements IWorkspaceManagementService{
 	
-	protected Logger log = Logger.getLogger(WorkspaceManagementService.class.getName());
-
-	private FlashMessage flashMessage;
+	protected Logger log = Logger.getLogger(WorkspaceManagementService.class.getName());	
 	
-	
 	public static final Integer AUTHORING = new Integer(1);
 	public static final Integer MONITORING = new Integer(2);
 	
@@ -133,7 +130,6 @@
 		this.userMgmtService = userMgmtService;
 	}
 	
-	
 	/**
 	 * (non-Javadoc)
 	 * @see org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService#deleteResource(java.lang.Integer, java.lang.String, java.lang.Integer)
@@ -182,6 +178,8 @@
 	 * @throws IOException
 	 */
 	public String deleteFolder(Integer folderID, Integer userID)throws IOException{		
+	    FlashMessage flashMessage = null;
+	    
 		WorkspaceFolder workspaceFolder = (WorkspaceFolder)baseDAO.find(WorkspaceFolder.class,folderID);
 		User user = (User)userMgmtService.findById(User.class,userID);
 		if(user!=null){
@@ -212,6 +210,7 @@
 	 */
 	private FlashMessage deleteFolderContents(WorkspaceFolder folder, Integer userID) throws IOException
 	{
+	    FlashMessage flashMessage = null;
 		boolean isDeleteSuccessful = true;
 		
 		Integer folderID = folder.getWorkspaceFolderId();
@@ -474,6 +473,7 @@
 	 * @throws IOException
 	 */
 	public String copyFolder(Integer folderID,Integer targetFolderID,Integer userID)throws IOException{
+	    FlashMessage flashMessage = null;
 		try{
 			if(isUserAuthorized(targetFolderID,userID)){
 				WorkspaceFolder workspaceFolder = (WorkspaceFolder)baseDAO.find(WorkspaceFolder.class,folderID);
@@ -614,6 +614,7 @@
 	 * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#createFolder(java.lang.Integer, java.lang.String, java.lang.Integer)
 	 */
 	public String createFolderForFlash(Integer parentFolderID, String name, Integer userID)throws IOException{		
+	    FlashMessage flashMessage = null;
 		try{
 			WorkspaceFolder newFolder = createFolder(parentFolderID,name,userID);
 			Hashtable<String,Object> table = new Hashtable<String,Object>();
@@ -675,6 +676,7 @@
 	 * @throws IOException
 	 */
 	public String deleteLearningDesign(Long learningDesignID, Integer userID)throws IOException{
+	    FlashMessage flashMessage = null;
 		User user = (User)baseDAO.find(User.class,userID);
 		if(user!=null){
 			LearningDesign learningDesign = learningDesignDAO.getLearningDesignById(learningDesignID);
@@ -743,6 +745,7 @@
 	 * @see org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService#moveFolder(java.lang.Integer, java.lang.Integer, java.lang.Integer)
 	 */
 	public String moveFolder(Integer currentFolderID,Integer targetFolderID,Integer userID)throws IOException{
+	    FlashMessage flashMessage = null;
 		try{
 			if(isUserAuthorized(targetFolderID,userID)){
 				WorkspaceFolder currentFolder = (WorkspaceFolder)baseDAO.find(WorkspaceFolder.class,currentFolderID);
@@ -819,7 +822,9 @@
 	 * @see org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService#createWorkspaceFolderContent(java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String)
 	 */
 	public String createWorkspaceFolderContent(Integer contentTypeID,String name,String description,Integer workspaceFolderID, String mimeType, String path) throws Exception{
-		// TODO add some validation so that a non-unique name doesn't result in an index violation 
+	    FlashMessage flashMessage = null;
+
+	    // TODO add some validation so that a non-unique name doesn't result in an index violation 
 		// bit hard for the user to understand.
 		
 		WorkspaceFolder workspaceFolder = (WorkspaceFolder)baseDAO.find(WorkspaceFolder.class,workspaceFolderID);
@@ -899,6 +904,7 @@
 	 * @see org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService#updateWorkspaceFolderContent(java.lang.Long, java.io.InputStream)
 	 */
 	public String updateWorkspaceFolderContent(Long folderContentID,String path)throws Exception{
+	    FlashMessage flashMessage = null;
 		InputStream stream = new FileInputStream(path);
 		WorkspaceFolderContent workspaceFolderContent = (WorkspaceFolderContent)baseDAO.find(WorkspaceFolderContent.class,folderContentID);
 		if(workspaceFolderContent!=null){
@@ -959,6 +965,7 @@
 	 * @see org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService#deleteContentWithVersion(java.lang.Long, java.lang.Long, java.lang.Long)
 	 */
 	public String deleteContentWithVersion(Long uuid, Long versionToBeDeleted,Long folderContentID)throws Exception{
+	    FlashMessage flashMessage = null;
 		WorkspaceFolderContent workspaceFolderContent = (WorkspaceFolderContent)baseDAO.find(WorkspaceFolderContent.class,folderContentID);
 		if (workspaceFolderContent != null)
 		{
@@ -1026,6 +1033,7 @@
 	 * @throws Exception
 	 */
 	public String deleteWorkspaceFolderContent(Long folderContentID) throws IOException {
+	    FlashMessage flashMessage = null;
 		WorkspaceFolderContent workspaceFolderContent = (WorkspaceFolderContent)baseDAO.find(WorkspaceFolderContent.class,folderContentID);
 		if(workspaceFolderContent!=null){
 			baseDAO.delete(workspaceFolderContent);
@@ -1214,6 +1222,7 @@
 	public String moveLearningDesign(Long learningDesignID,
 									 Integer targetWorkspaceFolderID,
 									 Integer userID) throws IOException {
+	    FlashMessage flashMessage = null;
 		try{
 			if(isUserAuthorized(targetWorkspaceFolderID,userID)){
 				LearningDesign learningDesign = learningDesignDAO.getLearningDesignById(learningDesignID);
@@ -1275,25 +1284,27 @@
 	 * @throws IOException
 	 */
 	public String renameWorkspaceFolder(Integer workspaceFolderID,String newName,Integer userID)throws IOException{
+		FlashMessage flashMessage = null;
 		try{
 			WorkspaceFolder folder = (WorkspaceFolder)baseDAO.find(WorkspaceFolder.class,workspaceFolderID);
 			if(folder!=null){
 				WorkspaceFolder parent = folder.getParentWorkspaceFolder();
-				if(parent!=null){
-					if(isUserAuthorized(workspaceFolderID,userID)){
-						if(!ifNameExists(parent,newName)){
-							folder.setName(newName);
-							baseDAO.update(folder);
-							flashMessage = new FlashMessage(MSG_KEY_RENAME,newName);
-						}else
-							flashMessage = new FlashMessage(MSG_KEY_RENAME,
-												messageService.getMessage("folder.already.exist",new Object[]{newName}),
-															FlashMessage.ERROR);
-					}else
-						flashMessage = FlashMessage.getUserNotAuthorized(MSG_KEY_RENAME,userID);
+				if(parent!=null && isUserAuthorized(workspaceFolderID,userID)){
+					if(!ifNameExists(parent,newName)){
+						folder.setName(newName);
+						baseDAO.update(folder);
+						flashMessage = new FlashMessage(MSG_KEY_RENAME,newName);
+					} else {
+						flashMessage = new FlashMessage(MSG_KEY_RENAME,
+											messageService.getMessage("folder.already.exist",new Object[]{newName}),
+														FlashMessage.ERROR);
+					}
+				} else {
+					flashMessage = FlashMessage.getUserNotAuthorized(MSG_KEY_RENAME,userID);
 				}
-			}else
+			}else {
 				flashMessage = FlashMessage.getNoSuchWorkspaceFolderExsists(MSG_KEY_RENAME,workspaceFolderID);
+			}
 		}catch(UserException ue){
 			flashMessage = FlashMessage.getNoSuchUserExists(MSG_KEY_RENAME, userID);
 		}catch(WorkspaceFolderException we){
@@ -1314,6 +1325,7 @@
 	 * @throws IOException
 	 */
 	public String renameLearningDesign(Long learningDesignID, String title,Integer userID)throws IOException {
+	    FlashMessage flashMessage = null;
 		LearningDesign design = learningDesignDAO.getLearningDesignById(learningDesignID);	
 		Integer folderID = null;
 		try{
@@ -1339,6 +1351,7 @@
 	 * @see org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService#getWorkspace(java.lang.Integer)
 	 */
 	public String getWorkspace(Integer userID) throws IOException {
+	    FlashMessage flashMessage = null;
 		User user = (User)baseDAO.find(User.class,userID);
 		if (user != null) {
 			Workspace workspace = user.getWorkspace();
@@ -1353,6 +1366,7 @@
 	 */
 	public String getOrganisationsByUserRole(Integer userID, List<String> roleNames, Integer courseId, List<Integer> restrictToClassIds) throws IOException
 	{
+	    FlashMessage flashMessage = null;
 		User user = (User)baseDAO.find(User.class,userID);
 		
 		if (user!=null) {
@@ -1376,6 +1390,7 @@
 	 */
 	public String getUserOrganisation(Integer userID, Integer organisationId) throws IOException
 	{
+	    FlashMessage flashMessage = null;
 		User user = (User)baseDAO.find(User.class,userID);
 		
 		if (user!=null) {
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.32 -r1.32.2.1
--- lams_central/web/WEB-INF/lams.tld	16 Nov 2006 05:10:02 -0000	1.32
+++ lams_central/web/WEB-INF/lams.tld	12 Mar 2007 01:30:05 -0000	1.32.2.1
@@ -430,5 +430,39 @@
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>ImgButtonWrapper</name>
+		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
+   	</tag-file>  
+   	<tag>
+    <name>textarea</name>
+    <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
+    <body-content>JSP</body-content>
+    <dynamic-attributes>true</dynamic-attributes>
+    <description>
+    	Render text exactly same as  original input, which even won't escape the input HTML tag.
+    </description>    
+    <attribute>
+        <description>
+        </description>
+        <name>name</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+        </description>
+        <name>id</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+        </description>
+        <name>onchange</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
 
 </taglib>
Index: lams_central/web/WEB-INF/server-config.wsdd
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/server-config.wsdd,v
diff -u -r1.3 -r1.3.2.1
--- lams_central/web/WEB-INF/server-config.wsdd	6 Oct 2006 02:50:58 -0000	1.3
+++ lams_central/web/WEB-INF/server-config.wsdd	12 Mar 2007 01:30:05 -0000	1.3.2.1
@@ -66,7 +66,7 @@
 		<parameter name="allowedMethods" value="*" />
 	</service>
 
-	<service name="RegisterService" provider="java:RPC" style="rpc"
+	<!-- <service name="RegisterService" provider="java:RPC" style="rpc"
 		use="encoded">
 		<parameter name="wsdlTargetNamespace"
 			value="http://webservice.lams.lamsfoundation.org" />
@@ -77,7 +77,7 @@
 		<parameter name="wsdlPortType" value="Register" />
 		<parameter name="typeMappingVersion" value="1.2" />
 		<parameter name="allowedMethods" value="*" />
-	</service>
+	</service> -->
 
 	<service name="VerificationService" provider="java:RPC" style="rpc"
 		use="encoded">
Index: lams_central/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/web.xml,v
diff -u -r1.29 -r1.29.2.1
--- lams_central/web/WEB-INF/web.xml	28 Sep 2006 23:27:37 -0000	1.29
+++ lams_central/web/WEB-INF/web.xml	12 Mar 2007 01:30:05 -0000	1.29.2.1
@@ -467,9 +467,10 @@
     		<role-name>LEARNER</role-name>
     		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
-    	    <role-name>COURSE MANAGER</role-name>
-    		<role-name>COURSE ADMIN</role-name>
+    	    <role-name>GROUP MANAGER</role-name>
+    		<role-name>GROUP ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -480,6 +481,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
@@ -501,9 +503,10 @@
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
     		<role-name>MONITOR</role-name>
-    	    <role-name>COURSE MANAGER</role-name>
-    		<role-name>COURSE ADMIN</role-name>
+    	    <role-name>GROUP MANAGER</role-name>
+    		<role-name>GROUP ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -535,15 +538,19 @@
 	</security-role>
 
     <security-role>
-		<role-name>COURSE MANAGER</role-name>
+		<role-name>GROUP MANAGER</role-name>
 	</security-role>
    	<security-role>
-		<role-name>COURSE ADMIN</role-name>
+		<role-name>GROUP ADMIN</role-name>
 	</security-role>
 
 	<security-role>
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</role-name>
 	</security-role>
 
+	<security-role>
+		<role-name>AUTHOR ADMIN</role-name>
+	</security-role>
+
 </web-app>
Index: lams_central/web/css/defaultHTML_rtl.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML_rtl.css,v
diff -u -r1.12 -r1.12.2.1
--- lams_central/web/css/defaultHTML_rtl.css	4 Dec 2006 08:11:41 -0000	1.12
+++ lams_central/web/css/defaultHTML_rtl.css	12 Mar 2007 01:30:06 -0000	1.12.2.1
@@ -272,8 +272,7 @@
 	background: url('../images/css/body_bg.jpg') repeat-y top right;
 	padding: 0px 15px 40px 15px;
 	font-size: 11px;
-	margin-top: -5px
-	
+	margin-top: -5px;
 }
 
 /*layout of Links within the content area */
@@ -381,17 +380,26 @@
 	padding:3px 25px 5px 15px;
 	font-size:11px;
 	display: table-cell;
+	
 }
 
+#button-table {
+	display: table;	
+	border-spacing: 10px 0px;
+}
 
+#button-row {
+	display: table-row-group;
+}
+
 /*layout of adding a topic button */
 #content a.button-add-item {
 	background: url('../images/css/btn_add_off_rtl.gif') no-repeat top right;
 	color: #333;
 	border: 0px none;
 	padding:3px 25px 5px 15px;
 	font-size:11px;
-	display: table;
+	display: table-cell;
 	}
 
 #content a:hover.button-add-item {
@@ -402,7 +410,7 @@
 	padding-left: 15px;
 	padding-right: 25px;
 	font-size:11px;
-	display: table;
+	display: table-cell;
 }
 
 /************ The sequence name box **********/
@@ -435,7 +443,7 @@
 	color:#FF6666;
 	text-decoration: none;
 	border-bottom: 1px dotted #FF6666;
-	}
+}
 	
 	
 #content a:hover.disabled-sequence-name-link {
Index: lams_central/web/css/ie-styles_rtl.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/ie-styles_rtl.css,v
diff -u -r1.6 -r1.6.2.1
--- lams_central/web/css/ie-styles_rtl.css	30 Nov 2006 05:20:07 -0000	1.6
+++ lams_central/web/css/ie-styles_rtl.css	12 Mar 2007 01:30:06 -0000	1.6.2.1
@@ -102,16 +102,17 @@
 	border: 0px none;
 	padding:5px 15px 6px 30px;
 	font-size:11px;
-	}
+	margin: 5px;
+}
 
 a:hover.button-add-item {
 	background: url('../images/css/btn_add_over_rtl.gif')no-repeat right top;
 	color: #349018;
 	border: 0px none;
 	padding:5px 15px 6px 30px;
 	font-size:11px;
-
-	}
+	margin: 5px;
+}
 	
 /*layout of a general button*/
 a.button {
@@ -120,8 +121,7 @@
 	border: 0px none;
 	padding:5px 15px 6px 15px;
 	font-size:11px;
-	display:table;
-	
+	margin: 5px;
 }
 
 a:hover.button {
@@ -130,13 +130,20 @@
 	border: 0px none;
 	padding:5px 15px 6px 15px;
 	font-size:11px;
-	display:table;
+	margin: 5px;
 }	
-	
-	
+
+#button-table {
+	display: block;
+}
+
+#button-row {
+	display: block;
+}
+
 #content {
 	padding-bottom:0px
-	}
+}
 	
 .right-buttons {float:left; padding-top:5px; padding-bottom:5px; margin-bottom:20px;}
 
Index: lams_central/web/css/ie7-styles_rtl.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/ie7-styles_rtl.css,v
diff -u -r1.2 -r1.2.2.1
--- lams_central/web/css/ie7-styles_rtl.css	4 Dec 2006 08:27:24 -0000	1.2
+++ lams_central/web/css/ie7-styles_rtl.css	12 Mar 2007 01:30:06 -0000	1.2.2.1
@@ -14,4 +14,4 @@
 	margin-top: 0px;
 	float: left;
 	text-align: center;
-}
\ No newline at end of file
+}
Index: lams_central/web/errorpages/403.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/errorpages/403.jsp,v
diff -u -r1.4 -r1.4.2.1
--- lams_central/web/errorpages/403.jsp	16 Nov 2006 04:24:20 -0000	1.4
+++ lams_central/web/errorpages/403.jsp	12 Mar 2007 01:30:05 -0000	1.4.2.1
@@ -25,11 +25,11 @@
 				<fmt:message key="403.title" />
 			</h1>
 
-
+<!-- 
 			<p class="space-bottom">
 				<fmt:message key="403.message" />
 			</p>
-
+ -->
 		</div>
 		<!--closes content-->
 
Index: lams_central/web/includes/javascript/common.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/common.js,v
diff -u -r1.3 -r1.3.2.1
--- lams_central/web/includes/javascript/common.js	1 Oct 2006 22:30:02 -0000	1.3
+++ lams_central/web/includes/javascript/common.js	12 Mar 2007 01:30:06 -0000	1.3.2.1
@@ -45,4 +45,32 @@
 				target.value=srcV.replace(/\n/g,"<BR>");
 			
 		}
+	}
+	function trimAll( strValue ) {
+		 var replaceExpr = /^(\s*)$/;
+
+	    //check for all spaces
+	    if(replaceExpr.test(strValue)) {
+	       strValue = strValue.replace(replaceExpr, '');
+	       if( strValue.length == 0)
+	          return strValue;
+	    }
+	
+	   //check for leading & trailing spaces
+	   replaceExpr = /^(\s*)([\W\w]*)(\b\s*$)/;
+	   if(replaceExpr.test(strValue)) {
+	       //remove leading and trailing whitespace characters
+	       strValue = strValue.replace(replaceExpr, '$2');
+	    }
+	  return strValue;
+	}
+	
+	function isEmpty( strValue ) {
+	
+	   var strTemp = strValue;
+	   strTemp = trimAll(strTemp);
+	   if(strTemp.length > 0){
+	     return false;
+	   }
+	   return true;
 	}
\ No newline at end of file
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/Attic/CSSThemeVisualElement.hbm.xml,v
diff -u -r1.5 -r1.5.2.1
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml	23 Mar 2006 23:53:42 -0000	1.5
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml	12 Mar 2007 01:30:27 -0000	1.5.2.1
@@ -81,7 +81,19 @@
             not-null="true"
         </meta>    
     </property>
-
+   <property
+        name="imageDirectory"
+        type="java.lang.String"
+        column="image_directory"
+        length="100"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="image_directory"
+            length="100"
+        </meta>    
+    </property>
     <!-- Associations -->
   
     
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml,v
diff -u -r1.3 -r1.3.2.1
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml	4 Sep 2006 02:13:06 -0000	1.3
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml	12 Mar 2007 01:30:28 -0000	1.3.2.1
@@ -15,7 +15,7 @@
         <id
             name="localeId"
             column="locale_id"
-            type="java.lang.Byte"
+            type="java.lang.Integer"
         >
             <generator class="native">
               <!--  
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml,v
diff -u -r1.20 -r1.20.2.1
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	23 Sep 2006 12:05:46 -0000	1.20
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	12 Mar 2007 01:30:27 -0000	1.20.2.1
@@ -46,14 +46,14 @@
         column="login"
         not-null="true"
         unique="true"
-        length="20"
+        length="255"
     >
         <meta attribute="use-in-equals">true</meta>
         <meta attribute="field-description">
            @hibernate.property
             column="login"
             unique="true"
-            length="20"
+            length="255"
             not-null="true"
         </meta>    
     </property>
@@ -87,12 +87,12 @@
         name="firstName"
         type="java.lang.String"
         column="first_name"
-        length="64"
+        length="128"
     >
         <meta attribute="field-description">
            @hibernate.property
             column="first_name"
-            length="64"
+            length="128"
         </meta>    
     </property>
     <property
@@ -473,5 +473,18 @@
             length="20"
         </meta>    
     </property>
+    
+    <property
+        name="changePassword"
+        type="java.lang.Boolean"
+        column="change_password"
+        length="1"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="change_password"
+            length="1"
+        </meta>    
+    </property>
 </class>
-</hibernate-mapping>
+</hibernate-mapping>
\ No newline at end of file
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Attic/Workspace.hbm.xml,v
diff -u -r1.11 -r1.11.2.1
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml	8 Aug 2006 02:20:00 -0000	1.11
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml	12 Mar 2007 01:30:28 -0000	1.11.2.1
@@ -38,8 +38,8 @@
         <generator class="native" />
     </id>
     
-    <property name="name" type="java.lang.String" column="name" length="65535">
-        <meta attribute="field-description">@hibernate.property column="name" length="65535" </meta>    
+    <property name="name" type="java.lang.String" column="name" length="255">
+        <meta attribute="field-description">@hibernate.property column="name" length="255" </meta>    
     </property>
 
 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml,v
diff -u -r1.11 -r1.11.2.1
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	23 Sep 2006 12:05:46 -0000	1.11
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	12 Mar 2007 01:30:28 -0000	1.11.2.1
@@ -42,12 +42,12 @@
         type="java.lang.String"
         column="name"
         not-null="true"
-        length="64"
+        length="255"
     >
         <meta attribute="field-description">
            @hibernate.property
             column="name"
-            length="64"
+            length="255"
             not-null="true"
         </meta>    
     </property>
Fisheye: Tag 1.18.2.1 refers to a dead (removed) revision in file `lams_common/conf/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_common/conf/language/ApplicationResources_ar_JO.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `lams_common/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_common/conf/language/ApplicationResources_de_DE.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_common/conf/language/ApplicationResources_el_GR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `lams_common/conf/language/ApplicationResources_es_ES.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_common/conf/language/ApplicationResources_fr_FR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/conf/language/ApplicationResources_it_IT.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `lams_common/conf/language/ApplicationResources_ko_KR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/conf/language/ApplicationResources_mi_NZ.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/language/Attic/ApplicationResources_mi_NZ.properties,v
diff -u -r1.1 -r1.1.2.1
--- lams_common/conf/language/ApplicationResources_mi_NZ.properties	17 Nov 2006 19:31:30 -0000	1.1
+++ lams_common/conf/language/ApplicationResources_mi_NZ.properties	12 Mar 2007 01:31:53 -0000	1.1.2.1
@@ -2,7 +2,7 @@
 #language code: mi 
 #locale code: NZ 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Nov 17 19:28:48 GMT 2006 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Sat Jan 27 20:16:34 GMT 2007 
  
 #=================== labels for LAMS Common =================# 
 
@@ -28,13 +28,14 @@
 audit.change.entry  =I hurihia ng\u0101 tuhinga a {0}. Tuhinga tawhito: {1} Tuhinga H\u014du: {2}
 audit.hide.entry  =Hunaia te t\u0101urunga a {0}. Ko te {1} te t\u0101urunga
 audit.show.entry  =Whakaaturia te t\u0101urunga a {0}. Ko te {1} te t\u0101urunga
+group.name.prefix  =R\u014dp\u016b
 imported.permission.gate.title  =Tomokanga Whakaae
 imported.synchronise.gate.title  =Tukutahi Tomokanga
-group.name.prefix  =R\u014dp\u016b
+error.import.validation  =He hapa whakamanatanga
 error.import.matching.tool.not.found  =I waiho te ngohe me te tohu {0} na te mea k\u0101ore i te rapu te taputapu
 error.import.tool.service.fail  =Kaore e taea te kawe mai ng\u0101 ihirangi taputapu m\u014d te taputapu {0}. Ko te p\u016btake ko {1}
 error.no.valid.tool  =K\u0101ore he taputapu whai mana ki t\u0113nei hoahoa akoranga.
-error.import.validation  =He hapa whakamanatanga
+import.shareresources.warning  =K\u014dtahi te ngohe Tiritiri Rauemi neke atu r\u0101nei i te raupapa ako. \u0100ta tirohia \u0113nei ngohe, ka noho muhu t\u0113tahi k\u014dnae, \u0113tehi paetuku e t\u012bkina ana k\u0101re e whaimana ana i roto i t\u0113nei ngohe, \u0101, ka whakaputa hapa m\u0101 ng\u0101 \u0101konga. Ko te tikanga, k\u0101ore ng\u0101 hononga ki ng\u0101 paetuku o waho e whakaputa hapa.
 
 
-#======= End labels: Exported 29 labels for mi NZ =====
+#======= End labels: Exported 30 labels for mi NZ =====
Fisheye: Tag 1.9.2.1 refers to a dead (removed) revision in file `lams_common/conf/language/ApplicationResources_no_NO.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_common/conf/language/ApplicationResources_pl_PL.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/conf/language/ApplicationResources_pt_BR.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/language/Attic/ApplicationResources_pt_BR.properties,v
diff -u -r1.2 -r1.2.2.1
--- lams_common/conf/language/ApplicationResources_pt_BR.properties	24 Nov 2006 20:07:36 -0000	1.2
+++ lams_common/conf/language/ApplicationResources_pt_BR.properties	12 Mar 2007 01:31:53 -0000	1.2.2.1
@@ -2,7 +2,7 @@
 #language code: pt 
 #locale code: BR 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Nov 24 20:05:08 GMT 2006 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Sat Jan 27 20:16:30 GMT 2007 
  
 #=================== labels for LAMS Common =================# 
 
@@ -11,30 +11,31 @@
 validation.error.transitionNoActivityBeforeOrAfter  =Uma Transi\u00e7\u00e3o deve ter uma atividade antes e depois da transi\u00e7\u00e3o
 validation.error.activityWithNoTransition  =Uma atividade deve ter uma transi\u00e7\u00e3o de entrada e sa\u00edda
 validation.error.inputTransitionType1  =Existe mais de uma atividade com nenhuma trasi\u00e7\u00e3o de entrada
+validation.error.inputTransitionType2  =Nenhuma atividade est\u00e1 faltando em suas transi\u00e7\u00f5es de entrada.
 validation.error.outputTransitionType1  =Existe mais de uma atividade com nenhuma trasi\u00e7\u00e3o de sa\u00edda
+validation.error.outputTransitionType2  =Nenhuma atividade est\u00e1 faltando em suas transi\u00e7\u00f5es de sa\u00edda.
 validation.error.GroupingRequired  =Agrupamento \u00e9 necess\u00e1rio
 validation.error.GroupingNotRequired  =Agrupamente n\u00e3o \u00e9 permitido
 validation.error.GroupingSelected  =O Agrupamento est\u00e1 selecionado, mas ele n\u00e3o existe
 validation.error.OptionalActivity  =Uma Atividade Opcional de ter uma ou mais atividades
 validation.error.OptionalActivityOrderId  =Esta Atividade Opcional tem ordem de ids inv\u00e1lida
+validation.error.illegalScheduleGateOffsetsType1  =Uma Ponte de Agenda n\u00e3o pode ter intevalos de tempo inicial e final iguais.
+validation.error.illegalScheduleGateOffsetsType2  =Uma Ponte de Agenda n\u00e3o pode ter o intevalo de tempo final maior que o intervalo de tempo incial
 theme.service.setTheme.saved  =Tema do usu\u00e1rio salvo.
 theme.service.setTheme.type.invalid  =Tipo de tema inv\u00e1lido.
 theme.service.setTheme.noSuchTheme  =Nenhumdos temas existe.
 theme.service.setTheme.noSuchUser  =Nenhum dos usu\u00e1rios existe.
 audit.change.entry  =Texto trocado para o usu\u00e1rio {0}. Texto antigo: {1}. Texto novo: {2}
 audit.hide.entry  =Esconde a entrada para o usu\u00e1rio {0}. Entrada foi {1}
 audit.show.entry  =Mostra entrada para o usu\u00e1rio {0}. Entrada foi {1}
+group.name.prefix  =Grupo
 imported.permission.gate.title  =Permiss\u00e3o de Ponte
 imported.synchronise.gate.title  =Ponte Sincronizada
-group.name.prefix  =Grupo
-validation.error.inputTransitionType2  =Nenhuma atividade est\u00e1 faltando em suas transi\u00e7\u00f5es de entrada.
-validation.error.outputTransitionType2  =Nenhuma atividade est\u00e1 faltando em suas transi\u00e7\u00f5es de sa\u00edda.
-validation.error.illegalScheduleGateOffsetsType1  =Uma Ponte de Agenda n\u00e3o pode ter intevalos de tempo inicial e final iguais.
-validation.error.illegalScheduleGateOffsetsType2  =Uma Ponte de Agenda n\u00e3o pode ter o intevalo de tempo final maior que o intervalo de tempo incial
+error.import.validation  =Erro de valida\u00e7\u00e3o:
 error.import.matching.tool.not.found  =A atividade com a assinatura {0} foi rejeitada porque uma ferramenta compat\u00edvel n\u00e3o pode ser encontrada.
 error.import.tool.service.fail  =N\u00e3o foi poss\u00edvel importar o conte\u00fado de ferramenta para a ferramenta {0}. Erro causado por {1}.
 error.no.valid.tool  =Nenhuma atividade v\u00e1lida nesse learning design.
-error.import.validation  =Erro de valida\u00e7\u00e3o:
+import.shareresources.warning  =A seq\u00fc\u00eancia cont\u00e9m uma ou mais atividades compartilhadas. Controle estas atividades como um arquivo ou os websites carregados nas atividades ser\u00e3o inv\u00e1lidos e causar\u00e3o erros aos alunos. Links para websites externos n\u00e3o dever\u00e3o causar erros.
 
 
-#======= End labels: Exported 29 labels for pt BR =====
+#======= End labels: Exported 30 labels for pt BR =====
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_common/conf/language/ApplicationResources_sv_SE.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_common/conf/language/ApplicationResources_vi_VN.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/db/model/lams_11.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/model/lams_11.clay,v
diff -u -r1.70 -r1.70.2.1
--- lams_common/db/model/lams_11.clay	29 Nov 2006 06:35:18 -0000	1.70
+++ lams_common/db/model/lams_11.clay	12 Mar 2007 01:31:53 -0000	1.70.2.1
@@ -1651,17 +1651,17 @@
 <variant type-name-pattern="TINYINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="4" decimal-digits="0" default-value="" mandatory="false" name="locale_id" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="locale_id" remarks="">
 <column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
+<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
+<variant type-name-pattern="INTEGER"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
+<variant type-name-pattern="INTEGER UNSIGNED"/>
+<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="INTEGER ZEROFILL"/>
 </data-type>
 </column>
 <column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="archived_date" remarks="">
@@ -1856,7 +1856,7 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="login" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="login" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
@@ -2053,17 +2053,17 @@
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="4" decimal-digits="0" default-value="" mandatory="false" name="locale_id" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="locale_id" remarks="">
 <column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
+<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
+<variant type-name-pattern="INTEGER"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
+<variant type-name-pattern="INTEGER UNSIGNED"/>
+<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="INTEGER ZEROFILL"/>
 </data-type>
 </column>
 <column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="portrait_uuid" remarks="">
@@ -2079,6 +2079,19 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="false" name="change_password" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT">
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
 </column-list>
 <primary-key alias="" name="PRIMARY" remarks="">
 <primary-key-description></primary-key-description>
@@ -2417,7 +2430,7 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="name" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="name" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
@@ -3078,6 +3091,26 @@
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="modified_date_time" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="classpath_addition" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="context_file" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
 </column-list>
 <primary-key alias="" name="PK_LAMS_TOOL" remarks="">
 <primary-key-description></primary-key-description>
@@ -4634,6 +4667,13 @@
 <variant type-name-pattern="TINYINT ZEROFILL"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="100" decimal-digits="0" default-value="" mandatory="false" name="image_directory" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
 </column-list>
 <primary-key alias="" name="PK_LAMS_CSS_THEME_VE" remarks="">
 <primary-key-description></primary-key-description>
@@ -5116,17 +5156,17 @@
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="1152" y="228"/>
 <column-list>
-<column alias="" auto-increment="true" column-size="4" decimal-digits="0" default-value="" mandatory="true" name="locale_id" remarks="">
+<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="locale_id" remarks="">
 <column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
+<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
+<variant type-name-pattern="INTEGER"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
+<variant type-name-pattern="INTEGER UNSIGNED"/>
+<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="INTEGER ZEROFILL"/>
 </data-type>
 </column>
 <column alias="" auto-increment="false" column-size="2" decimal-digits="0" default-value="" mandatory="true" name="language_iso_code" remarks="ISO 639-1 Language Code (2 letter version) Java only supports 2 letter properly, not the 3 letter codes.">
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v
diff -u -r1.86 -r1.86.2.1
--- lams_common/db/sql/create_lams_11_tables.sql	29 Nov 2006 06:35:18 -0000	1.86
+++ lams_common/db/sql/create_lams_11_tables.sql	12 Mar 2007 01:31:53 -0000	1.86.2.1
@@ -138,7 +138,7 @@
 )TYPE=InnoDB;
 
 CREATE TABLE lams_supported_locale (
-       locale_id TINYINT(4) NOT NULL AUTO_INCREMENT
+       locale_id INTEGER NOT NULL AUTO_INCREMENT
      , language_iso_code VARCHAR(2) NOT NULL
      , country_iso_code VARCHAR(2)
      , description VARCHAR(255) NOT NULL
@@ -171,7 +171,7 @@
 CREATE TABLE lams_workspace_folder (
        workspace_folder_id BIGINT(20) NOT NULL AUTO_INCREMENT
      , parent_folder_id BIGINT(20)
-     , name VARCHAR(64) NOT NULL
+     , name VARCHAR(255) NOT NULL
      , user_id BIGINT(20) NOT NULL
      , create_date_time DATETIME NOT NULL
      , last_modified_date_time DATETIME
@@ -227,7 +227,7 @@
      , admin_browse_all_users TINYINT(1) NOT NULL DEFAULT 0
      , admin_change_status TINYINT(1) NOT NULL DEFAULT 0
      , admin_create_guest TINYINT(1) NOT NULL DEFAULT 0
-     , locale_id TINYINT(4)
+     , locale_id INTEGER
      , archived_date DATETIME
      , PRIMARY KEY (organisation_id)
      , INDEX (organisation_type_id)
@@ -250,6 +250,7 @@
      , description VARCHAR(100)
      , parent_id BIGINT(20)
      , theme_flag TINYINT(1) NOT NULL DEFAULT 0
+     , image_directory VARCHAR(100)
      , PRIMARY KEY (theme_ve_id)
      , INDEX (parent_id)
      , CONSTRAINT FK_lams_css_theme_ve_2 FOREIGN KEY (parent_id)
@@ -282,7 +283,7 @@
 
 CREATE TABLE lams_user (
        user_id BIGINT(20) NOT NULL AUTO_INCREMENT
-     , login VARCHAR(20) NOT NULL
+     , login VARCHAR(255) NOT NULL
      , password VARCHAR(50) NOT NULL
      , title VARCHAR(32)
      , first_name VARCHAR(128)
@@ -306,8 +307,9 @@
      , flash_theme_id BIGINT(20)
      , html_theme_id BIGINT(20)
      , chat_id VARCHAR(255)
-     , locale_id TINYINT(4)
+     , locale_id INTEGER
      , portrait_uuid BIGINT(20)
+     , change_password TINYINT DEFAULT 0
      , PRIMARY KEY (user_id)
      , INDEX (authentication_method_id)
      , CONSTRAINT FK_lams_user_1 FOREIGN KEY (authentication_method_id)
@@ -447,6 +449,9 @@
      , help_url TEXT
      , create_date_time DATETIME NOT NULL
      , language_file VARCHAR(255)
+     , modified_date_time DATETIME
+     , classpath_addition VARCHAR(255)
+     , context_file VARCHAR(255)
      , UNIQUE UQ_lams_tool_sig (tool_signature)
      , UNIQUE UQ_lams_tool_class_name (service_name)
      , PRIMARY KEY (tool_id)
Index: lams_common/db/sql/insert_types_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_types_data.sql,v
diff -u -r1.62 -r1.62.2.1
--- lams_common/db/sql/insert_types_data.sql	1 Dec 2006 03:33:37 -0000	1.62
+++ lams_common/db/sql/insert_types_data.sql	12 Mar 2007 01:31:53 -0000	1.62.2.1
@@ -136,7 +136,7 @@
 	export_pfolio_class_url, monitor_url, contribute_url, create_date_time)
 VALUES (1, 2, 'Grouping', 'All types of grouping including random and chosen.', 
 	'learning/grouping.do?method=performGrouping', 'learning/grouping.do?method=performGrouping', 
-	'learning/grouping.do?method=viewGrouping', 'learning/groupingExportPortfolio?mode=learner', 
+	'learning/grouping.do?method=viewGrouping&mode=teacher', 'learning/groupingExportPortfolio?mode=learner', 
 	'learning/groupingExportPortfolio?mode=teacher', 
 	'monitoring/grouping.do?method=startGrouping', 
 	'monitoring/grouping.do?method=startGrouping', now() );
Index: lams_common/db/sql/insert_unix_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_unix_config_data.sql,v
diff -u -r1.8 -r1.8.2.1
--- lams_common/db/sql/insert_unix_config_data.sql	4 Dec 2006 22:02:47 -0000	1.8
+++ lams_common/db/sql/insert_unix_config_data.sql	12 Mar 2007 01:31:53 -0000	1.8.2.1
@@ -1,5 +1,5 @@
 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 ('Version','2.0');
+insert into lams_configuration (config_key, config_value) values ('Version','2.0.1');
 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');
@@ -14,13 +14,13 @@
 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.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','2.0.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','2.0.1.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.1.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.1.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','2.0.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','2006-12-05');
+insert into lams_configuration (config_key, config_value) values ('DictionaryDateCreated','2007-03-08');
 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');
Index: lams_common/db/sql/insert_users.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_users.sql,v
diff -u -r1.38 -r1.38.2.1
--- lams_common/db/sql/insert_users.sql	1 Nov 2006 03:25:39 -0000	1.38
+++ lams_common/db/sql/insert_users.sql	12 Mar 2007 01:31:53 -0000	1.38.2.1
@@ -7,8 +7,8 @@
 SET FOREIGN_KEY_CHECKS=0;
 
 -- themes and styles 
-INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag) VALUES (1, "default", "Default Flash style", null, 1);
-INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag) VALUES (2, "defaultHTML", "Default HTML style", null, 1);
+INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag, image_directory) VALUES (1, "default", "Default Flash style", null, 1, null);
+INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag, image_directory) VALUES (2, "defaultHTML", "Default HTML style", null, 1, "css");
 
 insert into lams_workspace (workspace_id, name, default_fld_id) values(1,'ROOT',1);
 insert into lams_workspace (workspace_id, name, default_fld_id, def_run_seq_fld_id) values(2,'Developers Playpen',2,22);
@@ -52,7 +52,7 @@
 values(8,null,'Four Test',8,'20041223','20041223',1);
 
 insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(40,1,'Moodle Test',1,'20041223','20041223',1);
+values(40,1,'Moodle Test',1,'20041223','20041223',2);
 
 insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
 values(41,40,'Lesson Sequence Folder',1,'20041223','20041223',2);
@@ -86,7 +86,7 @@
 INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id)
 	VALUES (6, 'Tutorial Group B', 'TUTB', 'Tutorial Group B',4,3,NOW(),1,null,2,1);
 INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, created_by, workspace_id, locale_id, organisation_state_id)
-	VALUES (7, 'Moodle', 'Moodle', 'Moodle Test',1,1,NOW(),1,50,1,1);
+	VALUES (7, 'Moodle', 'Moodle', 'Moodle Test',1,2,NOW(),1,50,1,2);
 
 
 -- users
Index: lams_common/db/sql/insert_windows_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_windows_config_data.sql,v
diff -u -r1.12 -r1.12.2.1
--- lams_common/db/sql/insert_windows_config_data.sql	5 Dec 2006 00:12:01 -0000	1.12
+++ lams_common/db/sql/insert_windows_config_data.sql	12 Mar 2007 01:31:53 -0000	1.12.2.1
@@ -1,8 +1,8 @@
 insert into lams_configuration (config_key, config_value) values ('ServerURL','http://localhost:8080/lams/');
-insert into lams_configuration (config_key, config_value) values ('Version','2.0');
+insert into lams_configuration (config_key, config_value) values ('Version','2.0.1');
 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','D:/jboss-4.0.2/server/default/deploy/lams.ear');
+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','mail.lib.mq.edu.au');
 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');
@@ -14,13 +14,13 @@
 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.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','2.0.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','2.0.1.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.1.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.1.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','2.0.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','2006-12-05');
+insert into lams_configuration (config_key, config_value) values ('DictionaryDateCreated','2007-03-08');
 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');
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/Attic/ApplicationParent.as,v
diff -u -r1.16 -r1.16.2.1
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/Sequence.as
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/Attic/Sequence.as,v
diff -u -r1.19 -r1.19.2.1
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/comms/Communication.as
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/comms/Attic/Communication.as,v
diff -u -r1.30 -r1.30.2.1
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/ui/Attic/LFMenuBar.as,v
diff -u -r1.41 -r1.41.2.1
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFWindow.as
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/ui/Attic/LFWindow.as,v
diff -u -r1.14 -r1.14.2.1
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/util/JsPopup.as
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/util/Attic/JsPopup.as,v
diff -u -r1.7 -r1.7.2.1
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/Workspace.as
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/ws/Attic/Workspace.as,v
diff -u -r1.24 -r1.24.2.1
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/ws/Attic/WorkspaceController.as,v
diff -u -r1.17 -r1.17.2.1
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/ws/Attic/WorkspaceDialog.as,v
diff -u -r1.53.2.1 -r1.53.2.2
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/ws/Attic/WorkspaceModel.as,v
diff -u -r1.18 -r1.18.2.1
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml,v
diff -u -r1.50 -r1.50.2.1
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	1 Nov 2006 05:07:37 -0000	1.50
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	12 Mar 2007 01:30:29 -0000	1.50.2.1
@@ -132,6 +132,7 @@
 		<property name="transactionAttributes">
 			<props>
 				<prop key="validateLearningDesign">PROPAGATION_REQUIRED</prop>
+				<prop key="setValid">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>
Index: lams_common/src/java/org/lamsfoundation/lams/integration/security/LoginRequestValve.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/security/LoginRequestValve.java,v
diff -u -r1.3 -r1.3.2.1
--- lams_common/src/java/org/lamsfoundation/lams/integration/security/LoginRequestValve.java	25 Sep 2006 23:26:02 -0000	1.3
+++ lams_common/src/java/org/lamsfoundation/lams/integration/security/LoginRequestValve.java	12 Mar 2007 01:30:29 -0000	1.3.2.1
@@ -106,8 +106,8 @@
 					log.info("LOGIN REQUEST DETECTED - LOGIN SUCCESSFUL");
 					log.info("character encoding of the request - "
 							+ request.getCharacterEncoding());
-					redirect = URLDecoder.decode(redirect, "US-ASCII");
-					log.info("Redirect URL decoded - " + redirect);
+					//redirect = URLDecoder.decode(redirect, "US-ASCII");
+					log.info("Redirect URL - " + redirect);
 					// create catalina internal session
 					Session session = request.getContext().getManager().findSession(hses.getId());
 					// Create and populate a SavedRequest object for this
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java,v
diff -u -r1.3 -r1.3.2.1
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	12 Oct 2006 06:37:30 -0000	1.3
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	12 Mar 2007 01:30:27 -0000	1.3.2.1
@@ -50,4 +50,6 @@
 	List getAllExtServerOrgMaps();
 	
 	void saveExtServerOrgMap(ExtServerOrgMap map);
+	
+	String hash(ExtServerOrgMap serverMap, String extUsername, String timestamp);
 }
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java,v
diff -u -r1.6 -r1.6.2.1
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	29 Nov 2006 03:58:46 -0000	1.6
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	12 Mar 2007 01:30:27 -0000	1.6.2.1
@@ -111,7 +111,7 @@
 	private void addMemberships(User user, Organisation org){
 		UserOrganisation uo = new UserOrganisation(user,org);
 		service.save(uo);
-		Integer[] roles = new Integer[]{Role.ROLE_AUTHOR, Role.ROLE_MONITOR, Role.ROLE_GROUP_MANAGER, Role.ROLE_LEARNER};
+		Integer[] roles = new Integer[]{Role.ROLE_AUTHOR, Role.ROLE_MONITOR, Role.ROLE_LEARNER};
 		for(Integer roleId:roles){
 			UserOrganisationRole uor = new UserOrganisationRole(uo,(Role)service.findById(Role.class,roleId));
 			service.save(uor);
@@ -138,7 +138,7 @@
 		org.setName(buildName(serverMap.getPrefix(), extCourseId));
 		org.setCode(extCourseId);
 		org.setParentOrganisation(serverMap.getOrganisation());
-		org.setOrganisationType((OrganisationType)service.findById(OrganisationType.class,OrganisationType.COURSE_TYPE));
+		org.setOrganisationType((OrganisationType)service.findById(OrganisationType.class,OrganisationType.CLASS_TYPE));
 		org.setOrganisationState((OrganisationState)service.findById(OrganisationState.class,OrganisationState.ACTIVE));
 		org.setLocale(getLocale(countryIsoCode, langIsoCode));
 		service.saveOrganisation(org, user.getUserId());
@@ -212,6 +212,7 @@
 		map.setExtUsername(extUsername);
 		map.setUser(user);
 		service.save(map);
+		addMemberships(user, serverMap.getOrganisation());
 		return map;
 	}
 
@@ -263,7 +264,7 @@
 		}
 	}
 
-	private String hash(ExtServerOrgMap serverMap, String extUsername, String timestamp) {
+	public String hash(ExtServerOrgMap serverMap, String extUsername, String timestamp) {
         String serverId = serverMap.getServerid();
         String serverKey = serverMap.getServerkey();
         String plaintext = timestamp.trim().toLowerCase()+extUsername.trim().toLowerCase()+serverId.trim().toLowerCase()+serverKey.trim().toLowerCase();
Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java,v
diff -u -r1.3 -r1.3.2.1
--- lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java	26 Nov 2006 07:01:22 -0000	1.3
+++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java	12 Mar 2007 01:30:29 -0000	1.3.2.1
@@ -20,6 +20,9 @@
  */
 package org.lamsfoundation.lams.integration.util;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
@@ -55,6 +58,10 @@
 	public static final String PARAM_COUNTRY = "country";
 
 	public static final String PARAM_LANGUAGE = "lang";
+	
+	public static final String PARAM_REQUEST_SRC ="requestSrc";
+	
+	public static final String PARAM_NOTIFY_CLOSE_URL ="notifyCloseURL";
 
 	public static final String METHOD_AUTHOR = "author";
 
@@ -88,7 +95,7 @@
 
 		String method = request.getParameter(PARAM_METHOD);
 		String lessonId = request.getParameter(PARAM_LESSON_ID);
-
+		
 		try {
 			addUserToLessonClass(request, lessonId, method);
 		} catch (UserInfoFetchException e) {
@@ -97,7 +104,24 @@
 
 		/** AUTHOR * */
 		if (METHOD_AUTHOR.equals(method)) {
-			return request.getContextPath() + URL_AUTHOR;
+			
+			String requestSrc = request.getParameter(PARAM_REQUEST_SRC);
+			String notifyCloseURL = request.getParameter(PARAM_NOTIFY_CLOSE_URL);
+			
+			String parameters = "";
+			
+			if (requestSrc != null && notifyCloseURL != null) {
+				try {
+					parameters = "&" + PARAM_REQUEST_SRC + "=" + URLEncoder.encode(requestSrc, "UTF8");
+					parameters += "&" + PARAM_NOTIFY_CLOSE_URL + "=" + URLEncoder.encode(notifyCloseURL, "UTF8");				
+	 			} catch (UnsupportedEncodingException e) {
+					log.error(e);
+				}
+			} else {
+				log.error("Parameters 'requestSrc' and 'notifyCloseURL' are not present");
+			}
+			
+			return request.getContextPath() + URL_AUTHOR + parameters;
 		}
 		/** MONITOR * */
 		else if (METHOD_MONITOR.equals(method) && lessonId != null) {
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java,v
diff -u -r1.8 -r1.8.2.1
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java	17 Sep 2006 06:14:16 -0000	1.8
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java	12 Mar 2007 01:30:27 -0000	1.8.2.1
@@ -34,7 +34,14 @@
 public interface ILearningLibraryDAO extends IBaseDAO {
 	
 	public LearningLibrary getLearningLibraryById(Long learningLibraryId);
-	/** Get all valid learning libraries */
+	/** 
+	 * Get all valid learning libraries, it eaquals getAllLearningLibraries(true);
+	 */
 	public List getAllLearningLibraries();
+	/**
+	 * Get all learning libraries whatever the library is valid or invalid. 
+	 * @return
+	 */
+	public List getAllLearningLibraries(boolean valid);
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java,v
diff -u -r1.8 -r1.8.2.1
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java	17 Sep 2006 06:14:16 -0000	1.8
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java	12 Mar 2007 01:30:28 -0000	1.8.2.1
@@ -26,7 +26,6 @@
 import java.util.List;
 
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
-import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.LearningLibrary;
 import org.lamsfoundation.lams.learningdesign.dao.ILearningLibraryDAO;
 
@@ -37,6 +36,8 @@
 
 	private static final String FIND_VALID_LIB ="from "+LearningLibrary.class.getName()
 		+" l where l.validLibrary=true";
+	private static final String FIND_ALL_LIB ="from "+LearningLibrary.class.getName()
+	+" l";
 
 	/**
 	 * (non-Javadoc)
@@ -53,4 +54,12 @@
 	public List getAllLearningLibraries() {
 			return getSession().createQuery(FIND_VALID_LIB).list();
 	}
+	
+	public List getAllLearningLibraries(boolean valid){
+		if(valid)
+			return getAllLearningLibraries();
+		else
+			return getHibernateTemplate().find(FIND_ALL_LIB);
+		
+	}
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java,v
diff -u -r1.9 -r1.9.2.1
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java	17 Sep 2006 06:14:19 -0000	1.9
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java	12 Mar 2007 01:30:28 -0000	1.9.2.1
@@ -23,15 +23,14 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.learningdesign.dto;
 
-import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
-import java.util.Vector;
 import java.util.List;
+import java.util.Vector;
 
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.ComplexActivity;
 import org.lamsfoundation.lams.learningdesign.LearningLibrary;
-import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
 
 /**
  * @author Manpreet Minhas
@@ -47,19 +46,21 @@
 	private String description;
 	private String title;
 	private Boolean validFlag;
+	private Date createDateTime;
 	private Vector templateActivities;
 	
 	
 	public LearningLibraryDTO(){
 		
 	}
 	public LearningLibraryDTO(Long learningLibraryID, String description,
-			String title, Boolean validFlag,
+			String title, Boolean validFlag,Date createDateTime,
 			Vector templateActivities) {		
 		this.learningLibraryID = learningLibraryID;
 		this.description = description;
 		this.title = title;
 		this.validFlag = validFlag;		
+		this.createDateTime = createDateTime;
 		this.templateActivities = templateActivities;
 	} 
 	
@@ -68,7 +69,8 @@
 		this.learningLibraryID = learningLibrary.getLearningLibraryId();
 		this.description = learningLibrary.getDescription();
 		this.title = learningLibrary.getTitle();
-		this.validFlag = learningLibrary.getValidLibrary();		
+		this.validFlag = learningLibrary.getValidLibrary();
+		this.createDateTime = learningLibrary.getCreateDateTime();
 		this.templateActivities = populateActivities(learningLibrary.getActivities().iterator());
 	}
 	
@@ -78,6 +80,7 @@
 		this.description = learningLibrary.getDescription();
 		this.title = learningLibrary.getTitle();
 		this.validFlag = learningLibrary.getValidLibrary();	
+		this.createDateTime = learningLibrary.getCreateDateTime();
 		this.templateActivities = populateActivities(templateActivity.iterator());
 	}
 	
@@ -147,6 +150,12 @@
 		}
 		return activities;
 	}
+	public Date getCreateDateTime() {
+		return createDateTime;
+	}
+	public void setCreateDateTime(Date createDateTime) {
+		this.createDateTime = createDateTime;
+	}
 	
 	
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java,v
diff -u -r1.56 -r1.56.2.1
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	29 Nov 2006 02:48:26 -0000	1.56
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	12 Mar 2007 01:30:27 -0000	1.56.2.1
@@ -468,11 +468,11 @@
 				String secureDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator + FileUtil.LAMS_WWW_DIR + File.separator + FileUtil.LAMS_WWW_SECURE_DIR;
 				String ldContentDir = FileUtil.getFullPath(secureDir,ldDto.getContentFolderID());
 				
-				if(FileUtil.directoryExist(ldContentDir)) {
-					log.debug("Create export Learning Design content target zip file. File name is " + targetContentZipFileName);
-					ZipFileUtil.createZipFile(targetContentZipFileName, ldContentDir, contentDir);
+				if(!FileUtil.isEmptyDirectory(ldContentDir)) {
+						log.debug("Create export Learning Design content target zip file. File name is " + targetContentZipFileName);
+						ZipFileUtil.createZipFile(targetContentZipFileName, ldContentDir, contentDir);
 				} else {
-					log.error("No such directory:" + ldContentDir);
+					log.error("No such directory (or empty directory):" + ldContentDir);
 				}
 				
 			} catch (Exception e) {
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java,v
diff -u -r1.8 -r1.8.2.1
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java	27 Oct 2006 00:56:22 -0000	1.8
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java	12 Mar 2007 01:30:27 -0000	1.8.2.1
@@ -55,9 +55,24 @@
 	public Vector<ValidationErrorDTO> validateLearningDesign(LearningDesign learningDesign);
 	
 	/**
-	 * Get the DTO list of all learning libraries.
+	 * Get the DTO list of all valid learning libraries, which equals getAllLearningLibraryDetails(true) method.
 	 * @return list of LearningLibraryDTO
 	 * @throws IOException
 	 */
 	public ArrayList<LearningLibraryDTO> getAllLearningLibraryDetails() throws IOException;
+	/**
+	 * Get the DTO list of all learning libraries whatever it is valid or not.
+	 * @param valid
+	 * @return
+	 * @throws IOException
+	 */
+	public ArrayList<LearningLibraryDTO> getAllLearningLibraryDetails(boolean valid) throws IOException;
+	
+	/**
+	 * Set valid flag to learning library.
+	 * @param learningLibraryId
+	 * @param valid
+	 */
+	public void setValid(Long learningLibraryId, boolean valid);
+	
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java,v
diff -u -r1.14 -r1.14.2.1
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	7 Nov 2006 06:21:34 -0000	1.14
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	12 Mar 2007 01:30:27 -0000	1.14.2.1
@@ -148,6 +148,11 @@
 		
 	}
 	
+	public void setValid(Long learningLibraryId, boolean valid) {
+		LearningLibrary library = learningLibraryDAO.getLearningLibraryById(learningLibraryId);
+		library.setValidLibrary(valid);
+		learningLibraryDAO.update(library);
+	}
 	/**
 	 * Cleans up multiple and redundant error messages in the list.
 	 * @param errors	List of errors to cleanup.
@@ -462,7 +467,11 @@
 	
 
 	public ArrayList<LearningLibraryDTO> getAllLearningLibraryDetails()throws IOException{
-		Iterator iterator= learningLibraryDAO.getAllLearningLibraries().iterator();
+		//only return valid learning library
+		return getAllLearningLibraryDetails(true);
+	}
+	public ArrayList<LearningLibraryDTO> getAllLearningLibraryDetails(boolean valid)throws IOException{
+		Iterator iterator= learningLibraryDAO.getAllLearningLibraries(valid).iterator();
 		ArrayList<LearningLibraryDTO> libraries = new ArrayList<LearningLibraryDTO>();
 		while(iterator.hasNext()){
 			LearningLibrary learningLibrary = (LearningLibrary)iterator.next();		
@@ -523,4 +532,6 @@
 			}
 		}
 	}
+
+	
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/themes/Attic/CSSThemeVisualElement.java,v
diff -u -r1.8 -r1.8.2.1
--- lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java	17 Sep 2006 06:14:16 -0000	1.8
+++ lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java	12 Mar 2007 01:30:29 -0000	1.8.2.1
@@ -57,6 +57,10 @@
 
     /** persistent field */
     private boolean theme;
+    
+    /** persistent field */
+    private String imageDirectory;
+        
 
     /** nullable persistent field */
     private CSSThemeVisualElement parentTheme;
@@ -68,11 +72,12 @@
     private Set elements;
 
     /** full constructor */
-    public CSSThemeVisualElement(Long id, String name, String description, boolean theme, CSSThemeVisualElement parentTheme, Set styles, Set elements) {
+    public CSSThemeVisualElement(Long id, String name, String description, boolean theme, String imageDirectory, CSSThemeVisualElement parentTheme, Set styles, Set elements) {
         this.id = id;
         this.name = name;
         this.description = description;
         this.theme = theme;
+        this.imageDirectory = imageDirectory;
         this.parentTheme = parentTheme;
         this.styles = styles;
         this.elements = elements;
@@ -149,6 +154,20 @@
     }
 
     /** 
+     *            @hibernate.property
+     *             column="image_directory"
+     *             length="100"
+     *         
+     */
+    public String getImageDirectory() {
+        return this.imageDirectory;
+    }
+
+    public void setImageDirectory(String imageDirectory) {
+        this.imageDirectory = imageDirectory;
+    }
+
+   /** 
      * If a theme, then this is the base style. If a visual element, then
      * it is the style for this element.
      */
Index: lams_common/src/java/org/lamsfoundation/lams/themes/service/IThemeService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/themes/service/IThemeService.java,v
diff -u -r1.10 -r1.10.2.1
--- lams_common/src/java/org/lamsfoundation/lams/themes/service/IThemeService.java	17 Sep 2006 06:14:25 -0000	1.10
+++ lams_common/src/java/org/lamsfoundation/lams/themes/service/IThemeService.java	12 Mar 2007 01:30:27 -0000	1.10.2.1
@@ -25,6 +25,7 @@
 
 import java.io.IOException;
 
+import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
 import org.lamsfoundation.lams.themes.dao.ICSSThemeDAO;
 import org.lamsfoundation.lams.usermanagement.exception.UserException;
 import org.lamsfoundation.lams.themes.exception.ThemeException;
@@ -72,14 +73,23 @@
 	/**
 	 * Returns a string representing the requested theme in WDDX format
 	 * 
-	 * @param learningDesignID The learning_design_id of the design whose WDDX packet is requested 
-	 * @return String The requested LearningDesign in WDDX format
+	 * @param themeId The id of the theme whose WDDX packet is requested 
+	 * @return String The requested theme in WDDX format
 	 * @throws Exception
 	 */
-	public String getTheme(Long themeId)throws IOException;
+	public String getThemeWDDX(Long themeId)throws IOException;
 
+	/**
+	 * Returns a theme
+	 */
+	public CSSThemeVisualElement getTheme(Long themeId);
 
 	/**
+	 * Returns a theme based on the name.
+	 */
+	public CSSThemeVisualElement getTheme(String themeName);
+
+	/**
 	 * This method returns a list of all available themes in
 	 * WDDX format. We need to work out if this should be restricted
 	 * by user.
Index: lams_common/src/java/org/lamsfoundation/lams/themes/service/ThemeService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/themes/service/ThemeService.java,v
diff -u -r1.10 -r1.10.2.1
--- lams_common/src/java/org/lamsfoundation/lams/themes/service/ThemeService.java	17 Sep 2006 06:14:25 -0000	1.10
+++ lams_common/src/java/org/lamsfoundation/lams/themes/service/ThemeService.java	12 Mar 2007 01:30:27 -0000	1.10.2.1
@@ -25,6 +25,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -58,10 +59,6 @@
 	protected MessageService messageService;
 	protected IUserManagementService userManagementService;
 	
-	/** for sending acknowledgment/error messages back to flash */
-	private FlashMessage flashMessage;
-	
-	
 	public ThemeService() {
 		
 	}
@@ -123,6 +120,7 @@
 	 */
 	public String storeTheme(String wddxPacket) throws Exception {
 		
+		FlashMessage flashMessage= null;
 		Hashtable table = (Hashtable)WDDXProcessor.deserialize(wddxPacket);
 		
 		CSSThemeDTO themeDTO = new CSSThemeDTO(table);
@@ -152,12 +150,13 @@
 	/**
 	 * Returns a string representing the requested theme in WDDX format
 	 * 
-	 * @param learningDesignID The learning_design_id of the design whose WDDX packet is requested 
-	 * @return String The requested LearningDesign in WDDX format
+	 * @param themeId The id of the theme whose WDDX packet is requested 
+	 * @return String The requested theme in WDDX format
 	 * @throws Exception
 	 */
-	public String getTheme(Long themeId)throws IOException {
-	    CSSThemeVisualElement theme = themeDAO.getThemeById(themeId);
+	public String getThemeWDDX(Long themeId)throws IOException {
+		FlashMessage flashMessage= null;
+	    CSSThemeVisualElement theme = getTheme(themeId);
 		if(theme==null)
 			flashMessage = FlashMessage.getNoSuchTheme("wddxPacket",themeId);
 		else{
@@ -169,6 +168,26 @@
 
 
 	/**
+	 * Returns a theme
+	 */
+	public CSSThemeVisualElement getTheme(Long themeId) {
+	    return themeDAO.getThemeById(themeId);
+	}
+
+
+	/**
+	 * Returns a theme based on the name.
+	 */
+	public CSSThemeVisualElement getTheme(String themeName) {
+	    List themes = themeDAO.getThemeByName(themeName);
+	    if ( themes != null && themes.size() > 0 )
+	    	return (CSSThemeVisualElement) themes.get(0);
+	    else
+	    	return null;
+	}
+
+
+	/**
 	 * This method returns a list of all available themes in
 	 * WDDX format. We need to work out if this should be restricted
 	 * by user.
@@ -177,6 +196,7 @@
 	 * @throws IOException
 	 */
 	public String getThemes() throws IOException {
+		FlashMessage flashMessage= null;
 	    List themes = themeDAO.getAllThemes();
 		ArrayList<CSSThemeBriefDTO> themeList = new ArrayList<CSSThemeBriefDTO>();
 		Iterator iterator = themes.iterator();
@@ -195,6 +215,7 @@
 	 * @throws IOException
 	 */
 	private FlashMessage setTheme(Integer userId, Long themeId, String type) throws IOException, ThemeException, UserException {
+		FlashMessage flashMessage= null;
 		User user = (User)userManagementService.findById(User.class,userId);
 		CSSThemeVisualElement theme = themeDAO.getThemeById(themeId);
 		
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java,v
diff -u -r1.3 -r1.3.2.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java	4 Sep 2006 02:12:33 -0000	1.3
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java	12 Mar 2007 01:30:28 -0000	1.3.2.1
@@ -18,7 +18,7 @@
 	private static final long serialVersionUID = 4096710015819299886L;
 
 	/** identifier field */
-    private Byte localeId;
+    private Integer localeId;
 
     /** persistent field */
     private String languageIsoCode;
@@ -47,15 +47,15 @@
     /** 
      *            @hibernate.id
      *             generator-class="native"
-     *             type="java.lang.Byte"
+     *             type="java.lang.Integer"
      *             column="locale_id"
      *         
      */
-    public Byte getLocaleId() {
+    public Integer getLocaleId() {
         return this.localeId;
     }
 
-    public void setLocaleId(Byte localeId) {
+    public void setLocaleId(Integer localeId) {
         this.localeId = localeId;
     }
 
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v
diff -u -r1.29 -r1.29.2.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	1 Nov 2006 04:41:33 -0000	1.29
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	12 Mar 2007 01:30:28 -0000	1.29.2.1
@@ -147,8 +147,11 @@
     /** persistent field */
     private Long portraitUuid;
     
+    /** persistent field */
+    private Boolean changePassword;
+    
     /** full constructor */
-    public User(String login, String password, String title, String firstName, String lastName, String addressLine1, String addressLine2, String addressLine3, String city, String state, String postcode, String country, String dayPhone, String eveningPhone, String mobilePhone, String fax, String email, Boolean disabledFlag, Date createDate, Workspace workspace, AuthenticationMethod authenticationMethod, CSSThemeVisualElement flashTheme, CSSThemeVisualElement htmlTheme, Set userOrganisations, String chatId, Set learnerProgresses, Set userToolSessions, Set userGroups, Set learningDesigns, Set lessons, Long portraitUuid) {
+    public User(String login, String password, String title, String firstName, String lastName, String addressLine1, String addressLine2, String addressLine3, String city, String state, String postcode, String country, String dayPhone, String eveningPhone, String mobilePhone, String fax, String email, Boolean disabledFlag, Date createDate, Workspace workspace, AuthenticationMethod authenticationMethod, CSSThemeVisualElement flashTheme, CSSThemeVisualElement htmlTheme, Set userOrganisations, String chatId, Set learnerProgresses, Set userToolSessions, Set userGroups, Set learningDesigns, Set lessons, Long portraitUuid, Boolean changePassword) {
         this.login = login;
         this.password = password;
         this.title = title;
@@ -180,10 +183,12 @@
         this.learningDesigns = learningDesigns;
         this.lessons = lessons;
         this.portraitUuid = portraitUuid;
+        this.changePassword = changePassword;
     }
 
     /** default constructor */
     public User() {
+    	this.changePassword = false;
     }
 
     /** minimal constructor */
@@ -200,6 +205,7 @@
         this.userGroups = userGroups;
         this.learningDesigns = learningDesigns;
         this.lessons = lessons;
+        this.changePassword = false;
     }
 
     /** 
@@ -220,7 +226,7 @@
     /** 
      *            @hibernate.property
      *             column="login"
-     *             length="20"
+     *             length="255"
      *			   unique="true"
      *             not-null="true"
      *         
@@ -265,7 +271,7 @@
     /** 
      *            @hibernate.property
      *             column="first_name"
-     *             length="64"
+     *             length="128"
      *         
      */
     public String getFirstName() {
@@ -810,4 +816,19 @@
     public void setPortraitUuid(Long portraitUuid) {
         this.portraitUuid = portraitUuid;
     }
-}
+    
+    /** 
+     *            @hibernate.property
+     *             column="change_password"
+     *             length="1"
+     *             not-null="true"
+     *         
+     */
+    public Boolean getChangePassword() {
+        return this.changePassword;
+    }
+
+    public void setChangePassword(Boolean changePassword) {
+        this.changePassword = changePassword;
+    }
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java,v
diff -u -r1.16 -r1.16.2.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java	25 Sep 2006 05:45:35 -0000	1.16
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java	12 Mar 2007 01:30:28 -0000	1.16.2.1
@@ -167,7 +167,7 @@
     /** 
      *            @hibernate.property
      *             column="name"
-     *             length="64"
+     *             length="255"
      *             not-null="true"
      *         
      */
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java,v
diff -u -r1.7 -r1.7.2.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java	1 Nov 2006 05:07:37 -0000	1.7
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java	12 Mar 2007 01:30:27 -0000	1.7.2.1
@@ -43,5 +43,13 @@
 	 * @return
 	 */
 	 public User getUserByOrganisationAndRole(final Integer userId, final Integer roleId, final Organisation organisation);
+	 
+	 
+	 /**
+	  * 
+	  * @param roleId
+	  * @return
+	  */
+    public Integer getCountRoleForSystem(final Integer roleId);
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java,v
diff -u -r1.9 -r1.9.2.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java	1 Nov 2006 05:07:37 -0000	1.9
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java	12 Mar 2007 01:30:29 -0000	1.9.2.1
@@ -23,18 +23,14 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.usermanagement.dao.hibernate;
 
-import java.util.List;
-
-import org.hibernate.FetchMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.hibernate.criterion.Expression;
-import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.usermanagement.Organisation;
-import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
 import org.lamsfoundation.lams.usermanagement.dao.IRoleDAO;
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.springframework.orm.hibernate3.HibernateCallback;
 import org.springframework.orm.hibernate3.HibernateTemplate;
 /**
@@ -43,10 +39,19 @@
  */
 public class RoleDAO extends BaseDAO implements IRoleDAO
 {
-	 private final static String LOAD_USER_BY_ORG_AND_ROLE = 
-	        "from User u where u.id = :userId and u.userOrganisations.organisation = :org and u.userOrganisations.userOrganisationRoles.role.roleId = :roleId";
+	 private final static String LOAD_USER_BY_ORG_AND_ROLE =
+		 	"select u "
+		 	+"from User u, UserOrganisation uo, UserOrganisationRole uor "
+		 	+"where u.id = :userId and "
+		 	+"u.id = uo.user.id and "
+		 	+"uo.organisation = :org and "
+		 	+"uor.userOrganisation.id = uo.id and "
+		 	+"uor.role.id = :roleId";
+	 
+	 private final static String COUNT_ROLE = "select count(distinct userOrganisationRole.userOrganisation.user)"
+			+ " from "+UserOrganisationRole.class.getName()+" userOrganisationRole"
+			+ " where userOrganisationRole.role.roleId = :roleId";
 
-
     public User getUserByOrganisationAndRole(final Integer userId, final Integer roleId, final Organisation organisation)
     {
         HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory());
@@ -66,6 +71,23 @@
        ); 
     }
     
+    public Integer getCountRoleForSystem(final Integer roleId)
+    {
+    	 HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory());
+
+    	 return (Integer) hibernateTemplate.execute(new HibernateCallback() {
+             public Object doInHibernate(Session session)
+                     throws HibernateException {
+     	    	Query query = session.createQuery(COUNT_ROLE);
+     	    	query.setInteger("roleId", roleId.intValue());
+     	    	Object value = query.uniqueResult();
+     	    	return new Integer (((Number)value).intValue()); 
+             }
+         });
+    	
+    }
     
+    
+    
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java,v
diff -u -r1.43 -r1.43.2.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	30 Nov 2006 05:20:25 -0000	1.43
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	12 Mar 2007 01:30:27 -0000	1.43.2.1
@@ -370,4 +370,11 @@
 	 * @return
 	 */
 	public boolean isUserSysAdmin();
+	
+	/**
+	 * Count the number of unique (distinct) users with a particular role in the system. 
+	 * @param roleId	Role ID
+	 * @return
+	 */
+	public Integer getCountRoleForSystem(Integer roleId);
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v
diff -u -r1.71 -r1.71.2.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	1 Dec 2006 06:36:46 -0000	1.71
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	12 Mar 2007 01:30:27 -0000	1.71.2.1
@@ -656,7 +656,10 @@
 			uo = new UserOrganisation(user, org);
 			save(uo);
 			log.debug("added "+user.getLogin()+" to "+org.getName());
-			Set uos = org.getUserOrganisations();
+			Set uos;
+			if ((uos=org.getUserOrganisations())==null) {
+				uos = new HashSet();
+			}
 			uos.add(uo);
 		}
 		
@@ -701,18 +704,25 @@
 					|| role.getName().equals(Role.SYSADMIN)) {
 				if (user.getWorkspace()==null) createWorkspaceForUser(user);
 			}
-			// when a user becomes group manager, they need monitor role in subgroups
-			if (role.getName().equals(Role.GROUP_MANAGER)) {
-				if (org.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.COURSE_TYPE)) {
-					setMonitorForGroupManager(user, org.getChildOrganisations());
-				}
-			}
 		}
 		uo.setUserOrganisationRoles(uors);
-		
 		save(user);
+		// make sure group managers have monitor in each subgroup
+		checkGroupManager(user, org);
 	}
 	
+	private void checkGroupManager(User user, Organisation org) {
+		if (org.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.COURSE_TYPE)) {
+			if (hasRoleInOrganisation(user, Role.ROLE_GROUP_MANAGER, org)) {
+				setMonitorForGroupManager(user, org.getChildOrganisations());
+			}
+		} else if (org.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) {
+			if (hasRoleInOrganisation(user, Role.ROLE_GROUP_MANAGER, org.getParentOrganisation())) {
+				setMonitorForGroupManager(user, org.getParentOrganisation().getChildOrganisations());
+			}
+		}
+	}
+	
 	private void setMonitorForGroupManager(User user, Set childOrgs) {
 		for (Object o : childOrgs) {
 			Organisation org = (Organisation)o;
@@ -729,11 +739,16 @@
 			
 			Set<UserOrganisationRole> uors = uo.getUserOrganisationRoles();
 			if (uors!=null && !uors.isEmpty()) {
+				boolean isMonitor = false;
 				for (UserOrganisationRole uor : uors) {
 					if (uor.getRole().getName().equals(Role.MONITOR)) {
-						return;
+						isMonitor = true;
+						break;
 					}
 				}
+				if (isMonitor) {
+					continue;
+				}
 			}
 			UserOrganisationRole monitor = new UserOrganisationRole(uo, 
 					(Role)findById(Role.class, Role.ROLE_MONITOR));
@@ -821,4 +836,12 @@
 		Integer requestorId = getRequestorId();
 		return (requestorId!=null ? isUserInRole(requestorId, rootOrgId, Role.SYSADMIN) : false);
 	}
+	
+	public Integer getCountRoleForSystem(Integer roleId) {
+		Integer count = roleDAO.getCountRoleForSystem(roleId);
+		if(count != null)
+			return count;
+		else
+			return new Integer(0);
+	}
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java,v
diff -u -r1.7.2.1 -r1.7.2.2
--- lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java	1 Feb 2007 00:52:09 -0000	1.7.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java	12 Mar 2007 01:30:29 -0000	1.7.2.2
@@ -36,7 +36,7 @@
 public class CSSThemeUtil {
 	
 	// private static Logger log = Logger.getLogger(CSSThemeUtil.class);
-	public static String DEFAULT_HTML_THEME = "defaultHTML";
+	private static String DEFAULT_HTML_THEME = "defaultHTML";
 	
 	/**
 	 * Will return a list of stylesheets for the current user.
@@ -63,7 +63,7 @@
 	   			if (theme != null ) {
 	   				userThemeFound = true;
 	   				String themeName = theme.getName();
-	   				if ( themeName != null && ! themeName.equals(DEFAULT_HTML_THEME) ) {
+	   				if ( themeName != null && ! isLAMSDefaultTheme(themeName) ) {
 	   					themeList.add(theme.getName());
 	   				}
 	   			}
@@ -98,4 +98,10 @@
 	   	return theme;
 	   	
 	}
+	
+	// Is this theme the LAMS basic theme, which must always be included on a web page?
+	// This is NOT the server default theme - which may be a custom theme.
+	public static boolean isLAMSDefaultTheme(String themeName) {
+		return themeName.equals(DEFAULT_HTML_THEME);
+	}
 }
Index: lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java,v
diff -u -r1.18 -r1.18.2.1
--- lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	25 Oct 2006 08:35:47 -0000	1.18
+++ lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	12 Mar 2007 01:30:29 -0000	1.18.2.1
@@ -30,6 +30,7 @@
 import java.io.OutputStream;
 import java.nio.channels.FileChannel;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
 
@@ -95,6 +96,22 @@
 	
 	}
 	
+	public static boolean isEmptyDirectory(String directoryName) throws FileUtilException {
+		
+		if(directoryName == null || directoryName.length() == 0)
+			throw new FileUtilException("A directory name must be specified");
+		
+		File dir = new File(directoryName);
+		if(dir.exists()) {
+			if(dir.listFiles().length > 0)
+				return false;
+			else 
+				return true;
+		}
+		
+		return true;
+	}
+	
 	/**
 	 * Create a temporary directory with the name in the form
 	 * lamstmp_timestamp_suffix inside the default temporary-file directory 
@@ -370,5 +387,44 @@
 	     sourceChannel.close();
 	     destinationChannel.close();
    }
-  
+	/**
+	 * get file extension name from a String, such as from "textabc.doc", return "doc"
+	 * fileName also can contain directory infomation.
+	 */
+	public static String getFileExtension(String fileName) {
+		if(fileName == null)
+			return "";
+			
+		fileName = fileName.trim();
+		int dotPos = fileName.lastIndexOf(".");
+		if (dotPos == -1)
+			return "";
+		return fileName.substring(dotPos + 1, fileName.length());
+	}
+	
+	/**
+	 * Check whether file is executable according to its extenstion and executable extension name list from LAMS configuaration.
+	 * @param filename
+	 * @return
+	 */
+	  public static boolean isExecutableFile(String filename){
+		  String extname = FileUtil.getFileExtension(filename);
+		  log.debug("Check executable file for extension name " + extname);
+		  
+		  if(StringUtils.isBlank(extname))
+			  return false;
+		  extname = "." + extname;
+		  
+		  String exeListStr = Configuration.get(ConfigurationKeys.EXE_EXTENSIONS);
+		  String[] extList = StringUtils.split(exeListStr, ',');
+		  boolean executable = false;
+		  for (String ext : extList) {
+			if(StringUtils.equalsIgnoreCase(ext, extname)){
+				executable = true;
+				break;
+			}
+		}
+		  
+		  return executable;
+	  }
 }
Index: lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java,v
diff -u -r1.6 -r1.6.2.1
--- lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java	17 Sep 2006 06:14:17 -0000	1.6
+++ lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java	12 Mar 2007 01:30:29 -0000	1.6.2.1
@@ -23,19 +23,17 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.util;
 
-import org.apache.struts.validator.Resources;
-import org.apache.commons.validator.Arg;
-import org.apache.commons.validator.ValidatorAction;
+import java.text.NumberFormat;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.validator.Field;
-import org.apache.struts.action.ActionMessages;
 import org.apache.commons.validator.Validator;
+import org.apache.commons.validator.ValidatorAction;
 import org.apache.commons.validator.util.ValidatorUtils;
-import javax.servlet.http.HttpServletRequest;
-import org.lamsfoundation.lams.util.Configuration;
-import org.lamsfoundation.lams.util.ConfigurationKeys;
-import org.apache.struts.upload.MultipartRequestWrapper;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
-import org.apache.struts.action.ActionForm;
 
 /**
  * This class is used by commons validator. To validate various properties 
@@ -46,6 +44,7 @@
 public class FileValidatorUtil {
     
     public static final String LARGE_FILE = "largeFile";
+	private static final String MSG_KEY = "errors.maxfilesize";
 
     /** 
      * To enable this validator copy the XML entry below to validator-rules.xml
@@ -79,29 +78,81 @@
     public static boolean validateFileSize(Object bean, ValidatorAction va,
             Field field, ActionMessages errors, Validator validator,
             HttpServletRequest request) {
+        
+        int fileSize = 0;
+        try {
+        	String fileSizeStr = ValidatorUtils.getValueAsString(bean, field.getProperty());
+        	fileSize = Integer.parseInt(fileSizeStr);
+		} catch (Exception e) {
+			//catch null point exception: e.g., offlineFile.fileSize, if offlineFile is null, 
+			//ValidatorUtils.getValueAsString() will throw null.
+			//skip, do nothing
+			return true;
+		}
+		
+		boolean largeFile = Boolean.valueOf(field.getVarValue(LARGE_FILE)).booleanValue();
+		//so far put message into GLOABLE_MESSAGE rather than special key
+		return validateFileSize(fileSize, largeFile, ActionMessages.GLOBAL_MESSAGE , errors);
+    }
+    /**
+     * 
+     * @param file
+     * @param largeFile
+     * @param errors
+     * @return Be careful, if the file size is under maximum size, return TRUE. Otherwise, return false.   
+     */
+    public static boolean validateFileSize(FormFile file, boolean largeFile, ActionMessages errors){
+      return validateFileSize(file, largeFile,ActionMessages.GLOBAL_MESSAGE, errors);
 
-        int maxFileSize;
+    }
+    
+    /**
+     * 
+     * @param file
+     * @param largeFile
+     * @param errorKey the key in ActionMessages(errorKey,ActionMessage());
+     * @param errors
+     * @return Be careful, if the file size is under maximum size, return TRUE. Otherwise, return false.   
+     */
+    public static boolean validateFileSize(FormFile file, boolean largeFile, String errorKey, ActionMessages errors){
+    	int fileSize = 0;
+    	try {
+    		fileSize = file.getFileSize();
+    	} catch (Exception e) {
+    		//skip, do nothing
+    		return true;
+    	}
+    	
+    	return validateFileSize(fileSize, largeFile,errorKey, errors);
+    	
+    }
+    
+    private static boolean validateFileSize(int fileSize, boolean largeFile, String errorKey, ActionMessages errors){
+    	float maxFileSize;
         
         //whether we are using large file or not?
-        if(Boolean.valueOf(field.getVarValue(LARGE_FILE)).booleanValue())
+        if(largeFile)
             maxFileSize = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE);
         else
             maxFileSize = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE);
         
-        String fileSizeStr = ValidatorUtils.getValueAsString(bean, field.getProperty());
-        int fileSize = Integer.parseInt(fileSizeStr);
-              
         if(fileSize >  maxFileSize){
             //Set arg0 in message bundle
-            Arg arg = new Arg();
-            arg.setPosition(0);
-            arg.setResource(false); //dont treat this as a locale key
-            arg.setKey(String.valueOf(maxFileSize));
-            field.addArg(arg);
+            String unit= "";
+            if(maxFileSize >= 1024){
+            	maxFileSize = maxFileSize/1024;
+            	unit = "K";
+            }
+            if(maxFileSize >= 1024){
+            	maxFileSize = maxFileSize/1024;
+            	unit = "M";
+            }
+            NumberFormat format = NumberFormat.getInstance();
+			format.setMaximumFractionDigits(1);
+			String maxSize = format.format(maxFileSize) + unit;
             
             //set error message
-            errors.add(field.getKey(), Resources.getActionMessage(request, va,
-                    field));
+            errors.add(errorKey, new ActionMessage(MSG_KEY,maxSize));
             return false;
         }
         return true;
Index: lams_common/src/java/org/lamsfoundation/lams/util/wddx/FlashMessage.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/wddx/FlashMessage.java,v
diff -u -r1.14 -r1.14.2.1
--- lams_common/src/java/org/lamsfoundation/lams/util/wddx/FlashMessage.java	17 Sep 2006 06:14:17 -0000	1.14
+++ lams_common/src/java/org/lamsfoundation/lams/util/wddx/FlashMessage.java	12 Mar 2007 01:30:28 -0000	1.14.2.1
@@ -29,9 +29,11 @@
 /**
  * @author Manpreet Minhas
  * This class represents the message sent by the server to the 
- * Flash client.
- * 
- * TODO Flash messages require internationalisation.
+ * Flash client. The error messages in this class should only
+ * be generic error messages that may be used in various modules.
+ * The errors are not I18N'd as we assume Flash will not show the
+ * error to the user - but the error is included in the Flash dump
+ * file so it should still be meaningful.
  */
 public class FlashMessage implements Serializable {
 	
@@ -116,7 +118,7 @@
     	} 
     	return wddxPacket;
     }
-    public static FlashMessage getNoSuchUserExists(String methodName, Integer userID){
+    public static  FlashMessage getNoSuchUserExists(String methodName, Integer userID){
     	return new FlashMessage(methodName,
     							"No such User with a user_id of :" + userID + " exists",
 								ERROR);    	
Index: lams_common/src/java/org/lamsfoundation/lams/web/action/LamsLookupDispatchAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/action/LamsLookupDispatchAction.java,v
diff -u -r1.5 -r1.5.2.1
--- lams_common/src/java/org/lamsfoundation/lams/web/action/LamsLookupDispatchAction.java	17 Sep 2006 06:14:22 -0000	1.5
+++ lams_common/src/java/org/lamsfoundation/lams/web/action/LamsLookupDispatchAction.java	12 Mar 2007 01:30:28 -0000	1.5.2.1
@@ -36,6 +36,10 @@
  * Reason for this unknown as the coder who implemented it failed to say why!
  * </OL>
  * 
+ * @deprecated LookupDispatchAction will break when the locale handling / I18N breaks, 
+ * 				as LookupDispatchAction depends heavily on the name of the button, 
+ * 				as given in the applicationResources.properties file.
+ * 
  * @author Fiona Malikoff
  */
 public abstract class LamsLookupDispatchAction extends LookupDispatchAction {
Index: lams_common/test/java/org/lamsfoundation/lams/theme/service/TestThemeService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/theme/service/Attic/TestThemeService.java,v
diff -u -r1.5 -r1.5.2.1
--- lams_common/test/java/org/lamsfoundation/lams/theme/service/TestThemeService.java	17 Sep 2006 06:14:24 -0000	1.5
+++ lams_common/test/java/org/lamsfoundation/lams/theme/service/TestThemeService.java	12 Mar 2007 01:30:28 -0000	1.5.2.1
@@ -69,7 +69,7 @@
     }
 
 	public void testGetTheme() throws Exception{		
-		String str = themeService.getTheme(TEST_THEME_ID);
+		String str = themeService.getThemeWDDX(TEST_THEME_ID);
 		System.out.println(str);
 		assertTrue("Finds ruby theme", str.indexOf("ruby") != -1);
 	}