Index: lams_contentrepository/.classpath
===================================================================
diff -u -r3f80f42891cd062d8d769854a57e7efeec02eb2a -r580afc09c4d2620bbd40d0763340e29999ee62d6
--- lams_contentrepository/.classpath	(.../.classpath)	(revision 3f80f42891cd062d8d769854a57e7efeec02eb2a)
+++ lams_contentrepository/.classpath	(.../.classpath)	(revision 580afc09c4d2620bbd40d0763340e29999ee62d6)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="src" path="conf/hibernate/mappings"/>
 	<classpathentry kind="src" path="test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/spring/spring.jar"/>
@@ -16,5 +17,7 @@
 	<classpathentry kind="lib" path="lib/aopalliance/aopalliance.jar"/>
 	<classpathentry kind="lib" path="lib/cglib/cglib-full-2.0.2.jar"/>
 	<classpathentry kind="lib" path="lib/jakarta-commons/commons-collections-3.1.jar"/>
+	<classpathentry kind="lib" path="lib/odmg/odmg-3.0.jar"/>
+	<classpathentry kind="lib" path="lib/jdom/jdom.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
Index: lams_contentrepository/build.xml
===================================================================
diff -u -r3f80f42891cd062d8d769854a57e7efeec02eb2a -r580afc09c4d2620bbd40d0763340e29999ee62d6
--- lams_contentrepository/build.xml	(.../build.xml)	(revision 3f80f42891cd062d8d769854a57e7efeec02eb2a)
+++ lams_contentrepository/build.xml	(.../build.xml)	(revision 580afc09c4d2620bbd40d0763340e29999ee62d6)
@@ -268,15 +268,16 @@
 	<!-- =================================================================== -->
 	<!-- Deploy the project                                                  -->
 	<!-- =================================================================== -->
-	<target name="deploy-lamscr" depends="lamscr-jar,lamscr-war">
+<!--	<target name="deploy-lamscr" depends="lamscr-jar,lamscr-war" description="removes all class files">-->
+	<target name="deploy-lamscr" depends="lamscr-jar" description="deploy project to jboss">
 		<delete quiet="true">
 			<fileset dir="${jboss.deploy}/tmp"/>
 			<fileset dir="${jboss.deploy}/work"/>
 		</delete>
 		<copy file="${build.lib}/${product}.jar"
 				todir="${jboss.deploy}"/>
-		<copy file="${build.lib}/${product}.war"
-				todir="${jboss.deploy}"/>
+<!--		<copy file="${build.lib}/${product}.war"
+				todir="${jboss.deploy}"/> -->
 	</target>
 
 	<!-- =================================================================== -->
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersion.hbm.xml
===================================================================
diff -u -r3f80f42891cd062d8d769854a57e7efeec02eb2a -r580afc09c4d2620bbd40d0763340e29999ee62d6
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersion.hbm.xml	(.../CrNodeVersion.hbm.xml)	(revision 3f80f42891cd062d8d769854a57e7efeec02eb2a)
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersion.hbm.xml	(.../CrNodeVersion.hbm.xml)	(revision 580afc09c4d2620bbd40d0763340e29999ee62d6)
@@ -131,16 +131,13 @@
             cascade="none"
 
            @hibernate.collection-key
-            column="node_id"
-           @hibernate.collection-key
-            column="version_id"
+            column="nv_id"
 
            @hibernate.collection-one-to-many
             class="com.lamsinternational.lams.contentrepository.CrNodeVersionProperty"
         </meta>
         <key>
-            <column name="node_id" />
-            <column name="version_id" />
+            <column name="nv_id" />
         </key>
         <one-to-many 
             class="com.lamsinternational.lams.contentrepository.CrNodeVersionProperty"
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersionProperty.hbm.xml
===================================================================
diff -u -r3f80f42891cd062d8d769854a57e7efeec02eb2a -r580afc09c4d2620bbd40d0763340e29999ee62d6
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersionProperty.hbm.xml	(.../CrNodeVersionProperty.hbm.xml)	(revision 3f80f42891cd062d8d769854a57e7efeec02eb2a)
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersionProperty.hbm.xml	(.../CrNodeVersionProperty.hbm.xml)	(revision 580afc09c4d2620bbd40d0763340e29999ee62d6)
@@ -101,11 +101,9 @@
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
-           @hibernate.column name="node_id"         
-           @hibernate.column name="version_id"         
+           @hibernate.column name="nv_id"         
         </meta>
-        <column name="node_id" />
-        <column name="version_id" />
+        <column name="nv_id" />
     </many-to-one>
 
 </class>
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspaceCredential.hbm.xml
===================================================================
diff -u -r3f80f42891cd062d8d769854a57e7efeec02eb2a -r580afc09c4d2620bbd40d0763340e29999ee62d6
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspaceCredential.hbm.xml	(.../CrWorkspaceCredential.hbm.xml)	(revision 3f80f42891cd062d8d769854a57e7efeec02eb2a)
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspaceCredential.hbm.xml	(.../CrWorkspaceCredential.hbm.xml)	(revision 580afc09c4d2620bbd40d0763340e29999ee62d6)
@@ -21,79 +21,56 @@
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
-    <composite-id name="comp_id" class="com.lamsinternational.lams.contentrepository.CrWorkspaceCredentialPK">
-        <meta attribute="use-in-equals">true</meta>
-        <meta attribute="field-description" inherit="false">
+    <id
+        name="wcId"
+        type="java.lang.Long"
+        column="wc_id"
+        unsaved-value="0"
+    >
+        <meta attribute="field-description">
            @hibernate.id
-            generator-class="assigned"
-        </meta>
-        <key-property 
-            name="workspaceId" 
-            column="workspace_id" 
+            generator-class="identity"
             type="java.lang.Long"
-            length="20"
-        >
-            <meta attribute="field-description">
-               @hibernate.property
-                column="workspace_id"
-            </meta> 
-        </key-property>
-        <key-property 
-            name="credentialId" 
-            column="credential_id" 
-            type="java.lang.Long"
-            length="20"
-        >
-            <meta attribute="field-description">
-               @hibernate.property
-                column="credential_id"
-            </meta> 
-        </key-property>
-    </composite-id>    
+            column="wc_id"
+            unsaved-value="0"
 
 
+        </meta>
+        <meta attribute="use-in-equals">true</meta>
+        <generator class="identity" />
+    </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"
-	>
+        class="com.lamsinternational.lams.contentrepository.CrWorkspace"
+        not-null="true"
+    >
+        <meta attribute="use-in-equals">true</meta>
         <meta attribute="field-description">
            @hibernate.many-to-one
-            update="false"
-            insert="false"
+            not-null="true"
+           @hibernate.column name="workspace_id"         
         </meta>
-        <meta attribute="field-description">
-           @hibernate.column
-            name="workspace_id"
-        </meta>
-    	<column name="workspace_id" />
-	</many-to-one>
-	
+        <column name="workspace_id" />
+    </many-to-one>
     <!-- bi-directional many-to-one association to CrCredential -->
     <many-to-one
         name="crCredential"
-	    class="com.lamsinternational.lams.contentrepository.CrCredential"
-	    update="false"
-	    insert="false"
-	>
+        class="com.lamsinternational.lams.contentrepository.CrCredential"
+        not-null="true"
+    >
+        <meta attribute="use-in-equals">true</meta>
         <meta attribute="field-description">
            @hibernate.many-to-one
-            update="false"
-            insert="false"
+            not-null="true"
+           @hibernate.column name="credential_id"         
         </meta>
-        <meta attribute="field-description">
-           @hibernate.column
-            name="credential_id"
-        </meta>
-    	<column name="credential_id" />
-	</many-to-one>
-	
-    <!-- end of derived association(s) -->
-  
+        <column name="credential_id" />
+    </many-to-one>
 
 </class>
 </hibernate-mapping>
Index: lams_contentrepository/conf/middlegen/learningdesign-prefs.properties
===================================================================
diff -u -r3f80f42891cd062d8d769854a57e7efeec02eb2a -r580afc09c4d2620bbd40d0763340e29999ee62d6
--- lams_contentrepository/conf/middlegen/learningdesign-prefs.properties	(.../learningdesign-prefs.properties)	(revision 3f80f42891cd062d8d769854a57e7efeec02eb2a)
+++ lams_contentrepository/conf/middlegen/learningdesign-prefs.properties	(.../learningdesign-prefs.properties)	(revision 580afc09c4d2620bbd40d0763340e29999ee62d6)
@@ -90,6 +90,10 @@
 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.nv_id.columnspecialty=foreign key
+hibernate.tables.lams_cr_node_version_property.columns.nv_id.incequals=true
+hibernate.tables.lams_cr_node_version_property.columns.nv_id.java-name=nvId
+hibernate.tables.lams_cr_node_version_property.columns.nv_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
@@ -142,18 +146,26 @@
 hibernate.tables.lams_cr_workspace.implements=IWorkspace
 hibernate.tables.lams_cr_workspace.keygenerator=identity
 hibernate.tables.lams_cr_workspace_credential.base-class-name=CrWorkspaceCredential
-hibernate.tables.lams_cr_workspace_credential.columns.credential_id.columnspecialty=compound key
+hibernate.tables.lams_cr_workspace_credential.columns.credential_id.columnspecialty=foreign key
 hibernate.tables.lams_cr_workspace_credential.columns.credential_id.incequals=true
 hibernate.tables.lams_cr_workspace_credential.columns.credential_id.inctostring=true
 hibernate.tables.lams_cr_workspace_credential.columns.credential_id.java-name=credentialId
 hibernate.tables.lams_cr_workspace_credential.columns.credential_id.java-type=java.lang.Long
-hibernate.tables.lams_cr_workspace_credential.columns.workspace_id.columnspecialty=compound key
+hibernate.tables.lams_cr_workspace_credential.columns.credential_id.setscope=public
+hibernate.tables.lams_cr_workspace_credential.columns.wc_id.columnspecialty=key
+hibernate.tables.lams_cr_workspace_credential.columns.wc_id.incequals=true
+hibernate.tables.lams_cr_workspace_credential.columns.wc_id.inctostring=true
+hibernate.tables.lams_cr_workspace_credential.columns.wc_id.java-name=wcId
+hibernate.tables.lams_cr_workspace_credential.columns.wc_id.java-type=java.lang.Long
+hibernate.tables.lams_cr_workspace_credential.columns.wc_id.setscope=public
+hibernate.tables.lams_cr_workspace_credential.columns.workspace_id.columnspecialty=foreign key
 hibernate.tables.lams_cr_workspace_credential.columns.workspace_id.incequals=true
 hibernate.tables.lams_cr_workspace_credential.columns.workspace_id.inctostring=true
 hibernate.tables.lams_cr_workspace_credential.columns.workspace_id.java-name=workspaceId
 hibernate.tables.lams_cr_workspace_credential.columns.workspace_id.java-type=java.lang.Long
+hibernate.tables.lams_cr_workspace_credential.columns.workspace_id.setscope=public
 hibernate.tables.lams_cr_workspace_credential.equalshashcode=true
-hibernate.tables.lams_cr_workspace_credential.keygenerator=assigned
+hibernate.tables.lams_cr_workspace_credential.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
@@ -199,13 +211,13 @@
 tables.lams_cr_node.y=154
 tables.lams_cr_node_version.x=767
 tables.lams_cr_node_version.y=114
-tables.lams_cr_node_version_property.x=527
-tables.lams_cr_node_version_property.y=8
+tables.lams_cr_node_version_property.x=526
+tables.lams_cr_node_version_property.y=7
 tables.lams_cr_tool.x=527
 tables.lams_cr_tool.y=94
 tables.lams_cr_workspace.x=311
 tables.lams_cr_workspace.y=28
-tables.lams_cr_workspace_credential.x=43
-tables.lams_cr_workspace_credential.y=127
+tables.lams_cr_workspace_credential.x=46
+tables.lams_cr_workspace_credential.y=128
 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 -r3f80f42891cd062d8d769854a57e7efeec02eb2a -r580afc09c4d2620bbd40d0763340e29999ee62d6
--- lams_contentrepository/db/sql/create_content_repository_tables.sql	(.../create_content_repository_tables.sql)	(revision 3f80f42891cd062d8d769854a57e7efeec02eb2a)
+++ lams_contentrepository/db/sql/create_content_repository_tables.sql	(.../create_content_repository_tables.sql)	(revision 580afc09c4d2620bbd40d0763340e29999ee62d6)
@@ -40,9 +40,10 @@
 --
 
 CREATE TABLE lams_cr_workspace_credential (
+  wc_id bigint(20) unsigned NOT NULL auto_increment,
   workspace_id bigint(20) unsigned NOT NULL default '0',
   credential_id bigint(20) unsigned NOT NULL default '0',
-  PRIMARY KEY  (credential_id,workspace_id),
+  PRIMARY KEY  (wc_id),
   INDEX (credential_id),
   INDEX (workspace_id),
   CONSTRAINT FK_lams_cr_workspace_credential_1 
@@ -103,17 +104,16 @@
 
 CREATE TABLE lams_cr_node_version_property (
   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',
+  nv_id bigint(20) unsigned NOT NULL default '0', 
   name varchar(255) NOT NULL default '',
   value varchar(255) NOT NULL default '',
   value_type tinyint(3) unsigned NOT NULL default '1',
   PRIMARY KEY  (id),
   UNIQUE KEY id (id),
-  INDEX (node_id, version_id),
+  INDEX (nv_id),
   CONSTRAINT FK_lams_version_property_1 
-  		FOREIGN KEY (node_id, version_id) 
-  		REFERENCES lams_cr_node_version (node_id, version_id) 
+  		FOREIGN KEY (nv_id) 
+  		REFERENCES lams_cr_node_version (nv_id) 
   		ON DELETE NO ACTION ON UPDATE NO ACTION
 ) TYPE=InnoDB COMMENT='Records the property for a node';
 
Index: lams_contentrepository/db/sql/insert_test_data.sql
===================================================================
diff -u -r3f80f42891cd062d8d769854a57e7efeec02eb2a -r580afc09c4d2620bbd40d0763340e29999ee62d6
--- lams_contentrepository/db/sql/insert_test_data.sql	(.../insert_test_data.sql)	(revision 3f80f42891cd062d8d769854a57e7efeec02eb2a)
+++ lams_contentrepository/db/sql/insert_test_data.sql	(.../insert_test_data.sql)	(revision 580afc09c4d2620bbd40d0763340e29999ee62d6)
@@ -5,4 +5,4 @@
 
 INSERT INTO lams_cr_credential (credential_id, name, password) VALUES (1, 'atool','atool');
 INSERT INTO lams_cr_workspace  (workspace_id, name) VALUES (1, 'atoolWorkspace');
-INSERT INTO lams_cr_workspace_credential  (workspace_id, credential_id) VALUES  (1,1);
+INSERT INTO lams_cr_workspace_credential  (wc_id, workspace_id, credential_id) VALUES  (1, 1,1);
Index: lams_contentrepository/properties.xml
===================================================================
diff -u -rd8e2914a3858a5324726827f7063e64e40b92708 -r580afc09c4d2620bbd40d0763340e29999ee62d6
--- lams_contentrepository/properties.xml	(.../properties.xml)	(revision d8e2914a3858a5324726827f7063e64e40b92708)
+++ lams_contentrepository/properties.xml	(.../properties.xml)	(revision 580afc09c4d2620bbd40d0763340e29999ee62d6)
@@ -43,7 +43,7 @@
 	<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.password"             value="rootpwd"/>
 	<property name="database.schema"               value=""/>
 	<property name="database.catalog"              value=""/>