Index: lams_contentrepository/.classpath
===================================================================
diff -u -r5442f0b50a7695f8bac06aaaf4da7321ca5e7110 -rd8e2914a3858a5324726827f7063e64e40b92708
--- lams_contentrepository/.classpath	(.../.classpath)	(revision 5442f0b50a7695f8bac06aaaf4da7321ca5e7110)
+++ lams_contentrepository/.classpath	(.../.classpath)	(revision d8e2914a3858a5324726827f7063e64e40b92708)
@@ -8,5 +8,6 @@
 	<classpathentry kind="lib" path="lib/junit/junit.jar"/>
 	<classpathentry kind="lib" path="lib/hibernate/hibernate2.jar"/>
 	<classpathentry kind="lib" path="lib/hibernate/hibernate-tools.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta-commons/commons-lang-2.0.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
Index: lams_contentrepository/build.xml
===================================================================
diff -u -r5442f0b50a7695f8bac06aaaf4da7321ca5e7110 -rd8e2914a3858a5324726827f7063e64e40b92708
--- lams_contentrepository/build.xml	(.../build.xml)	(revision 5442f0b50a7695f8bac06aaaf4da7321ca5e7110)
+++ lams_contentrepository/build.xml	(.../build.xml)	(revision d8e2914a3858a5324726827f7063e64e40b92708)
@@ -39,8 +39,8 @@
 		<echo message="lamscr-jar  --> Make jar archive for deployment"/>
 		<echo message="lamscr-war  --> Make war archive for deployment"/>
 <!--		<echo message="copyfiles --> <!--Copy the third party jar files and cofiguration files for deployment"/> -->
-<!--		<echo message="middlegen-learningdesign --> <!-- Run middlegen for learningdesign tables"/> -->
-<!--		<echo message="hbm2java-learningdesign  --> <!-- Run hbm2java for learningdesign mapping files"/> -->
+		<echo message="middlegen-cr --> Run middlegen for content repository tables"/>
+		<echo message="hbm2java-cr--> Run hbm2java for content repository mapping files"/>
 		<echo message=""/>
 	</target>
 
@@ -80,21 +80,21 @@
 
 
 	<!-- =================================================================== -->
-	<!-- Run Middlegen For LearningDesign                                                       -->
+	<!-- Run Middlegen For Content Repository                                -->
 	<!-- =================================================================== -->
 	<target 
-      name="middlegen-learningdesign" 
-      description="Run Middlegen For LearningDesign" 
+      name="middlegen-cr" 
+      description="Run Middlegen For Content Repository tables" 
       unless="middlegen.skip"
       depends="init,fail-if-no-xdoclet-1.2.x,check-driver-present,panic-if-driver-not-present"
     >
 		<taskdef
-         name="middlegen-learningdesign"
+         name="middlegen-cr"
          classname="middlegen.MiddlegenTask"
          classpathref="all-libs"
         />
 
-		<middlegen-learningdesign
+		<middlegen-cr
          appname="learningdesign"
          prefsdir="${middlegen}"
          gui="${gui}"
@@ -109,36 +109,36 @@
 
 			<hibernate 
 			destination="${hbm}"
-			package="${package.learningdesign.name}"
+			package="${package.contentrepository.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_cr_node"/>
+			<table name="lams_cr_node_version"/>
+			<table name="lams_cr_node_version_property"/>
+			<table name="lams_cr_tool"/>
+			<table name="lams_cr_workspace"/>
+			<table name="lams_cr_workspace_tools"/>
 
-		</middlegen-learningdesign>
+		</middlegen-cr>
 
 	</target>
 
 	<!-- =================================================================== -->
-	<!-- Run hbm2java for learningdesign                                                       -->
+	<!-- Run hbm2java for Content Repository                                 -->
 	<!-- =================================================================== -->
-	<target name="hbm2java-learningdesign" description="Generate .java from .hbm files.">
+	<target name="hbm2java-cr" description="Generate .java from .hbm files.">
 		<taskdef
-         name="hbm2java-learningdesign"
+         name="hbm2java-cr"
          classname="net.sf.hibernate.tool.hbm2java.Hbm2JavaTask"
          classpathref="all-libs"
       />
-		<hbm2java-learningdesign output="${src.java}">
-			<fileset dir="${hbm}/${package.learningdesign}">
+		<hbm2java-cr output="${src.java}">
+			<fileset dir="${hbm}/${package.contentrepository}">
 				<include name="*.hbm.xml"/>
 			</fileset>
-		</hbm2java-learningdesign>
+		</hbm2java-cr>
 	</target>
 
 	<target name="print-classpath">
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNode.hbm.xml
===================================================================
diff -u
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNode.hbm.xml	(revision 0)
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNode.hbm.xml	(revision d8e2914a3858a5324726827f7063e64e40b92708)
@@ -0,0 +1,89 @@
+<?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.contentrepository.CrNode" 
+    table="lams_cr_node"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_cr_node"
+    </meta>
+
+    <id
+        name="nodeId"
+        type="java.lang.Long"
+        column="node_id"
+        unsaved-value="0"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="identity"
+            type="java.lang.Long"
+            column="node_id"
+            unsaved-value="0"
+
+
+        </meta>
+        <meta attribute="use-in-equals">true</meta>
+        <generator class="identity" />
+    </id>
+
+    <property
+        name="path"
+        type="java.lang.String"
+        column="path"
+        not-null="true"
+        length="255"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="path"
+            length="255"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional one-to-many association to CrNodeVersion -->
+    <set
+        name="crNodeVersions"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="parent_node_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.contentrepository.CrNodeVersion"
+        </meta>
+        <key>
+            <column name="parent_node_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.contentrepository.CrNodeVersion"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersion.hbm.xml
===================================================================
diff -u
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersion.hbm.xml	(revision 0)
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersion.hbm.xml	(revision d8e2914a3858a5324726827f7063e64e40b92708)
@@ -0,0 +1,150 @@
+<?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.contentrepository.CrNodeVersion" 
+    table="lams_cr_node_version"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_cr_node_version"
+    </meta>
+
+    <id
+        name="id"
+        type="java.lang.Long"
+        column="id"
+        unsaved-value="0"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="identity"
+            type="java.lang.Long"
+            column="id"
+            unsaved-value="0"
+
+
+        </meta>
+        <meta attribute="use-in-equals">true</meta>
+        <generator class="identity" />
+    </id>
+
+    <property
+        name="nodeId"
+        type="long"
+        column="node_id"
+        not-null="true"
+        length="20"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="node_id"
+            length="20"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="versionId"
+        type="long"
+        column="version_id"
+        not-null="true"
+        length="20"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="version_id"
+            length="20"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="createdDateTime"
+        type="java.sql.Timestamp"
+        column="created_date_time"
+        length="14"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="created_date_time"
+            length="14"
+        </meta>    
+    </property>
+    <property
+        name="parentVersionId"
+        type="java.lang.Long"
+        column="parent_version_id"
+        length="20"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="parent_version_id"
+            length="20"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional many-to-one association to CrNode -->
+    <many-to-one
+        name="crNode"
+        class="com.lamsinternational.lams.contentrepository.CrNode"
+        not-null="true"
+    >
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="parent_node_id"         
+        </meta>
+        <column name="parent_node_id" />
+    </many-to-one>
+    <!-- bi-directional one-to-many association to CrNodeVersionProperty -->
+    <set
+        name="crNodeVersionProperties"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="node_id"
+           @hibernate.collection-key
+            column="version_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.contentrepository.CrNodeVersionProperty"
+        </meta>
+        <key>
+            <column name="node_id" />
+            <column name="version_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.contentrepository.CrNodeVersionProperty"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersionProperty.hbm.xml
===================================================================
diff -u
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersionProperty.hbm.xml	(revision 0)
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersionProperty.hbm.xml	(revision d8e2914a3858a5324726827f7063e64e40b92708)
@@ -0,0 +1,111 @@
+<?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.contentrepository.CrNodeVersionProperty" 
+    table="lams_cr_node_version_property"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_cr_node_version_property"
+    </meta>
+
+    <id
+        name="id"
+        type="java.lang.Long"
+        column="id"
+        unsaved-value="0"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="identity"
+            type="java.lang.Long"
+            column="id"
+            unsaved-value="0"
+
+
+        </meta>
+        <meta attribute="use-in-equals">true</meta>
+        <generator class="identity" />
+    </id>
+
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        length="255"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="name"
+            length="255"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="value"
+        type="java.lang.String"
+        column="value"
+        not-null="true"
+        length="255"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="value"
+            length="255"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="valueType"
+        type="byte"
+        column="value_type"
+        not-null="true"
+        length="3"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="value_type"
+            length="3"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional many-to-one association to CrNodeVersion -->
+    <many-to-one
+        name="crNodeVersion"
+        class="com.lamsinternational.lams.contentrepository.CrNodeVersion"
+        not-null="true"
+    >
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="node_id"         
+           @hibernate.column name="version_id"         
+        </meta>
+        <column name="node_id" />
+        <column name="version_id" />
+    </many-to-one>
+
+</class>
+</hibernate-mapping>
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrTool.hbm.xml
===================================================================
diff -u
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrTool.hbm.xml	(revision 0)
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrTool.hbm.xml	(revision d8e2914a3858a5324726827f7063e64e40b92708)
@@ -0,0 +1,105 @@
+<?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.contentrepository.CrTool" 
+    table="lams_cr_tool"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_cr_tool"
+    </meta>
+
+    <id
+        name="toolId"
+        type="java.lang.Long"
+        column="tool_id"
+        unsaved-value="0"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="identity"
+            type="java.lang.Long"
+            column="tool_id"
+            unsaved-value="0"
+
+
+        </meta>
+        <meta attribute="use-in-equals">true</meta>
+        <generator class="identity" />
+    </id>
+
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        length="255"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="name"
+            length="255"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="password"
+        type="java.lang.String"
+        column="password"
+        not-null="true"
+        length="255"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="password"
+            length="255"
+            not-null="true"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional one-to-many association to CrWorkspaceTool -->
+    <set
+        name="crWorkspaceTools"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="tool_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.contentrepository.CrWorkspaceTool"
+        </meta>
+        <key>
+            <column name="tool_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.contentrepository.CrWorkspaceTool"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspace.hbm.xml
===================================================================
diff -u
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspace.hbm.xml	(revision 0)
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspace.hbm.xml	(revision d8e2914a3858a5324726827f7063e64e40b92708)
@@ -0,0 +1,103 @@
+<?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.contentrepository.CrWorkspace" 
+    table="lams_cr_workspace"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_cr_workspace"
+    </meta>
+
+    <id
+        name="workspaceId"
+        type="java.lang.Long"
+        column="workspace_id"
+        unsaved-value="0"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="identity"
+            type="java.lang.Long"
+            column="workspace_id"
+            unsaved-value="0"
+
+
+        </meta>
+        <meta attribute="use-in-equals">true</meta>
+        <generator class="identity" />
+    </id>
+
+    <property
+        name="name"
+        type="java.lang.String"
+        column="name"
+        not-null="true"
+        length="255"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="name"
+            length="255"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="rootNodeId"
+        type="java.lang.Long"
+        column="root_node_id"
+        length="20"
+    >
+        <meta attribute="use-in-tostring">true</meta>
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.property
+            column="root_node_id"
+            length="20"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional one-to-many association to CrWorkspaceTool -->
+    <set
+        name="crWorkspaceTools"
+        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.contentrepository.CrWorkspaceTool"
+        </meta>
+        <key>
+            <column name="workspace_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.contentrepository.CrWorkspaceTool"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspaceTool.hbm.xml
===================================================================
diff -u
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspaceTool.hbm.xml	(revision 0)
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspaceTool.hbm.xml	(revision d8e2914a3858a5324726827f7063e64e40b92708)
@@ -0,0 +1,98 @@
+<?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.contentrepository.CrWorkspaceTool" 
+    table="lams_cr_workspace_tools"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_cr_workspace_tools"
+    </meta>
+
+    <composite-id name="comp_id" class="com.lamsinternational.lams.contentrepository.CrWorkspaceToolPK">
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description" inherit="false">
+           @hibernate.id
+            generator-class="assigned"
+        </meta>
+        <key-property 
+            name="workspaceId" 
+            column="workspace_id" 
+            type="java.lang.Long"
+            length="20"
+        >
+            <meta attribute="field-description">
+               @hibernate.property
+                column="workspace_id"
+            </meta> 
+        </key-property>
+        <key-property 
+            name="toolId" 
+            column="tool_id" 
+            type="java.lang.Long"
+            length="20"
+        >
+            <meta attribute="field-description">
+               @hibernate.property
+                column="tool_id"
+            </meta> 
+        </key-property>
+    </composite-id>    
+
+
+    <!-- Associations -->
+    <!-- derived association(s) for compound key -->
+    <!-- bi-directional many-to-one association to CrWorkspace -->
+    <many-to-one
+        name="crWorkspace"
+	    class="com.lamsinternational.lams.contentrepository.CrWorkspace"
+	    update="false"
+	    insert="false"
+	>
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            update="false"
+            insert="false"
+        </meta>
+        <meta attribute="field-description">
+           @hibernate.column
+            name="workspace_id"
+        </meta>
+    	<column name="workspace_id" />
+	</many-to-one>
+	
+    <!-- bi-directional many-to-one association to CrTool -->
+    <many-to-one
+        name="crTool"
+	    class="com.lamsinternational.lams.contentrepository.CrTool"
+	    update="false"
+	    insert="false"
+	>
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            update="false"
+            insert="false"
+        </meta>
+        <meta attribute="field-description">
+           @hibernate.column
+            name="tool_id"
+        </meta>
+    	<column name="tool_id" />
+	</many-to-one>
+	
+    <!-- end of derived association(s) -->
+  
+
+</class>
+</hibernate-mapping>
Index: lams_contentrepository/conf/middlegen/learningdesign-prefs.properties
===================================================================
diff -u
--- lams_contentrepository/conf/middlegen/learningdesign-prefs.properties	(revision 0)
+++ lams_contentrepository/conf/middlegen/learningdesign-prefs.properties	(revision d8e2914a3858a5324726827f7063e64e40b92708)
@@ -0,0 +1,140 @@
+# Middlegen Preferences
+hibernate.tables.lams_cr_node.base-class-name=CrNode
+hibernate.tables.lams_cr_node.columns.node_id.columnspecialty=key
+hibernate.tables.lams_cr_node.columns.node_id.incequals=true
+hibernate.tables.lams_cr_node.columns.node_id.inctostring=true
+hibernate.tables.lams_cr_node.columns.node_id.java-name=nodeId
+hibernate.tables.lams_cr_node.columns.node_id.java-type=java.lang.Long
+hibernate.tables.lams_cr_node.columns.path.columnspecialty=property
+hibernate.tables.lams_cr_node.columns.path.incequals=true
+hibernate.tables.lams_cr_node.columns.path.inctostring=true
+hibernate.tables.lams_cr_node.columns.path.java-name=path
+hibernate.tables.lams_cr_node.columns.path.java-type=java.lang.String
+hibernate.tables.lams_cr_node.keygenerator=identity
+hibernate.tables.lams_cr_node_version.base-class-name=CrNodeVersion
+hibernate.tables.lams_cr_node_version.columns.created_date_time.columnspecialty=property
+hibernate.tables.lams_cr_node_version.columns.created_date_time.incequals=true
+hibernate.tables.lams_cr_node_version.columns.created_date_time.inctostring=true
+hibernate.tables.lams_cr_node_version.columns.created_date_time.java-name=createdDateTime
+hibernate.tables.lams_cr_node_version.columns.created_date_time.java-type=java.sql.Timestamp
+hibernate.tables.lams_cr_node_version.columns.id.columnspecialty=key
+hibernate.tables.lams_cr_node_version.columns.id.incequals=true
+hibernate.tables.lams_cr_node_version.columns.id.inctostring=true
+hibernate.tables.lams_cr_node_version.columns.id.java-name=id
+hibernate.tables.lams_cr_node_version.columns.id.java-type=java.lang.Long
+hibernate.tables.lams_cr_node_version.columns.node_id.columnspecialty=property
+hibernate.tables.lams_cr_node_version.columns.node_id.incequals=true
+hibernate.tables.lams_cr_node_version.columns.node_id.inctostring=true
+hibernate.tables.lams_cr_node_version.columns.node_id.java-name=nodeId
+hibernate.tables.lams_cr_node_version.columns.node_id.java-type=long
+hibernate.tables.lams_cr_node_version.columns.parent_node_id.incequals=true
+hibernate.tables.lams_cr_node_version.columns.parent_node_id.inctostring=true
+hibernate.tables.lams_cr_node_version.columns.parent_node_id.java-name=parentNodeId
+hibernate.tables.lams_cr_node_version.columns.parent_node_id.java-type=java.lang.Long
+hibernate.tables.lams_cr_node_version.columns.parent_version_id.incequals=true
+hibernate.tables.lams_cr_node_version.columns.parent_version_id.inctostring=true
+hibernate.tables.lams_cr_node_version.columns.parent_version_id.java-name=parentVersionId
+hibernate.tables.lams_cr_node_version.columns.parent_version_id.java-type=java.lang.Long
+hibernate.tables.lams_cr_node_version.columns.version_id.columnspecialty=property
+hibernate.tables.lams_cr_node_version.columns.version_id.incequals=true
+hibernate.tables.lams_cr_node_version.columns.version_id.inctostring=true
+hibernate.tables.lams_cr_node_version.columns.version_id.java-name=versionId
+hibernate.tables.lams_cr_node_version.columns.version_id.java-type=long
+hibernate.tables.lams_cr_node_version.keygenerator=identity
+hibernate.tables.lams_cr_node_version_property.base-class-name=CrNodeVersionProperty
+hibernate.tables.lams_cr_node_version_property.columns.id.columnspecialty=key
+hibernate.tables.lams_cr_node_version_property.columns.id.incequals=true
+hibernate.tables.lams_cr_node_version_property.columns.id.inctostring=true
+hibernate.tables.lams_cr_node_version_property.columns.id.java-name=id
+hibernate.tables.lams_cr_node_version_property.columns.id.java-type=java.lang.Long
+hibernate.tables.lams_cr_node_version_property.columns.name.incequals=true
+hibernate.tables.lams_cr_node_version_property.columns.name.inctostring=true
+hibernate.tables.lams_cr_node_version_property.columns.name.java-name=name
+hibernate.tables.lams_cr_node_version_property.columns.name.java-type=java.lang.String
+hibernate.tables.lams_cr_node_version_property.columns.node_id.incequals=true
+hibernate.tables.lams_cr_node_version_property.columns.node_id.inctostring=true
+hibernate.tables.lams_cr_node_version_property.columns.node_id.java-name=nodeId
+hibernate.tables.lams_cr_node_version_property.columns.node_id.java-type=long
+hibernate.tables.lams_cr_node_version_property.columns.value.columnspecialty=property
+hibernate.tables.lams_cr_node_version_property.columns.value.incequals=true
+hibernate.tables.lams_cr_node_version_property.columns.value.inctostring=true
+hibernate.tables.lams_cr_node_version_property.columns.value.java-name=value
+hibernate.tables.lams_cr_node_version_property.columns.value.java-type=java.lang.String
+hibernate.tables.lams_cr_node_version_property.columns.value_type.incequals=true
+hibernate.tables.lams_cr_node_version_property.columns.value_type.inctostring=true
+hibernate.tables.lams_cr_node_version_property.columns.value_type.java-name=valueType
+hibernate.tables.lams_cr_node_version_property.columns.value_type.java-type=byte
+hibernate.tables.lams_cr_node_version_property.columns.version_id.incequals=true
+hibernate.tables.lams_cr_node_version_property.columns.version_id.inctostring=true
+hibernate.tables.lams_cr_node_version_property.columns.version_id.java-name=versionId
+hibernate.tables.lams_cr_node_version_property.columns.version_id.java-type=long
+hibernate.tables.lams_cr_node_version_property.keygenerator=identity
+hibernate.tables.lams_cr_tool.base-class-name=CrTool
+hibernate.tables.lams_cr_tool.columns.name.incequals=true
+hibernate.tables.lams_cr_tool.columns.name.inctostring=true
+hibernate.tables.lams_cr_tool.columns.name.java-name=name
+hibernate.tables.lams_cr_tool.columns.name.java-type=java.lang.String
+hibernate.tables.lams_cr_tool.columns.password.incequals=true
+hibernate.tables.lams_cr_tool.columns.password.inctostring=true
+hibernate.tables.lams_cr_tool.columns.password.java-name=password
+hibernate.tables.lams_cr_tool.columns.password.java-type=java.lang.String
+hibernate.tables.lams_cr_tool.columns.tool_id.columnspecialty=key
+hibernate.tables.lams_cr_tool.columns.tool_id.incequals=true
+hibernate.tables.lams_cr_tool.columns.tool_id.inctostring=true
+hibernate.tables.lams_cr_tool.columns.tool_id.java-name=toolId
+hibernate.tables.lams_cr_tool.columns.tool_id.java-type=java.lang.Long
+hibernate.tables.lams_cr_tool.keygenerator=identity
+hibernate.tables.lams_cr_workspace.base-class-name=CrWorkspace
+hibernate.tables.lams_cr_workspace.columns.name.incequals=true
+hibernate.tables.lams_cr_workspace.columns.name.inctostring=true
+hibernate.tables.lams_cr_workspace.columns.name.java-name=name
+hibernate.tables.lams_cr_workspace.columns.name.java-type=java.lang.String
+hibernate.tables.lams_cr_workspace.columns.root_node_id.incequals=true
+hibernate.tables.lams_cr_workspace.columns.root_node_id.inctostring=true
+hibernate.tables.lams_cr_workspace.columns.root_node_id.java-name=rootNodeId
+hibernate.tables.lams_cr_workspace.columns.root_node_id.java-type=java.lang.Long
+hibernate.tables.lams_cr_workspace.columns.workspace_id.columnspecialty=key
+hibernate.tables.lams_cr_workspace.columns.workspace_id.incequals=true
+hibernate.tables.lams_cr_workspace.columns.workspace_id.inctostring=true
+hibernate.tables.lams_cr_workspace.columns.workspace_id.java-name=workspaceId
+hibernate.tables.lams_cr_workspace.columns.workspace_id.java-type=java.lang.Long
+hibernate.tables.lams_cr_workspace.keygenerator=identity
+hibernate.tables.lams_cr_workspace_tools.base-class-name=CrWorkspaceTool
+hibernate.tables.lams_cr_workspace_tools.columns.tool_id.incequals=true
+hibernate.tables.lams_cr_workspace_tools.columns.tool_id.inctostring=true
+hibernate.tables.lams_cr_workspace_tools.columns.tool_id.java-name=toolId
+hibernate.tables.lams_cr_workspace_tools.columns.tool_id.java-type=java.lang.Long
+hibernate.tables.lams_cr_workspace_tools.columns.workspace_id.columnspecialty=compound key
+hibernate.tables.lams_cr_workspace_tools.columns.workspace_id.incequals=true
+hibernate.tables.lams_cr_workspace_tools.columns.workspace_id.inctostring=true
+hibernate.tables.lams_cr_workspace_tools.columns.workspace_id.java-name=workspaceId
+hibernate.tables.lams_cr_workspace_tools.columns.workspace_id.java-type=java.lang.Long
+hibernate.tables.lams_cr_workspace_tools.keygenerator=assigned
+relations.lams_cr_node-lams_cr_node_version.lams_cr_node-has-lams_cr_node_version.enabled=true
+relations.lams_cr_node-lams_cr_node_version.lams_cr_node-has-lams_cr_node_version.target-many=true
+relations.lams_cr_node-lams_cr_node_version.lams_cr_node_version-has-lams_cr_node.enabled=true
+relations.lams_cr_node-lams_cr_node_version.lams_cr_node_version-has-lams_cr_node.target-many=false
+relations.lams_cr_node_version-lams_cr_node_version_property.lams_cr_node_version-has-lams_cr_node_version_property.enabled=true
+relations.lams_cr_node_version-lams_cr_node_version_property.lams_cr_node_version-has-lams_cr_node_version_property.target-many=true
+relations.lams_cr_node_version-lams_cr_node_version_property.lams_cr_node_version_property-has-lams_cr_node_version.enabled=true
+relations.lams_cr_node_version-lams_cr_node_version_property.lams_cr_node_version_property-has-lams_cr_node_version.target-many=false
+relations.lams_cr_tool-lams_cr_workspace_tools.lams_cr_tool-has-lams_cr_workspace_tools.enabled=true
+relations.lams_cr_tool-lams_cr_workspace_tools.lams_cr_tool-has-lams_cr_workspace_tools.target-many=true
+relations.lams_cr_tool-lams_cr_workspace_tools.lams_cr_workspace_tools-has-lams_cr_tool.enabled=true
+relations.lams_cr_tool-lams_cr_workspace_tools.lams_cr_workspace_tools-has-lams_cr_tool.target-many=false
+relations.lams_cr_workspace-lams_cr_workspace_tools.lams_cr_workspace-has-lams_cr_workspace_tools.enabled=true
+relations.lams_cr_workspace-lams_cr_workspace_tools.lams_cr_workspace-has-lams_cr_workspace_tools.target-many=true
+relations.lams_cr_workspace-lams_cr_workspace_tools.lams_cr_workspace_tools-has-lams_cr_workspace.enabled=true
+relations.lams_cr_workspace-lams_cr_workspace_tools.lams_cr_workspace_tools-has-lams_cr_workspace.target-many=false
+tables.lams_cr_node.x=15
+tables.lams_cr_node.y=13
+tables.lams_cr_node_version.x=133
+tables.lams_cr_node_version.y=21
+tables.lams_cr_node_version_property.x=285
+tables.lams_cr_node_version_property.y=19
+tables.lams_cr_tool.x=527
+tables.lams_cr_tool.y=94
+tables.lams_cr_workspace.x=488
+tables.lams_cr_workspace.y=15
+tables.lams_cr_workspace_tools.x=707
+tables.lams_cr_workspace_tools.y=20
Index: lams_contentrepository/db/sql/create_content_repository_tables.sql
===================================================================
diff -u -rea365561af68da2c5edc9d1f7ad9619edde3d530 -rd8e2914a3858a5324726827f7063e64e40b92708
--- lams_contentrepository/db/sql/create_content_repository_tables.sql	(.../create_content_repository_tables.sql)	(revision ea365561af68da2c5edc9d1f7ad9619edde3d530)
+++ lams_contentrepository/db/sql/create_content_repository_tables.sql	(.../create_content_repository_tables.sql)	(revision d8e2914a3858a5324726827f7063e64e40b92708)
@@ -23,10 +23,15 @@
 
 --
 -- Table structure for table 'lams_cr_node_version'
+-- Has a "dummy" id nv_id (node version id) which is unique for all node_id and 
+-- version_id combinations. 
 --
+-- It is the node_id and version_id combination that is the "real" key for this table,
+-- so that's what is used in foriegn keys. Middlegen doesn't like it but tough - it still
+-- seems to work! If we start getting problems here, that may be the issue.
 
 CREATE TABLE lams_cr_node_version (
-  id bigint(20) unsigned NOT NULL auto_increment,
+  nv_id bigint(20) unsigned NOT NULL auto_increment,
   node_id bigint(20) unsigned NOT NULL default '0',
   version_id bigint(20) unsigned NOT NULL default '0',
   created_date_time timestamp(14) NOT NULL,
Index: lams_contentrepository/properties.xml
===================================================================
diff -u -r5442f0b50a7695f8bac06aaaf4da7321ca5e7110 -rd8e2914a3858a5324726827f7063e64e40b92708
--- lams_contentrepository/properties.xml	(.../properties.xml)	(revision 5442f0b50a7695f8bac06aaaf4da7321ca5e7110)
+++ lams_contentrepository/properties.xml	(.../properties.xml)	(revision d8e2914a3858a5324726827f7063e64e40b92708)
@@ -35,8 +35,8 @@
 	<property name="package.contentrepository"    value="${package}/contentrepository"/>
 	
 	<property name="package.name"                  value="com.lamsinternational.lams"/>
-	<property name="package.contentrepository.name"   value="${package}.contentrepository"/>
-	
+	<property name="package.contentrepository.name"   value="${package.name}.contentrepository"/>
+
 	<!--  database related properties -->
 	<property name="database.driver.file"          value="${lib}/mysql/mysql-connector-java-3.0.16-ga-bin.jar"/>   
 	<property name="database.driver.classpath"     value="${database.driver.file}"/>