Index: lams_common/build.xml
===================================================================
diff -u -r71ff446b60d26d2101ef0dd76df844e87358a012 -r4b196cccfe15e110611808070d9387e0bb35a8d9
--- lams_common/build.xml	(.../build.xml)	(revision 71ff446b60d26d2101ef0dd76df844e87358a012)
+++ lams_common/build.xml	(.../build.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -5,217 +5,128 @@
 Ant build file. 
 -->
 <!DOCTYPE project [
-    <!ENTITY database SYSTEM "file:./conf/middlegen/mysql.xml">
+	<!ENTITY properties SYSTEM "file:./properties.xml">
 ]>
 
+<project name="LAMS" basedir="." default="usage">
 
-<project name="Middlegen Hibernate" default="all" basedir=".">
-	
-   <property name="name" value="learningdesign"/>	
-   <property name="script_file" value="create_lams_11_tables"/>
-	
-   <property name="middlegen.dir" value="${basedir}/conf/middlegen"/>	
-	
-   <property name="gui"                            value="true"/>
-   <property name="unique.name"                    value="${name}"/>
-   <property name="lib.dir"                        value="${basedir}/lib"/>	
-   <property name="script.dir"                     value="${basedir}/db/sql"/>   
-   <property name="src.dir"                        value="${basedir}/src"/>
-   <property name="java.src.dir"                   value="${src.dir}/java/com/lamsinternational/lams"/>
-   <property name="java.src.learningdesign.dir"  value="${java.src.dir}/learningdesign"/>  	
-   <property name="web.src.dir"                    value="${basedir}/web/WEB-INF"/>
-   <property name="conf.dir"                      value="${basedir}/conf"/>
-   <property name="hibernate.dir"				  value="${conf.dir}/hibernate"/>	
-   <property name="mappings.dir"                 value="${hibernate.dir}/mappings"/>
-   <property name="learningdesign.dir"			  value="${mappings.dir}/learningdesign"/>	
-    	
-   &database;
-   
-   <!-- define the datasource.jndi.name in case the imported ejb file doesn't -->
-   <property name="datasource.jndi.name"           value="${name}/datasource"/>
+	<!-- import properties from the specified file -->
+	&properties;
 
-   <path id="lib.class.path">
-      <pathelement path="${database.driver.classpath}"/>
-      <fileset dir="${lib.dir}">
-         <include name="**/*.jar"/>
-      </fileset>
-   </path>
+	<path id="all-libs">
+		<fileset dir="${lib.dir}">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
 
-   <target name="init">
-      <available property="xdoclet1.2+" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="lib.class.path"/>
-   </target>
+	<target name="usage">
+		<echo message=""/>
+		<echo message="${project.name} build file"/>
+		<echo message="------------------------------------------------------"/>
+		<echo message=""/>
+		<echo message="Among the available targets are:"/>
+		<echo message=""/>
+		<echo message="middlegen-learningdesign    --> Run middlegen for learningdesign tables"/>
+		<echo message="hbm2java-learningdesign  --> Run hbm2java for learningdesign mapping files"/>
+		<echo message=""/>
+	</target>
 
-   <!-- =================================================================== -->
-   <!-- Fails if XDoclet 1.2.x is not on classpath                          -->
-   <!-- =================================================================== -->
-   <target name="fail-if-no-xdoclet-1.2" unless="xdoclet1.2+">
-      <fail>
-      You must download several jar files before you can build Middlegen.
-      </fail>
-   </target>
+	<target name="init">
+		<available property="xdoclet-jars-installed" file="lib/xdoclet/xdoclet-${xdoclet.version}.jar"/>
+	</target>
 
-   <!-- =================================================================== -->
-   <!-- Create tables                                                       -->
-   <!-- =================================================================== -->
-   <target 
-      name="create-tables" 
-      depends="init,fail-if-no-xdoclet-1.2,check-driver-present,panic-if-driver-not-present" 
-      description="Create tables"
-   >
-      <echo>Creating tables using URL ${database.url}</echo>
-      <sql
-         classpath="${database.driver.classpath}"
-         driver="${database.driver}"
-         url="${database.url}"
-         userid="${database.userid}"
-         password="${database.password}"
-         src="${database.script.file}"
-         print="true"
-         output="result.txt"
-      />
-   </target>
-   <target name="check-driver-present">
-      <available file="${database.driver.file}" type="file" property="driver.present"/>
-   </target>
-   <target name="panic-if-driver-not-present" unless="driver.present">
-      <fail>
-      The JDBC driver you have specified by including one of the files in ${middlegen.dir}
-      doesn't exist. You have to download this driver separately and put it in ${database.driver.file}
-      Please make sure you're using a version that is equal or superior to the one we looked for.
-      If you name the driver jar file differently, please update the database.driver.file property
-      in the ${middlegen.dir}/xxx.xml file accordingly.
-      </fail>
-   </target>
+	<!-- =================================================================== -->
+	<!-- Fails if XDoclet 1.2.x is not on classpath                          -->
+	<!-- =================================================================== -->
+	<target name="fail-if-no-xdoclet-1.2.x" unless="xdoclet-jars-installed">
+		<fail>
+	      You must download several jar files before you can build Middlegen.
+	      Execute the "download-deps" target. Then try to build again.
 
-   <!-- =================================================================== -->
-   <!-- Run Middlegen                                                       -->
-   <!-- =================================================================== -->
-   <target 
-      name="middlegen" 
-      description="Run Middlegen" 
+	      If you are behind a proxy, you should define the properties
+	      http.proxyHost and http.proxyPort. Example:
+	      
+	      ant -Dhttp.proxyHost=foo.com -Dhttp.proxyPort=8080
+	      
+	      It's also possible to download the jars manually.
+	     </fail>
+	</target>
+
+	<target name="check-driver-present">
+		<available file="${database.driver.file}" type="file" property="driver.present"/>
+	</target>
+	<target name="panic-if-driver-not-present" unless="driver.present">
+		<fail>
+	      The JDBC driver you have specified by including one of the files in ${basedir}/config/database
+	      doesn't exist. You have to download this driver separately and put it in ${database.driver.file}
+	      Please make sure you're using a version that is equal or superior to the one we looked for.
+	      If you name the driver jar file differently, please update the database.driver.file property
+	      in the ${basedir}/config/database/xxx.xml file accordingly.
+	     </fail>
+	</target>
+
+
+	<!-- =================================================================== -->
+	<!-- Run Middlegen For LearningDesign                                                       -->
+	<!-- =================================================================== -->
+	<target 
+      name="middlegen-learningdesign" 
+      description="Run Middlegen For LearningDesign" 
       unless="middlegen.skip"
-      depends="init,fail-if-no-xdoclet-1.2,check-driver-present,panic-if-driver-not-present"
-   >
-   	  <mkdir dir="${learningdesign.dir}"/>
-   	
-      <taskdef
-         name="middlegen"
+      depends="init,fail-if-no-xdoclet-1.2.x,check-driver-present,panic-if-driver-not-present"
+    >
+		<taskdef
+         name="middlegen-learningdesign"
          classname="middlegen.MiddlegenTask"
-         classpathref="lib.class.path"
-      />
+         classpathref="all-libs"
+        />
 
-      <middlegen
-         appname="${name}"
+		<middlegen-learningdesign
+         appname="learningdesign"
          prefsdir="${middlegen.dir}"
          gui="${gui}"
          databaseurl="${database.url}"
-         initialContextFactory="${java.naming.factory.initial}"
-         providerURL="${java.naming.provider.url}"
-         datasourceJNDIName="${datasource.jndi.name}"
          driver="${database.driver}"
          username="${database.userid}"
          password="${database.password}"
          schema="${database.schema}"
          catalog="${database.catalog}"
-      >
+         includeViews="false"
+        >
 
-         <!--
-         We can specify what tables we want Data generated for.
-         If none are specified, Data will be generated for all tables.
-         Comment out the <table> elements if you want to generate for all tables.
-         Also note that table names are CASE SENSITIVE for certain databases,
-         so on e.g. Oracle you should specify table names in upper case.
-         -->
-         <!--table generate="true" name="flights" pktable="flights_pk"/-->
+			<hibernate 
+			destination="${hbm.dir}"
+			package="${package.learningdesign.name}"
+            genXDocletTags="true"
+            javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
+            />
 
-      	 <table name="lams_learning_activity"/>  	      	
-		 <table name="lams_learning_design"/>
-     	 <table name="lams_learning_library"/>      	
-         <table name="lams_learning_transition"/>		
-      	 <table name="lams_group"/>      	
-      	 <table name="lams_grouping"/>      	
+			<table name="lams_learning_activity"/>
+			<table name="lams_learning_design"/>
+			<table name="lams_learning_library"/>
+			<table name="lams_learning_transition"/>
+			<table name="lams_group"/>
+			<table name="lams_grouping"/>
 
-         <!--
-         If you want m:n relations, they must be specified like this.
-         Note that tables declare in multiple locations must all have
-         the same value of the generate attribute.
-         -->
-         <!--many2many>
-            <tablea generate="true" name="persons"/>
-            <jointable name="reservations" generate="false"/>
-            <tableb generate="true" name="flights"/>
-         </many2many-->
+		</middlegen-learningdesign>
 
+	</target>
 
-         <!-- Plugins - Only Hibernate Plugin has been included with this special distribution  -->
-         
-         <!--
-         If you want to generate XDoclet markup for hbm2java to include in the POJOs then
-         set genXDocletTags to true. Also, composite keys are generated as external classes which is
-         recommended. If you wish to keep them internal then set genIntergratedCompositeKeys to true.
-         Since r4 the ability to customise the selection of JavaTypes is now provided. The is a 
-         recommended type mapper provided as shown. It is optional - if not provided then Middlegen
-         itself will select the Java mapping (as it did previously).
-         These settings are optional thus if they are not define here values default to false.
-         -->
-         <hibernate
-         	destination="${learningdesign.dir}"
-            package="com.lamsinternational.lams.learningdesign"
-            genXDocletTags="true"
-            genIntergratedCompositeKeys="false"
-            javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
-         />
-         
-      </middlegen>      
-   </target>
-
-	
-   <!-- =================================================================== -->
-   <!-- Compile business logic (hibernate)                                        -->
-   <!-- =================================================================== -->
-   <target name="compile-hibernate" depends="middlegen" description="Compile hibernate Business Domain Model">
-      <javac
-      	srcdir ="${script.dir}"
-      	destdir="${learningdesign.dir}"
-   		classpathref="lib.class.path"
-   	>   	
-         <include name="**/hibernate/**/*"/>
-      </javac>
-   </target>
-   
-   <!-- =================================================================== -->
-   <!-- Run hbm2java    depends="middlegen"                                 -->
-   <!-- =================================================================== -->
-   <target name="hbm2java" description="Generate .java from .hbm files.">
-      <taskdef
-         name="hbm2java"
+	<!-- =================================================================== -->
+	<!-- Run hbm2java for learningdesign                                                       -->
+	<!-- =================================================================== -->
+	<target name="hbm2java-learningdesign" description="Generate .java from .hbm files.">
+		<taskdef
+         name="hbm2java-learningdesign"
          classname="net.sf.hibernate.tool.hbm2java.Hbm2JavaTask"
-         classpathref="lib.class.path"
+         classpathref="all-libs"
       />
-		
-	<hbm2java output="${src.dir}/java">
-			<fileset dir="${learningdesign.dir}/com/lamsinternational/lams/learningdesign">
+		<hbm2java-learningdesign output="${src.java.dir}">
+			<fileset dir="${hbm.dir}/${package.learningdesign.dir}">
 				<include name="*.hbm.xml"/>
-				<!--include name="**/*.hbm.xml"/-->
 			</fileset>
-	</hbm2java>
-   </target>
-   <target name="cleanup" description="Gets rid of the package structure for hbm files">   		
-   		<copy todir="${learningdesign.dir}">
-   			<fileset dir="${learningdesign.dir}/com/lamsinternational/lams/learningdesign"></fileset>
-   		</copy>   		
-   		<delete dir="${learningdesign.dir}/com"/>
-   </target>
+		</hbm2java-learningdesign>
+	</target>
 
-   <!-- =================================================================== -->
-   <!-- Build everything                                                    -->
-   <!-- =================================================================== -->
-   <target name="all" description="Build everything" depends="compile-hibernate"/>
-
-   <!-- =================================================================== -->
-   <!-- Clean everything                                                    -->
-   <!-- =================================================================== -->
-   <target name="clean" description="Clean all generated stuff">
-      <delete dir="${conf.dir}"/>
-   </target>
 </project>
+
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Activity.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class name="com.lamsinternational.lams.learningdesign.Activity" table="lams_learning_activity">
+    <meta attribute="class-description" inherit="false">@hibernate.class table="lams_learning_activity" </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+    <meta attribute="scope-class" inherit="false">public abstract</meta>    
+
+    <id name="activityId" type="java.lang.Long" column="activity_id">
+        <meta attribute="field-description">@hibernate.id generator-class="assigned" type="java.lang.Long" column="activity_id" </meta>
+        <generator class="assigned" />
+    </id>
+
+    <property name="id" type="java.lang.Integer" column="id" length="11" >
+        <meta attribute="field-description">@hibernate.property column="id" length="11" </meta>
+        <meta attribute="use-in-toString">true</meta>    
+    </property>
+    <property name="description" type="java.lang.String" column="description" length="65535" >
+        <meta attribute="field-description">@hibernate.property column="description" length="65535"</meta>    
+        <meta attribute="use-in-toString">true</meta>
+    </property>
+    <property name="title" type="java.lang.String" column="title" length="255">
+        <meta attribute="field-description">@hibernate.property column="title" length="255"</meta>   
+        <meta attribute="use-in-toString">true</meta> 
+    </property>
+    <property name="xcoord" type="java.lang.Integer" column="xcoord" length="11" >
+        <meta attribute="field-description">@hibernate.property column="xcoord" length="11"</meta>    
+        <meta attribute="use-in-toString">true</meta>
+    </property>
+    <property name="ycoord" type="java.lang.Integer" column="ycoord" length="11">
+        <meta attribute="field-description">@hibernate.property column="ycoord" length="11" </meta>    
+        <meta attribute="use-in-toString">true</meta>
+    </property>
+    <property name="orderId" type="java.lang.Integer" column="order_id" length="11">
+    	<meta attribute="field-description">@hibernate.property column="order_id" length="11"</meta>    
+    	<meta attribute="use-in-toString">true</meta>
+    </property>
+    <property name="defineLater" type="java.lang.Boolean" column="define_later_flag" not-null="true" length="4">
+        <meta attribute="field-description"> @hibernate.property column="define_later_flag" length="4" not-null="true" </meta>    
+        <meta attribute="use-in-toString">true</meta>
+    </property>
+    <property name="createDateTime" type="java.sql.Timestamp" column="create_date_time" not-null="true" length="19">
+    	<meta attribute="field-description">@hibernate.property column="create_date_time" length="19" not-null="true" </meta>    
+    	<meta attribute="use-in-toString">true</meta>
+    </property>
+    <property name="offlineInstructions" type="java.lang.String" column="offline_instructions" length="65535">
+        <meta attribute="field-description">@hibernate.property column="offline_instructions" length="65535"</meta>    
+        <meta attribute="use-in-toString">true</meta>
+    </property>
+    
+    <!-- Associations -->
+  
+    <!-- bi-directional many-to-one association to Grouping -->
+    <many-to-one
+        name="grouping"
+        class="com.lamsinternational.lams.learningdesign.Grouping"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="grouping_id"         
+        </meta>
+        <column name="grouping_id" />
+    </many-to-one>
+    <!-- bi-directional many-to-one association to LearningLibrary -->
+    <many-to-one
+        name="learningLibrary"
+        class="com.lamsinternational.lams.learningdesign.LearningLibrary"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="learning_library_id"         
+        </meta>
+        <column name="learning_library_id" />
+    </many-to-one>
+    <!-- bi-directional many-to-one association to LearningDesign -->
+    <many-to-one
+        name="learningDesign"
+        class="com.lamsinternational.lams.learningdesign.LearningDesign"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="learning_design_id"         
+        </meta>
+        <column name="learning_design_id" />
+    </many-to-one>
+    <!-- bi-directional one-to-many association to Transition -->
+    <set
+        name="transitionsByToActivityId"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="to_activity_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Transition"
+        </meta>
+        <key>
+            <column name="to_activity_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Transition"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to Transition -->
+    <set
+        name="transitionsByFromActivityId"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="from_activity_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Transition"
+        </meta>
+        <key>
+            <column name="from_activity_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Transition"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to Activity -->
+    <set
+        name="activities"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="parent_activity_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key>
+            <column name="parent_activity_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        />
+    </set>
+    <!-- bi-directional many-to-one association to Activity -->
+    <many-to-one
+        name="activity"
+        class="com.lamsinternational.lams.learningdesign.Activity"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="parent_activity_id"         
+        </meta>
+        <column name="parent_activity_id" />
+    </many-to-one>
+     <subclass name="com.lamsinternational.lams.learningdesign.SimpleActivity">
+     	 <meta attribute="class-description" inherit="false">@hibernate.class </meta>
+         <meta attribute="scope-class" inherit="false">public abstract</meta>
+			<subclass name="com.lamsinternational.lams.learningdesign.ToolActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+			</subclass>
+			<subclass name="com.lamsinternational.lams.learningdesign.GroupingActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>				
+				<subclass name="com.lamsinternational.lams.learningdesign.ChosenGroupingActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>
+				<subclass name="com.lamsinternational.lams.learningdesign.RandomGroupingActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>				
+			</subclass>
+			<subclass name="com.lamsinternational.lams.learningdesign.GateActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+							
+				<property name="gateStartDateTime" type="java.sql.Timestamp" column="gate_start_date_time" length="19">
+        			<meta attribute="field-description">@hibernate.property column="gate_start_date_time" length="19"</meta>    
+        			<meta attribute="use-in-toString">true</meta>
+			    </property>
+			    <property name="gateEndDateTime" type="java.sql.Timestamp" column="gate_end_date_time" length="19" >
+			    	<meta attribute="field-description">@hibernate.property column="gate_end_date_time" length="19" </meta>    
+			    	<meta attribute="use-in-toString">true</meta>
+			    </property>				
+				<subclass name="com.lamsinternational.lams.learningdesign.ScheduleGateActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>
+				<subclass name="com.lamsinternational.lams.learningdesign.SynchGateActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>
+				<subclass name="com.lamsinternational.lams.learningdesign.PermissionGateActivity">
+					<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				</subclass>
+			</subclass>			
+	</subclass>
+
+	<subclass name="com.lamsinternational.lams.learningdesign.ComplexActivity">
+		<meta attribute="class-description" inherit="false">@hibernate.class </meta>			
+	    <meta attribute="scope-class" inherit="false">public abstract</meta>
+			<subclass name="com.lamsinternational.lams.learningdesign.OptionsActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+				<property name="maxNumberOfOptions" type="java.lang.Integer" column="max_number_of_options" length="5">
+					<meta attribute="field-description">@hibernate.property column="max_number_of_options" length="5"</meta>    
+					<meta attribute="use-in-toString">true</meta>
+				</property>
+			    <property name="minNumberOfOptions" type="java.lang.Integer" column="min_number_of_options" length="5">
+					<meta attribute="field-description">@hibernate.property column="min_number_of_options" length="5"</meta> 
+					<meta attribute="use-in-toString">true</meta>
+			    </property>
+			</subclass>
+			<subclass name="com.lamsinternational.lams.learningdesign.SequenceActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+			</subclass>
+			<subclass name="com.lamsinternational.lams.learningdesign.ParallelActivity">
+				<meta attribute="class-description" inherit="false">@hibernate.class </meta>
+			</subclass>
+	</subclass>
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Group.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.learningdesign.Group" 
+    table="lams_group"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_group"
+    </meta>
+
+    <id
+        name="groupId"
+        type="java.lang.Long"
+        column="group_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="assigned"
+            type="java.lang.Long"
+            column="group_id"
+
+
+        </meta>
+        <generator class="assigned" />
+    </id>
+
+    <property
+        name="orderId"
+        type="int"
+        column="order_id"
+        not-null="true"
+        length="6"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="order_id"
+            length="6"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional many-to-one association to Grouping -->
+    <many-to-one
+        name="grouping"
+        class="com.lamsinternational.lams.learningdesign.Grouping"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="grouping_id"         
+        </meta>
+        <column name="grouping_id" />
+    </many-to-one>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Grouping.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.learningdesign.Grouping" 
+    table="lams_grouping"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_grouping"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="groupingId"
+        type="java.lang.Long"
+        column="grouping_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="assigned"
+            type="java.lang.Long"
+            column="grouping_id"
+
+
+        </meta>
+        <generator class="assigned" />
+    </id>
+
+    <property
+        name="numberOfGroups"
+        type="java.lang.Integer"
+        column="number_of_groups"
+        length="11"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="number_of_groups"
+            length="11"
+        </meta>    
+    </property>
+    <property
+        name="learnersPerGroup"
+        type="java.lang.Integer"
+        column="learners_per_group"
+        length="11"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="learners_per_group"
+            length="11"
+        </meta>    
+    </property>
+    <property
+        name="staffGroupId"
+        type="java.lang.Long"
+        column="staff_group_id"
+        length="20"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="staff_group_id"
+            length="20"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional one-to-many association to Group -->
+    <set
+        name="groups"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="grouping_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Group"
+        </meta>
+        <key>
+            <column name="grouping_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Group"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to Activity -->
+    <set
+        name="activities"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="grouping_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key>
+            <column name="grouping_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,338 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.learningdesign.LearningDesign" 
+    table="lams_learning_design"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_learning_design"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="learningDesignId"
+        type="java.lang.Long"
+        column="learning_design_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="assigned"
+            type="java.lang.Long"
+            column="learning_design_id"
+
+
+        </meta>
+        <generator class="assigned" />
+    </id>
+
+    <property
+        name="id"
+        type="java.lang.Integer"
+        column="id"
+        length="11"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="id"
+            length="11"
+        </meta>    
+    </property>
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="description"
+            length="65535"
+        </meta>    
+    </property>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        length="255"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="title"
+            length="255"
+        </meta>    
+    </property>
+    <property
+        name="firstActivityId"
+        type="java.lang.Long"
+        column="first_activity_id"
+        length="20"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="first_activity_id"
+            length="20"
+        </meta>    
+    </property>
+    <property
+        name="maxId"
+        type="java.lang.Integer"
+        column="max_id"
+        length="11"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="max_id"
+            length="11"
+        </meta>    
+    </property>
+    <property
+        name="validDesign"
+        type="java.lang.Boolean"
+        column="valid_design_flag"
+        not-null="true"
+        length="4"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="valid_design_flag"
+            length="4"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="readOnly"
+        type="java.lang.Boolean"
+        column="read_only_flag"
+        not-null="true"
+        length="4"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="read_only_flag"
+            length="4"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="dateReadOnly"
+        type="java.sql.Timestamp"
+        column="date_read_only"
+        length="19"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="date_read_only"
+            length="19"
+        </meta>    
+    </property>
+    <property
+        name="readAccess"
+        type="java.lang.Long"
+        column="read_access"
+        length="20"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="read_access"
+            length="20"
+        </meta>    
+    </property>
+    <property
+        name="writeAccess"
+        type="java.lang.Long"
+        column="write_access"
+        length="20"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="write_access"
+            length="20"
+        </meta>    
+    </property>
+    <property
+        name="helpText"
+        type="java.lang.String"
+        column="help_text"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="help_text"
+            length="65535"
+        </meta>    
+    </property>
+    <property
+        name="lessonCopy"
+        type="java.lang.Boolean"
+        column="lesson_copy_flag"
+        not-null="true"
+        length="4"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="lesson_copy_flag"
+            length="4"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="createDateTime"
+        type="java.sql.Timestamp"
+        column="create_date_time"
+        not-null="true"
+        length="19"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="create_date_time"
+            length="19"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="version"
+        type="java.lang.String"
+        column="version"
+        not-null="true"
+        length="56"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="version"
+            length="56"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="openDateTime"
+        type="java.sql.Timestamp"
+        column="open_date_time"
+        length="19"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="open_date_time"
+            length="19"
+        </meta>    
+    </property>
+    <property
+        name="closeDateTime"
+        type="java.sql.Timestamp"
+        column="close_date_time"
+        length="19"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="close_date_time"
+            length="19"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional one-to-many association to LearningDesign -->
+    <set
+        name="learningDesigns"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="parent_learning_design_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.LearningDesign"
+        </meta>
+        <key>
+            <column name="parent_learning_design_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.LearningDesign"
+        />
+    </set>
+    <!-- bi-directional many-to-one association to LearningDesign -->
+    <many-to-one
+        name="learningDesign"
+        class="com.lamsinternational.lams.learningdesign.LearningDesign"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="parent_learning_design_id"         
+        </meta>
+        <column name="parent_learning_design_id" />
+    </many-to-one>
+    <!-- bi-directional one-to-many association to Transition -->
+    <set
+        name="transitions"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="learning_design_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Transition"
+        </meta>
+        <key>
+            <column name="learning_design_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Transition"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to Activity -->
+    <set
+        name="activities"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="learning_design_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key>
+            <column name="learning_design_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.learningdesign.LearningLibrary" 
+    table="lams_learning_library"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_learning_library"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="learningLibraryId"
+        type="java.lang.Long"
+        column="learning_library_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="assigned"
+            type="java.lang.Long"
+            column="learning_library_id"
+
+
+        </meta>
+        <generator class="assigned" />
+    </id>
+
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="description"
+            length="65535"
+        </meta>    
+    </property>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        length="255"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="title"
+            length="255"
+        </meta>    
+    </property>
+    <property
+        name="createDateTime"
+        type="java.sql.Timestamp"
+        column="create_date_time"
+        not-null="true"
+        length="19"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="create_date_time"
+            length="19"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional one-to-many association to Activity -->
+    <set
+        name="activities"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="learning_library_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        </meta>
+        <key>
+            <column name="learning_library_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.Activity"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Transition.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Transition.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/Transition.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.learningdesign.Transition" 
+    table="lams_learning_transition"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_learning_transition"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="transitionId"
+        type="java.lang.Long"
+        column="transition_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="assigned"
+            type="java.lang.Long"
+            column="transition_id"
+
+
+        </meta>
+        <generator class="assigned" />
+    </id>
+
+    <property
+        name="id"
+        type="java.lang.Integer"
+        column="id"
+        length="11"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="id"
+            length="11"
+        </meta>    
+    </property>
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="description"
+            length="65535"
+        </meta>    
+    </property>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        length="255"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="title"
+            length="255"
+        </meta>    
+    </property>
+    <property
+        name="createDateTime"
+        type="java.sql.Timestamp"
+        column="create_date_time"
+        not-null="true"
+        length="19"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="create_date_time"
+            length="19"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional many-to-one association to LearningDesign -->
+    <many-to-one
+        name="learningDesign"
+        class="com.lamsinternational.lams.learningdesign.LearningDesign"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="learning_design_id"         
+        </meta>
+        <column name="learning_design_id" />
+    </many-to-one>
+    <!-- bi-directional many-to-one association to Activity -->
+    <many-to-one
+        name="activityByToActivityId"
+        class="com.lamsinternational.lams.learningdesign.Activity"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="to_activity_id"         
+        </meta>
+        <column name="to_activity_id" />
+    </many-to-one>
+    <!-- bi-directional many-to-one association to Activity -->
+    <many-to-one
+        name="activityByFromActivityId"
+        class="com.lamsinternational.lams.learningdesign.Activity"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="from_activity_id"         
+        </meta>
+        <column name="from_activity_id" />
+    </many-to-one>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/AuthenticationMethod.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/AuthenticationMethod.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/AuthenticationMethod.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.usermanagement.AuthenticationMethod" 
+    table="lams_authentication_method"
+    proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_authentication_method"
+        proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="authenticationMethodId"
+        type="java.lang.Integer"
+        column="authentication_method_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Integer"
+            column="authentication_method_id"
+
+
+        </meta>
+        <meta attribute="use-in-equals">true</meta>
+        <generator class="native" />
+    </id>
+
+    <property
+        name="authenticationMethodName"
+        type="java.lang.String"
+        column="authentication_method_name"
+        not-null="true"
+        unique="true"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="authentication_method_name"
+            unique="true"
+            length="64"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional many-to-one association to AuthenticationMethodType -->
+    <many-to-one
+        name="authenticationMethodType"
+        class="com.lamsinternational.lams.usermanagement.AuthenticationMethodType"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="authentication_method_type_id"         
+        </meta>
+        <column name="authentication_method_type_id" />
+    </many-to-one>
+    <!-- bi-directional one-to-many association to User -->
+    <set
+        name="users"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="authentication_method_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.User"
+        </meta>
+        <key>
+            <column name="authentication_method_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.User"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to AuthenticationMethodParameter -->
+    <set
+        name="authenticationMethodParameters"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="authentication_method_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.AuthenticationMethodParameter"
+        </meta>
+        <key>
+            <column name="authentication_method_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.AuthenticationMethodParameter"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/AuthenticationMethodType.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/AuthenticationMethodType.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/AuthenticationMethodType.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.usermanagement.AuthenticationMethodType" 
+    table="lams_authentication_method_type"
+    proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethodType"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_authentication_method_type"
+        proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethodType"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="authenticationMethodTypeId"
+        type="java.lang.Integer"
+        column="authentication_method_type_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Integer"
+            column="authentication_method_type_id"
+
+
+        </meta>
+        <meta attribute="use-in-equals">true</meta>
+        <generator class="native" />
+    </id>
+
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        not-null="true"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="description"
+            length="64"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional one-to-many association to AuthenticationMethod -->
+    <set
+        name="authenticationMethods"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="authentication_method_type_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
+        </meta>
+        <key>
+            <column name="authentication_method_type_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Organisation.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Organisation.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Organisation.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,228 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.usermanagement.Organisation" 
+    table="lams_organisation"
+    proxy="com.lamsinternational.lams.usermanagement.Organisation"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_organisation"
+        proxy="com.lamsinternational.lams.usermanagement.Organisation"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="organisationId"
+        type="java.lang.Integer"
+        column="organisation_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Integer"
+            column="organisation_id"
+
+
+        </meta>
+        <meta attribute="use-in-equals">true</meta>
+        <generator class="native" />
+    </id>
+
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        length="250"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="name"
+            length="250"
+        </meta>    
+    </property>
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="250"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="description"
+            length="250"
+        </meta>    
+    </property>
+    <property
+        name="createDate"
+        type="java.sql.Timestamp"
+        column="create_date"
+        not-null="true"
+        length="19"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="create_date"
+            length="19"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional many-to-one association to Workspace -->
+    <many-to-one
+        name="workspace"
+        class="com.lamsinternational.lams.usermanagement.Workspace"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="workspace_id"         
+        </meta>
+        <column name="workspace_id" />
+    </many-to-one>
+    <!-- bi-directional many-to-one association to OrganisationType -->
+    <many-to-one
+        name="organisationType"
+        class="com.lamsinternational.lams.usermanagement.OrganisationType"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="organisation_type_id"         
+        </meta>
+        <column name="organisation_type_id" />
+    </many-to-one>
+    <!-- bi-directional one-to-many association to UserOrganisation -->
+    <set
+        name="userOrganisations"
+        lazy="true"
+        inverse="true"
+		cascade="all-delete-orphan"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="all-delete-orphan"
+
+           @hibernate.collection-key
+            column="organisation_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.UserOrganisation"
+        </meta>
+        <key>
+            <column name="organisation_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.UserOrganisation"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to WorkspaceFolder -->
+    <set
+        name="childOrganisations"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="parent_folder_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.Organisation"
+        </meta>
+        <key>
+            <column name="parent_folder_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.Organisation"
+        />
+    </set>
+    <!-- bi-directional many-to-one association to Organisation -->
+    <many-to-one
+        name="parentOrganisation"
+        class="com.lamsinternational.lams.usermanagement.Organisation"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+           @hibernate.column name="parent_folder_id"         
+        </meta>
+        <column name="parent_folder_id" />
+    </many-to-one>
+    <!-- bi-directional one-to-many association to User -->
+    <set
+        name="users"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="base_organisation_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.User"
+        </meta>
+        <key>
+            <column name="base_organisation_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.User"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to Lesson -->
+    <set
+        name="lessons"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="organisation_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.lesson.Lesson"
+        </meta>
+        <key>
+            <column name="organisation_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.lesson.Lesson"
+        />
+    </set>
+
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/OrganisationType.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/OrganisationType.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/OrganisationType.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.usermanagement.OrganisationType" 
+    table="lams_organisation_type"
+    proxy="com.lamsinternational.lams.usermanagement.OrganisationType"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_organisation_type"
+        proxy="com.lamsinternational.lams.usermanagement.OrganisationType"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="organisationTypeId"
+        type="java.lang.Integer"
+        column="organisation_type_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="increment"
+            type="java.lang.Integer"
+            column="organisation_type_id"
+
+
+        </meta>
+        <meta attribute="use-in-equals">true</meta>
+        <generator class="increment" />
+    </id>
+
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        unique="true"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="name"
+            unique="true"
+            length="64"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        not-null="true"
+        length="255"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="description"
+            length="255"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional one-to-many association to Organisation -->
+    <set
+        name="organisations"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="organisation_type_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.Organisation"
+        </meta>
+        <key>
+            <column name="organisation_type_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.Organisation"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Role.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Role.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Role.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.usermanagement.Role" 
+    table="lams_role"
+    proxy="com.lamsinternational.lams.usermanagement.Role"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_role"
+        proxy="com.lamsinternational.lams.usermanagement.Role"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="roleId"
+        type="java.lang.Integer"
+        column="role_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Integer"
+            column="role_id"
+
+
+        </meta>
+        <generator class="native" />
+    </id>
+
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        length="64"
+    >
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="name"
+            length="64"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="65535"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="description"
+            length="65535"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional one-to-many association to UserOrganisationRole -->
+    <set
+        name="userOrganisationRoles"
+        lazy="true"
+        inverse="true"
+		cascade="delete-orphan"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="delete-orphan"
+
+           @hibernate.collection-key
+            column="role_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
+        </meta>
+        <key>
+            <column name="role_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/User.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/User.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/User.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,469 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.usermanagement.User" 
+    table="lams_user"
+    proxy="com.lamsinternational.lams.usermanagement.User"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_user"
+        proxy="com.lamsinternational.lams.usermanagement.User"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="userId"
+        type="java.lang.Integer"
+        column="user_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Integer"
+            column="user_id"
+
+
+        </meta>
+        <generator class="native" />
+    </id>
+
+    <property
+        name="login"
+        type="java.lang.String"
+        column="login"
+        not-null="true"
+        unique="true"
+        length="20"
+    >
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="login"
+            unique="true"
+            length="20"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="password"
+        type="java.lang.String"
+        column="password"
+        not-null="true"
+        length="50"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="password"
+            length="50"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="title"
+        type="java.lang.String"
+        column="title"
+        length="32"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="title"
+            length="32"
+        </meta>    
+    </property>
+    <property
+        name="firstName"
+        type="java.lang.String"
+        column="first_name"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="first_name"
+            length="64"
+        </meta>    
+    </property>
+    <property
+        name="lastName"
+        type="java.lang.String"
+        column="last_name"
+        length="128"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="last_name"
+            length="128"
+        </meta>    
+    </property>
+    <property
+        name="addressLine1"
+        type="java.lang.String"
+        column="address_line_1"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="address_line_1"
+            length="64"
+        </meta>    
+    </property>
+    <property
+        name="addressLine2"
+        type="java.lang.String"
+        column="address_line_2"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="address_line_2"
+            length="64"
+        </meta>    
+    </property>
+    <property
+        name="addressLine3"
+        type="java.lang.String"
+        column="address_line_3"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="address_line_3"
+            length="64"
+        </meta>    
+    </property>
+    <property
+        name="city"
+        type="java.lang.String"
+        column="city"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="city"
+            length="64"
+        </meta>    
+    </property>
+    <property
+        name="state"
+        type="java.lang.String"
+        column="state"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="state"
+            length="64"
+        </meta>    
+    </property>
+    <property
+        name="country"
+        type="java.lang.String"
+        column="country"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="country"
+            length="64"
+        </meta>    
+    </property>
+    <property
+        name="dayPhone"
+        type="java.lang.String"
+        column="day_phone"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="day_phone"
+            length="64"
+        </meta>    
+    </property>
+    <property
+        name="eveningPhone"
+        type="java.lang.String"
+        column="evening_phone"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="evening_phone"
+            length="64"
+        </meta>    
+    </property>
+    <property
+        name="mobilePhone"
+        type="java.lang.String"
+        column="mobile_phone"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="mobile_phone"
+            length="64"
+        </meta>    
+    </property>
+    <property
+        name="fax"
+        type="java.lang.String"
+        column="fax"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="fax"
+            length="64"
+        </meta>    
+    </property>
+    <property
+        name="email"
+        type="java.lang.String"
+        column="email"
+        length="128"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="email"
+            length="128"
+        </meta>    
+    </property>
+    <property
+        name="disabledFlag"
+        type="java.lang.Boolean"
+        column="disabled_flag"
+        not-null="true"
+        length="1"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="disabled_flag"
+            length="1"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="createDate"
+        type="java.sql.Timestamp"
+        column="create_date"
+        not-null="true"
+        length="19"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="create_date"
+            length="19"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional many-to-one association to Workspace -->
+    <many-to-one
+        name="workspace"
+        class="com.lamsinternational.lams.usermanagement.Workspace"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="workspace_id"         
+        </meta>
+        <column name="workspace_id" />
+    </many-to-one>
+    <!-- bi-directional one-to-many association to UserOrganisation -->
+    <set
+        name="userOrganisations"
+        lazy="true"
+        inverse="true"
+		cascade="all-delete-orphan"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="all-delete-orphan"
+
+           @hibernate.collection-key
+            column="user_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.UserOrganisation"
+        </meta>
+        <key>
+            <column name="user_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.UserOrganisation"
+        />
+    </set>
+    <!-- bi-directional many-to-one association to AuthenticationMethod -->
+    <many-to-one
+        name="authenticationMethod"
+        class="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="authentication_method_id"         
+        </meta>
+        <column name="authentication_method_id" />
+    </many-to-one>
+    <!-- bi-directional many-to-one association to Organisation -->
+    <many-to-one
+        name="lamsOrganisation"
+        class="com.lamsinternational.lams.usermanagement.Organisation"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="base_organisation_id"         
+        </meta>
+        <column name="base_organisation_id" />
+    </many-to-one>
+	<!-- bi-directional one-to-many association to LearnerProgress -->
+    <set
+        name="learnerProgresses"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="user_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.lesson.LearnerProgress"
+        </meta>
+        <key>
+            <column name="user_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.lesson.LearnerProgress"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to UserToolSession -->
+    <set
+        name="userToolSessions"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="user_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.lesson.UserToolSession"
+        </meta>
+        <key>
+            <column name="user_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.lesson.UserToolSession"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to UserGroup -->
+    <set
+        name="userGroups"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="user_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.lesson.UserGroup"
+        </meta>
+        <key>
+            <column name="user_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.lesson.UserGroup"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to LearningDesign -->
+    <set
+        name="learningDesigns"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="user_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.learningdesign.LearningDesign"
+        </meta>
+        <key>
+            <column name="user_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.learningdesign.LearningDesign"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to Lesson -->
+    <set
+        name="lessons"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="user_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.lesson.Lesson"
+        </meta>
+        <key>
+            <column name="user_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.lesson.Lesson"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisation.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisation.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisation.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.usermanagement.UserOrganisation" 
+    table="lams_user_organisation"
+    proxy="com.lamsinternational.lams.usermanagement.UserOrganisation"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_user_organisation"
+        proxy="com.lamsinternational.lams.usermanagement.UserOrganisation"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="userOrganisationId"
+        type="java.lang.Integer"
+        column="user_organisation_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Integer"
+            column="user_organisation_id"
+
+
+        </meta>
+        <generator class="native" />
+    </id>
+
+
+    <!-- Associations -->
+  
+    <!-- bi-directional many-to-one association to User -->
+    <many-to-one
+        name="user"
+        class="com.lamsinternational.lams.usermanagement.User"
+        not-null="true"
+    >
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="user_id"         
+        </meta>
+        <column name="user_id" />
+    </many-to-one>
+    <!-- bi-directional one-to-many association to UserOrganisationRole -->
+    <set
+        name="userOrganisationRoles"
+        lazy="true"
+        inverse="true"
+		cascade="all-delete-orphan"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="all-delete-orphan"
+
+           @hibernate.collection-key
+            column="user_organisation_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
+        </meta>
+        <key>
+            <column name="user_organisation_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
+        />
+    </set>
+    <!-- bi-directional many-to-one association to Organisation -->
+    <many-to-one
+        name="organisation"
+        class="com.lamsinternational.lams.usermanagement.Organisation"
+        not-null="true"
+    >
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="organisation_id"         
+        </meta>
+        <column name="organisation_id" />
+    </many-to-one>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisationRole.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisationRole.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisationRole.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.usermanagement.UserOrganisationRole" 
+    table="lams_user_organisation_role"
+    proxy="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_user_organisation_role"
+        proxy="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="userOrganisationRoleId"
+        type="java.lang.Integer"
+        column="user_organisation_role_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Integer"
+            column="user_organisation_role_id"
+
+
+        </meta>
+        <generator class="native" />
+    </id>
+
+
+    <!-- Associations -->
+  
+    <!-- bi-directional many-to-one association to UserOrganisation -->
+    <many-to-one
+        name="userOrganisation"
+        class="com.lamsinternational.lams.usermanagement.UserOrganisation"
+        not-null="true"
+    >
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="user_organisation_id"         
+        </meta>
+        <column name="user_organisation_id" />
+    </many-to-one>
+    <!-- bi-directional many-to-one association to Role -->
+    <many-to-one
+        name="role"
+        class="com.lamsinternational.lams.usermanagement.Role"
+        not-null="true"
+    >
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="role_id"         
+        </meta>
+        <column name="role_id" />
+    </many-to-one>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Workspace.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Workspace.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Workspace.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.usermanagement.Workspace" 
+    table="lams_workspace"
+    proxy="com.lamsinternational.lams.usermanagement.Workspace"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_workspace"
+        proxy="com.lamsinternational.lams.usermanagement.Workspace"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="workspaceId"
+        type="java.lang.Integer"
+        column="workspace_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Integer"
+            column="workspace_id"
+
+
+        </meta>
+        <meta attribute="use-in-equals">true</meta>
+        <generator class="native" />
+    </id>
+
+
+    <!-- Associations -->
+  
+    <!-- bi-directional one-to-many association to User -->
+    <set
+        name="users"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="workspace_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.User"
+        </meta>
+        <key>
+            <column name="workspace_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.User"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to Organisation -->
+    <set
+        name="organisations"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="workspace_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.Organisation"
+        </meta>
+        <key>
+            <column name="workspace_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.Organisation"
+        />
+    </set>
+    <!-- bi-directional many-to-one association to WorkspaceFolder -->
+    <many-to-one
+        name="workspaceFolder"
+        class="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="root_folder_id"         
+        </meta>
+        <column name="root_folder_id" />
+    </many-to-one>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/WorkspaceFolder.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/WorkspaceFolder.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/WorkspaceFolder.hbm.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,138 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="com.lamsinternational.lams.usermanagement.WorkspaceFolder" 
+    table="lams_workspace_folder"
+    proxy="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_workspace_folder"
+        proxy="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="workspaceFolderId"
+        type="java.lang.Integer"
+        column="workspace_folder_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Integer"
+            column="workspace_folder_id"
+
+
+        </meta>
+        <generator class="native" />
+    </id>
+
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        length="64"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="name"
+            length="64"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="workspaceId"
+        type="int"
+        column="workspace_id"
+        not-null="true"
+        length="11"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="workspace_id"
+            length="11"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional one-to-many association to Workspace -->
+    <set
+        name="workspaces"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="root_folder_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.Workspace"
+        </meta>
+        <key>
+            <column name="root_folder_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.Workspace"
+        />
+    </set>
+    <!-- bi-directional one-to-many association to WorkspaceFolder -->
+    <set
+        name="childWorkspaceFolders"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="parent_folder_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
+        </meta>
+        <key>
+            <column name="parent_folder_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
+        />
+    </set>
+    <!-- bi-directional many-to-one association to WorkspaceFolder -->
+    <many-to-one
+        name="parentWorkspaceFolder"
+        class="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+           @hibernate.column name="parent_folder_id"         
+        </meta>
+        <column name="parent_folder_id" />
+    </many-to-one>
+
+</class>
+</hibernate-mapping>
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/learningdesign/Activity.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/learningdesign/Group.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/learningdesign/Grouping.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/learningdesign/LearningDesign.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/learningdesign/LearningLibrary.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/learningdesign/Transition.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/usermanagement/AuthenticationMethod.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/usermanagement/AuthenticationMethodType.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/usermanagement/Organisation.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/usermanagement/OrganisationType.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/usermanagement/Role.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/usermanagement/User.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/usermanagement/UserOrganisation.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/usermanagement/UserOrganisationRole.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/usermanagement/Workspace.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/usermanagement/WorkspaceFolder.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/middlegen/config/database/mysql.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/middlegen/config/lams-prefs.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/conf/middlegen/learningdesign-prefs.properties
===================================================================
diff -u -r172c2c0a186d25d41bed11cd1bf4de4d623942fd -r4b196cccfe15e110611808070d9387e0bb35a8d9
--- lams_common/conf/middlegen/learningdesign-prefs.properties	(.../learningdesign-prefs.properties)	(revision 172c2c0a186d25d41bed11cd1bf4de4d623942fd)
+++ lams_common/conf/middlegen/learningdesign-prefs.properties	(.../learningdesign-prefs.properties)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -6,32 +6,25 @@
 hibernate.tables.lams_group.columns.grouping_id.java-type=long
 hibernate.tables.lams_group.columns.order_id.java-name=orderId
 hibernate.tables.lams_group.columns.order_id.java-type=int
-hibernate.tables.lams_group.keygenerator=assigned
 hibernate.tables.lams_grouping.base-class-name=Grouping
 hibernate.tables.lams_grouping.columns.grouping_id.java-name=groupingId
 hibernate.tables.lams_grouping.columns.grouping_id.java-type=java.lang.Long
 hibernate.tables.lams_grouping.columns.grouping_type_id.java-name=groupingTypeId
 hibernate.tables.lams_grouping.columns.grouping_type_id.java-type=int
-hibernate.tables.lams_grouping.columns.learners_per_group.columnspecialty=property
 hibernate.tables.lams_grouping.columns.learners_per_group.java-name=learnersPerGroup
 hibernate.tables.lams_grouping.columns.learners_per_group.java-type=java.lang.Integer
-hibernate.tables.lams_grouping.columns.number_of_groups.columnspecialty=property
 hibernate.tables.lams_grouping.columns.number_of_groups.java-name=numberOfGroups
 hibernate.tables.lams_grouping.columns.number_of_groups.java-type=java.lang.Integer
-hibernate.tables.lams_grouping.columns.staff_group_id.columnspecialty=property
 hibernate.tables.lams_grouping.columns.staff_group_id.java-name=staffGroupId
 hibernate.tables.lams_grouping.columns.staff_group_id.java-type=java.lang.Long
-hibernate.tables.lams_grouping.equalshashcode=true
 hibernate.tables.lams_grouping.keygenerator=assigned
-hibernate.tables.lams_learning_activity.base-class-name=Activity
-hibernate.tables.lams_learning_activity.columns.activity_id.columnspecialty=key
+hibernate.tables.lams_learning_activity.base-class-name=LearningActivity
 hibernate.tables.lams_learning_activity.columns.activity_id.java-name=activityId
 hibernate.tables.lams_learning_activity.columns.activity_id.java-type=java.lang.Long
 hibernate.tables.lams_learning_activity.columns.create_date_time.java-name=createDateTime
 hibernate.tables.lams_learning_activity.columns.create_date_time.java-type=java.sql.Timestamp
-hibernate.tables.lams_learning_activity.columns.define_later_flag.columnspecialty=property
-hibernate.tables.lams_learning_activity.columns.define_later_flag.java-name=defineLater
-hibernate.tables.lams_learning_activity.columns.define_later_flag.java-type=java.lang.Boolean
+hibernate.tables.lams_learning_activity.columns.define_later_flag.java-name=defineLaterFlag
+hibernate.tables.lams_learning_activity.columns.define_later_flag.java-type=byte
 hibernate.tables.lams_learning_activity.columns.description.java-name=description
 hibernate.tables.lams_learning_activity.columns.description.java-type=java.lang.String
 hibernate.tables.lams_learning_activity.columns.gate_activity_level_id.java-name=gateActivityLevelId
@@ -40,12 +33,10 @@
 hibernate.tables.lams_learning_activity.columns.gate_end_date_time.java-type=java.sql.Timestamp
 hibernate.tables.lams_learning_activity.columns.gate_start_date_time.java-name=gateStartDateTime
 hibernate.tables.lams_learning_activity.columns.gate_start_date_time.java-type=java.sql.Timestamp
-hibernate.tables.lams_learning_activity.columns.grouping_id.columnspecialty=foreign key
 hibernate.tables.lams_learning_activity.columns.grouping_id.java-name=groupingId
 hibernate.tables.lams_learning_activity.columns.grouping_id.java-type=java.lang.Long
 hibernate.tables.lams_learning_activity.columns.id.java-name=id
 hibernate.tables.lams_learning_activity.columns.id.java-type=java.lang.Integer
-hibernate.tables.lams_learning_activity.columns.learning_activity_type_id.columnspecialty=foreign key
 hibernate.tables.lams_learning_activity.columns.learning_activity_type_id.java-name=learningActivityTypeId
 hibernate.tables.lams_learning_activity.columns.learning_activity_type_id.java-type=int
 hibernate.tables.lams_learning_activity.columns.learning_design_id.java-name=learningDesignId
@@ -60,7 +51,6 @@
 hibernate.tables.lams_learning_activity.columns.offline_instructions.java-type=java.lang.String
 hibernate.tables.lams_learning_activity.columns.order_id.java-name=orderId
 hibernate.tables.lams_learning_activity.columns.order_id.java-type=java.lang.Integer
-hibernate.tables.lams_learning_activity.columns.parent_activity_id.columnspecialty=foreign key
 hibernate.tables.lams_learning_activity.columns.parent_activity_id.java-name=parentActivityId
 hibernate.tables.lams_learning_activity.columns.parent_activity_id.java-type=java.lang.Long
 hibernate.tables.lams_learning_activity.columns.title.java-name=title
@@ -73,15 +63,11 @@
 hibernate.tables.lams_learning_activity.columns.xcoord.java-type=java.lang.Integer
 hibernate.tables.lams_learning_activity.columns.ycoord.java-name=ycoord
 hibernate.tables.lams_learning_activity.columns.ycoord.java-type=java.lang.Integer
-hibernate.tables.lams_learning_activity.equalshashcode=true
-hibernate.tables.lams_learning_activity.keygenerator=assigned
 hibernate.tables.lams_learning_design.base-class-name=LearningDesign
 hibernate.tables.lams_learning_design.columns.close_date_time.java-name=closeDateTime
 hibernate.tables.lams_learning_design.columns.close_date_time.java-type=java.sql.Timestamp
-hibernate.tables.lams_learning_design.columns.create_date_time.columnspecialty=property
 hibernate.tables.lams_learning_design.columns.create_date_time.java-name=createDateTime
 hibernate.tables.lams_learning_design.columns.create_date_time.java-type=java.sql.Timestamp
-hibernate.tables.lams_learning_design.columns.date_read_only.columnspecialty=property
 hibernate.tables.lams_learning_design.columns.date_read_only.java-name=dateReadOnly
 hibernate.tables.lams_learning_design.columns.date_read_only.java-type=java.sql.Timestamp
 hibernate.tables.lams_learning_design.columns.description.java-name=description
@@ -92,78 +78,56 @@
 hibernate.tables.lams_learning_design.columns.help_text.java-type=java.lang.String
 hibernate.tables.lams_learning_design.columns.id.java-name=id
 hibernate.tables.lams_learning_design.columns.id.java-type=java.lang.Integer
-hibernate.tables.lams_learning_design.columns.learning_design_id.columnspecialty=key
 hibernate.tables.lams_learning_design.columns.learning_design_id.java-name=learningDesignId
 hibernate.tables.lams_learning_design.columns.learning_design_id.java-type=java.lang.Long
-hibernate.tables.lams_learning_design.columns.lesson_copy_flag.columnspecialty=property
-hibernate.tables.lams_learning_design.columns.lesson_copy_flag.java-name=lessonCopy
-hibernate.tables.lams_learning_design.columns.lesson_copy_flag.java-type=java.lang.Boolean
+hibernate.tables.lams_learning_design.columns.lesson_copy_flag.java-name=lessonCopyFlag
+hibernate.tables.lams_learning_design.columns.lesson_copy_flag.java-type=byte
 hibernate.tables.lams_learning_design.columns.max_id.java-name=maxId
 hibernate.tables.lams_learning_design.columns.max_id.java-type=java.lang.Integer
 hibernate.tables.lams_learning_design.columns.open_date_time.java-name=openDateTime
 hibernate.tables.lams_learning_design.columns.open_date_time.java-type=java.sql.Timestamp
-hibernate.tables.lams_learning_design.columns.parent_learning_design_id.columnspecialty=foreign key
 hibernate.tables.lams_learning_design.columns.parent_learning_design_id.java-name=parentLearningDesignId
 hibernate.tables.lams_learning_design.columns.parent_learning_design_id.java-type=java.lang.Long
-hibernate.tables.lams_learning_design.columns.read_access.columnspecialty=property
 hibernate.tables.lams_learning_design.columns.read_access.java-name=readAccess
 hibernate.tables.lams_learning_design.columns.read_access.java-type=java.lang.Long
-hibernate.tables.lams_learning_design.columns.read_only_flag.columnspecialty=property
-hibernate.tables.lams_learning_design.columns.read_only_flag.java-name=readOnly
-hibernate.tables.lams_learning_design.columns.read_only_flag.java-type=java.lang.Boolean
+hibernate.tables.lams_learning_design.columns.read_only_flag.java-name=readOnlyFlag
+hibernate.tables.lams_learning_design.columns.read_only_flag.java-type=byte
 hibernate.tables.lams_learning_design.columns.title.java-name=title
 hibernate.tables.lams_learning_design.columns.title.java-type=java.lang.String
-hibernate.tables.lams_learning_design.columns.user_id.columnspecialty=foreign key
 hibernate.tables.lams_learning_design.columns.user_id.java-name=userId
 hibernate.tables.lams_learning_design.columns.user_id.java-type=long
-hibernate.tables.lams_learning_design.columns.valid_design_flag.columnspecialty=property
-hibernate.tables.lams_learning_design.columns.valid_design_flag.java-name=validDesign
-hibernate.tables.lams_learning_design.columns.valid_design_flag.java-type=java.lang.Boolean
+hibernate.tables.lams_learning_design.columns.valid_design_flag.java-name=validDesignFlag
+hibernate.tables.lams_learning_design.columns.valid_design_flag.java-type=byte
 hibernate.tables.lams_learning_design.columns.version.java-name=version
 hibernate.tables.lams_learning_design.columns.version.java-type=java.lang.String
-hibernate.tables.lams_learning_design.columns.write_access.columnspecialty=property
 hibernate.tables.lams_learning_design.columns.write_access.java-name=writeAccess
 hibernate.tables.lams_learning_design.columns.write_access.java-type=java.lang.Long
-hibernate.tables.lams_learning_design.equalshashcode=true
-hibernate.tables.lams_learning_design.keygenerator=assigned
 hibernate.tables.lams_learning_library.base-class-name=LearningLibrary
-hibernate.tables.lams_learning_library.columns.create_date_time.columnspecialty=property
 hibernate.tables.lams_learning_library.columns.create_date_time.java-name=createDateTime
 hibernate.tables.lams_learning_library.columns.create_date_time.java-type=java.sql.Timestamp
-hibernate.tables.lams_learning_library.columns.description.columnspecialty=property
 hibernate.tables.lams_learning_library.columns.description.java-name=description
 hibernate.tables.lams_learning_library.columns.description.java-type=java.lang.String
-hibernate.tables.lams_learning_library.columns.learning_library_id.columnspecialty=key
 hibernate.tables.lams_learning_library.columns.learning_library_id.java-name=learningLibraryId
 hibernate.tables.lams_learning_library.columns.learning_library_id.java-type=java.lang.Long
-hibernate.tables.lams_learning_library.columns.title.columnspecialty=property
 hibernate.tables.lams_learning_library.columns.title.java-name=title
 hibernate.tables.lams_learning_library.columns.title.java-type=java.lang.String
-hibernate.tables.lams_learning_library.equalshashcode=true
-hibernate.tables.lams_learning_library.keygenerator=assigned
-hibernate.tables.lams_learning_transition.base-class-name=Transition
-hibernate.tables.lams_learning_transition.columns.create_date_time.columnspecialty=property
+hibernate.tables.lams_learning_transition.base-class-name=LearningTransition
 hibernate.tables.lams_learning_transition.columns.create_date_time.java-name=createDateTime
 hibernate.tables.lams_learning_transition.columns.create_date_time.java-type=java.sql.Timestamp
 hibernate.tables.lams_learning_transition.columns.description.java-name=description
 hibernate.tables.lams_learning_transition.columns.description.java-type=java.lang.String
-hibernate.tables.lams_learning_transition.columns.from_activity_id.columnspecialty=foreign key
 hibernate.tables.lams_learning_transition.columns.from_activity_id.java-name=fromActivityId
 hibernate.tables.lams_learning_transition.columns.from_activity_id.java-type=long
 hibernate.tables.lams_learning_transition.columns.id.java-name=id
 hibernate.tables.lams_learning_transition.columns.id.java-type=java.lang.Integer
-hibernate.tables.lams_learning_transition.columns.learning_design_id.columnspecialty=foreign key
 hibernate.tables.lams_learning_transition.columns.learning_design_id.java-name=learningDesignId
 hibernate.tables.lams_learning_transition.columns.learning_design_id.java-type=long
 hibernate.tables.lams_learning_transition.columns.title.java-name=title
 hibernate.tables.lams_learning_transition.columns.title.java-type=java.lang.String
-hibernate.tables.lams_learning_transition.columns.to_activity_id.columnspecialty=foreign key
 hibernate.tables.lams_learning_transition.columns.to_activity_id.java-name=toActivityId
 hibernate.tables.lams_learning_transition.columns.to_activity_id.java-type=long
 hibernate.tables.lams_learning_transition.columns.transition_id.java-name=transitionId
 hibernate.tables.lams_learning_transition.columns.transition_id.java-type=java.lang.Long
-hibernate.tables.lams_learning_transition.equalshashcode=true
-hibernate.tables.lams_learning_transition.keygenerator=assigned
 relations.lams_grouping-lams_group.lams_group-has-lams_grouping.enabled=true
 relations.lams_grouping-lams_group.lams_group-has-lams_grouping.target-many=false
 relations.lams_grouping-lams_group.lams_grouping-has-lams_group.enabled=true
@@ -200,15 +164,15 @@
 relations.lams_learning_library-lams_learning_activity.lams_learning_activity-has-lams_learning_library.target-many=false
 relations.lams_learning_library-lams_learning_activity.lams_learning_library-has-lams_learning_activity.enabled=true
 relations.lams_learning_library-lams_learning_activity.lams_learning_library-has-lams_learning_activity.target-many=true
-tables.lams_group.x=47
-tables.lams_group.y=47
-tables.lams_grouping.x=102
-tables.lams_grouping.y=550
-tables.lams_learning_activity.x=1024
-tables.lams_learning_activity.y=50
-tables.lams_learning_design.x=741
-tables.lams_learning_design.y=487
-tables.lams_learning_library.x=234
-tables.lams_learning_library.y=143
-tables.lams_learning_transition.x=140
-tables.lams_learning_transition.y=319
+tables.lams_group.x=50
+tables.lams_group.y=50
+tables.lams_grouping.x=9
+tables.lams_grouping.y=9
+tables.lams_learning_activity.x=110
+tables.lams_learning_activity.y=110
+tables.lams_learning_design.x=70
+tables.lams_learning_design.y=70
+tables.lams_learning_library.x=30
+tables.lams_learning_library.y=30
+tables.lams_learning_transition.x=90
+tables.lams_learning_transition.y=90
Index: lams_common/conf/middlegen/lib/commons-collections-2.1.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/commons-lang-1.0.1.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/commons-logging.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/hibernate-tools.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/hibernate2.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/hsqldb-1.7.1.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/jdom.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/log4j-1.2.7.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/mysql-connector-java-3.0.16-ga-bin.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/velocity-1.4-dev.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/xdoclet-1.2.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/xdoclet-hibernate-module-1.2.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/xdoclet-xdoclet-module-1.2.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/lib/xjavadoc-1.0.2.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/middlegen-lib/middlegen-2.1.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/conf/middlegen/middlegen-lib/middlegen-hibernate-plugin-2.1.jar
===================================================================
diff -u -r8ba64bedf8071eececf7d8bdc5966ed1fc27f090 -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Fisheye: Tag 4b196cccfe15e110611808070d9387e0bb35a8d9 refers to a dead (removed) revision in file `lams_common/conf/middlegen/mysql.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/lib/xdoclet/xdoclet-1.2.2.jar
===================================================================
diff -u
Binary files differ
Index: lams_common/lib/xdoclet/xdoclet-1.2.jar
===================================================================
diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/lib/xdoclet/xdoclet-hibernate-module-1.2.2.jar
===================================================================
diff -u
Binary files differ
Index: lams_common/lib/xdoclet/xdoclet-hibernate-module-1.2.jar
===================================================================
diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/lib/xdoclet/xdoclet-java-module-1.2.2.jar
===================================================================
diff -u
Binary files differ
Index: lams_common/lib/xdoclet/xdoclet-jboss-module-1.2.2.jar
===================================================================
diff -u
Binary files differ
Index: lams_common/lib/xdoclet/xdoclet-spring-module-1.2.2.jar
===================================================================
diff -u
Binary files differ
Index: lams_common/lib/xdoclet/xdoclet-xdoclet-module-1.2.2.jar
===================================================================
diff -u
Binary files differ
Index: lams_common/lib/xdoclet/xdoclet-xdoclet-module-1.2.jar
===================================================================
diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/lib/xdoclet/xjavadoc-1.1.jar
===================================================================
diff -u
Binary files differ
Index: lams_common/lib/xjavadoc/xjavadoc-1.0.2.jar
===================================================================
diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r4b196cccfe15e110611808070d9387e0bb35a8d9
Binary files differ
Index: lams_common/properties.xml
===================================================================
diff -u
--- lams_common/properties.xml	(revision 0)
+++ lams_common/properties.xml	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
@@ -0,0 +1,43 @@
+   	<!-- =================================================================== -->
+   	<!-- note: This is not a proper xml file (there is no root element)      -->
+   	<!--       It defines properties for ant build.xml file                  -->
+   	<!--       It is intended to be imported to ant build.xml file           -->
+   	<!-- =================================================================== -->
+	
+	<!-- progect-wide properties -->
+	<property name="project.name" value="LAMS"/>
+	<property name="product.name" value="LAMS"/>
+	<property name="version" value="1.1"/>
+
+	<!-- xdoclet properties-->	
+	<property name="xdoclet.version" value="1.2.2"/>
+	
+	<!-- path properties -->
+	<property name="lib.dir"                        value="${basedir}/lib"/>
+	<property name="src.dir"                       value="${basedir}/src"/>
+	<property name="src.java.dir"                       value="${basedir}/src/java"/>
+	<property name="conf.dir"                      value="${basedir}/conf"/>
+	<property name="hbm.dir"                 value="${conf.dir}/hibernate/mappings"/>
+	
+	<property name="package.dir"                    value="com/lamsinternational/lams"/>
+	<property name="package.learningdesign.dir"                   value="${package.dir}/learningdesign"/>
+	<property name="package.usermanagement.dir"                   value="${package.dir}/usermanagement"/>
+	
+	<property name="package.name"                        value="com.lamsinternational.lams"/>
+	<property name="package.learningdesign.name"         value="${package.name}.learningdesign"/>
+	<property name="package.usermanagement.name"         value="${package.name}.usermanagement"/>
+	
+	<!--  database related properties -->
+	<property name="database.script.file"           value="${script.dir}/${script_file}.sql"/>
+	<property name="database.driver.file"           value="${lib.dir}/mysql/mysql-connector-java-3.0.16-ga-bin.jar"/>   
+	<property name="database.driver.classpath"      value="${database.driver.file}"/>
+	<property name="database.driver"                value="org.gjt.mm.mysql.Driver"/>
+	<property name="database.url"                   value="jdbc:mysql://localhost/lams"/>
+	<property name="database.userid"                value="root"/>
+	<property name="database.password"              value=""/>
+	<property name="database.schema"                value=""/>
+	<property name="database.catalog"               value=""/>
+
+	<!-- middlegen properties -->
+	<property name="middlegen.dir" value="${conf.dir}/middlegen"/>
+	<property name="gui"                            value="true"/>	
\ No newline at end of file