Index: lams_contentrepository/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/.classpath,v
diff -u -r1.2 -r1.3
--- lams_contentrepository/.classpath	23 Dec 2004 00:05:58 -0000	1.2
+++ lams_contentrepository/.classpath	31 Dec 2004 21:36:13 -0000	1.3
@@ -9,5 +9,12 @@
 	<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="lib" path="lib/jakarta-commons/commons-logging.jar"/>
+	<classpathentry kind="lib" path="lib/mysql/mysql-connector-java-3.0.16-ga-bin.jar"/>
+	<classpathentry kind="lib" path="lib/j2ee/j2ee.jar"/>
+	<classpathentry kind="lib" path="lib/dom4j/dom4j-1.5.2.jar"/>
+	<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="output" path="build"/>
 </classpath>
Index: lams_contentrepository/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/build.xml,v
diff -u -r1.2 -r1.3
--- lams_contentrepository/build.xml	23 Dec 2004 00:05:58 -0000	1.2
+++ lams_contentrepository/build.xml	31 Dec 2004 21:36:13 -0000	1.3
@@ -117,9 +117,9 @@
 			<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_credential"/>
 			<table name="lams_cr_workspace"/>
-			<table name="lams_cr_workspace_tools"/>
+			<table name="lams_cr_workspace_credential"/>
 
 		</middlegen-cr>
 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_contentrepository/start_mysql.bat'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_contentrepository/stop_mysql.bat'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_contentrepository/xdoclet-build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/Attic/xdoclet-build.xml,v
diff -u -r1.1 -r1.2
--- lams_contentrepository/xdoclet-build.xml	21 Dec 2004 09:45:37 -0000	1.1
+++ lams_contentrepository/xdoclet-build.xml	31 Dec 2004 21:36:13 -0000	1.2
@@ -18,6 +18,7 @@
 <pathelement location="G:/eclipse3.0/workspace/lams_contentrepository/lib/junit/junit.jar"/>
 <pathelement location="G:/eclipse3.0/workspace/lams_contentrepository/lib/hibernate/hibernate2.jar"/>
 <pathelement location="G:/eclipse3.0/workspace/lams_contentrepository/lib/hibernate/hibernate-tools.jar"/>
+<pathelement location="G:/eclipse3.0/workspace/lams_contentrepository/lib/jakarta-commons/commons-lang-2.0.jar"/>
 </path>
 <target name="_generation_" depends=""/>
 </project>
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrCredential.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/Attic/CrCredential.hbm.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrCredential.hbm.xml	31 Dec 2004 21:36:13 -0000	1.1
@@ -0,0 +1,107 @@
+<?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.CrCredential" 
+    table="lams_cr_credential"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_cr_credential"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+    <id
+        name="credentialId"
+        type="java.lang.Long"
+        column="credential_id"
+        unsaved-value="0"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="identity"
+            type="java.lang.Long"
+            column="credential_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"
+        unique="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"
+            unique="true"
+            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-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 CrWorkspaceCredential -->
+    <set
+        name="crWorkspaceCredentials"
+        lazy="true"
+        inverse="true"
+		cascade="none"
+    >
+        <meta attribute="field-description">
+           @hibernate.set
+            lazy="true"
+            inverse="true"
+            cascade="none"
+
+           @hibernate.collection-key
+            column="credential_id"
+
+           @hibernate.collection-one-to-many
+            class="com.lamsinternational.lams.contentrepository.CrWorkspaceCredential"
+        </meta>
+        <key>
+            <column name="credential_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.contentrepository.CrWorkspaceCredential"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNode.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/Attic/CrNode.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNode.hbm.xml	23 Dec 2004 00:07:27 -0000	1.1
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNode.hbm.xml	31 Dec 2004 21:36:13 -0000	1.2
@@ -19,6 +19,7 @@
        @hibernate.class
         table="lams_cr_node"
     </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="nodeId"
@@ -84,6 +85,20 @@
             class="com.lamsinternational.lams.contentrepository.CrNodeVersion"
         />
     </set>
+    <!-- bi-directional many-to-one association to CrWorkspace -->
+    <many-to-one
+        name="crWorkspace"
+        class="com.lamsinternational.lams.contentrepository.CrWorkspace"
+        not-null="true"
+    >
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="workspace_id"         
+        </meta>
+        <column name="workspace_id" />
+    </many-to-one>
 
 </class>
 </hibernate-mapping>
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersion.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/Attic/CrNodeVersion.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersion.hbm.xml	23 Dec 2004 00:07:27 -0000	1.1
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersion.hbm.xml	31 Dec 2004 21:36:13 -0000	1.2
@@ -19,18 +19,19 @@
        @hibernate.class
         table="lams_cr_node_version"
     </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
-        name="id"
+        name="nvId"
         type="java.lang.Long"
-        column="id"
+        column="nv_id"
         unsaved-value="0"
     >
         <meta attribute="field-description">
            @hibernate.id
             generator-class="identity"
             type="java.lang.Long"
-            column="id"
+            column="nv_id"
             unsaved-value="0"
 
 
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersionProperty.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/Attic/CrNodeVersionProperty.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersionProperty.hbm.xml	23 Dec 2004 00:07:27 -0000	1.1
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrNodeVersionProperty.hbm.xml	31 Dec 2004 21:36:13 -0000	1.2
@@ -19,6 +19,7 @@
        @hibernate.class
         table="lams_cr_node_version_property"
     </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
 
     <id
         name="id"
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrTool.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspace.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/Attic/CrWorkspace.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspace.hbm.xml	23 Dec 2004 00:07:27 -0000	1.1
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspace.hbm.xml	31 Dec 2004 21:36:13 -0000	1.2
@@ -19,6 +19,8 @@
        @hibernate.class
         table="lams_cr_workspace"
     </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+    <meta attribute="implements" inherit="false">IWorkspace</meta>
 
     <id
         name="workspaceId"
@@ -72,9 +74,9 @@
 
     <!-- Associations -->
   
-    <!-- bi-directional one-to-many association to CrWorkspaceTool -->
+    <!-- bi-directional one-to-many association to CrWorkspaceCredential -->
     <set
-        name="crWorkspaceTools"
+        name="crWorkspaceCredentials"
         lazy="true"
         inverse="true"
 		cascade="none"
@@ -89,15 +91,41 @@
             column="workspace_id"
 
            @hibernate.collection-one-to-many
-            class="com.lamsinternational.lams.contentrepository.CrWorkspaceTool"
+            class="com.lamsinternational.lams.contentrepository.CrWorkspaceCredential"
         </meta>
         <key>
             <column name="workspace_id" />
         </key>
         <one-to-many 
-            class="com.lamsinternational.lams.contentrepository.CrWorkspaceTool"
+            class="com.lamsinternational.lams.contentrepository.CrWorkspaceCredential"
         />
     </set>
+    <!-- bi-directional one-to-many association to CrNode -->
+    <set
+        name="crNodes"
+        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.CrNode"
+        </meta>
+        <key>
+            <column name="workspace_id" />
+        </key>
+        <one-to-many 
+            class="com.lamsinternational.lams.contentrepository.CrNode"
+        />
+    </set>
+
 </class>
 </hibernate-mapping>
Index: lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspaceCredential.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/Attic/CrWorkspaceCredential.hbm.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspaceCredential.hbm.xml	31 Dec 2004 21:36:13 -0000	1.1
@@ -0,0 +1,99 @@
+<?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.CrWorkspaceCredential" 
+    table="lams_cr_workspace_credential"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_cr_workspace_credential"
+    </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">
+           @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="credentialId" 
+            column="credential_id" 
+            type="java.lang.Long"
+            length="20"
+        >
+            <meta attribute="field-description">
+               @hibernate.property
+                column="credential_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 CrCredential -->
+    <many-to-one
+        name="crCredential"
+	    class="com.lamsinternational.lams.contentrepository.CrCredential"
+	    update="false"
+	    insert="false"
+	>
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            update="false"
+            insert="false"
+        </meta>
+        <meta attribute="field-description">
+           @hibernate.column
+            name="credential_id"
+        </meta>
+    	<column name="credential_id" />
+	</many-to-one>
+	
+    <!-- end of derived association(s) -->
+  
+
+</class>
+</hibernate-mapping>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_contentrepository/conf/hibernate/mappings/com/lamsinternational/lams/contentrepository/CrWorkspaceTool.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_contentrepository/conf/middlegen/learningdesign-prefs.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/middlegen/learningdesign-prefs.properties,v
diff -u -r1.1 -r1.2
--- lams_contentrepository/conf/middlegen/learningdesign-prefs.properties	23 Dec 2004 00:07:27 -0000	1.1
+++ lams_contentrepository/conf/middlegen/learningdesign-prefs.properties	31 Dec 2004 21:36:13 -0000	1.2
@@ -1,4 +1,23 @@
 # Middlegen Preferences
+hibernate.tables.lams_cr_credential.base-class-name=CrCredential
+hibernate.tables.lams_cr_credential.columns.credential_id.columnspecialty=key
+hibernate.tables.lams_cr_credential.columns.credential_id.incequals=true
+hibernate.tables.lams_cr_credential.columns.credential_id.inctostring=true
+hibernate.tables.lams_cr_credential.columns.credential_id.java-name=credentialId
+hibernate.tables.lams_cr_credential.columns.credential_id.java-type=java.lang.Long
+hibernate.tables.lams_cr_credential.columns.name.columnspecialty=property
+hibernate.tables.lams_cr_credential.columns.name.incequals=true
+hibernate.tables.lams_cr_credential.columns.name.inctostring=true
+hibernate.tables.lams_cr_credential.columns.name.java-name=name
+hibernate.tables.lams_cr_credential.columns.name.java-type=java.lang.String
+hibernate.tables.lams_cr_credential.columns.password.accessfield=property
+hibernate.tables.lams_cr_credential.columns.password.columnspecialty=property
+hibernate.tables.lams_cr_credential.columns.password.incequals=true
+hibernate.tables.lams_cr_credential.columns.password.inctostring=false
+hibernate.tables.lams_cr_credential.columns.password.java-name=password
+hibernate.tables.lams_cr_credential.columns.password.java-type=java.lang.String
+hibernate.tables.lams_cr_credential.equalshashcode=true
+hibernate.tables.lams_cr_credential.keygenerator=identity
 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
@@ -10,6 +29,12 @@
 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.columns.workspace_id.columnspecialty=foreign key
+hibernate.tables.lams_cr_node.columns.workspace_id.incequals=true
+hibernate.tables.lams_cr_node.columns.workspace_id.inctostring=true
+hibernate.tables.lams_cr_node.columns.workspace_id.java-name=workspaceId
+hibernate.tables.lams_cr_node.columns.workspace_id.java-type=long
+hibernate.tables.lams_cr_node.equalshashcode=true
 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
@@ -27,10 +52,17 @@
 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.nv_id.columnspecialty=key
+hibernate.tables.lams_cr_node_version.columns.nv_id.incequals=true
+hibernate.tables.lams_cr_node_version.columns.nv_id.inctostring=true
+hibernate.tables.lams_cr_node_version.columns.nv_id.java-name=nvId
+hibernate.tables.lams_cr_node_version.columns.nv_id.java-type=java.lang.Long
+hibernate.tables.lams_cr_node_version.columns.parent_node_id.columnspecialty=foreign key
 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.columnspecialty=property
 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
@@ -40,17 +72,20 @@
 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.equalshashcode=true
 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.columnspecialty=property
 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.columnspecialty=foreign key
 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
@@ -60,14 +95,17 @@
 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.columnspecialty=property
 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.columnspecialty=foreign key
 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.equalshashcode=true
 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
@@ -85,10 +123,12 @@
 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.columnspecialty=property
 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.columnspecialty=property
 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
@@ -98,7 +138,22 @@
 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.equalshashcode=true
+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.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.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.equalshashcode=true
+hibernate.tables.lams_cr_workspace_credential.keygenerator=assigned
 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
@@ -110,6 +165,10 @@
 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_credential-lams_cr_workspace_credential.lams_cr_credential-has-lams_cr_workspace_credential.enabled=true
+relations.lams_cr_credential-lams_cr_workspace_credential.lams_cr_credential-has-lams_cr_workspace_credential.target-many=true
+relations.lams_cr_credential-lams_cr_workspace_credential.lams_cr_workspace_credential-has-lams_cr_credential.enabled=true
+relations.lams_cr_credential-lams_cr_workspace_credential.lams_cr_workspace_credential-has-lams_cr_credential.target-many=false
 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
@@ -122,19 +181,31 @@
 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_node.lams_cr_node-has-lams_cr_workspace.enabled=true
+relations.lams_cr_workspace-lams_cr_node.lams_cr_node-has-lams_cr_workspace.target-many=false
+relations.lams_cr_workspace-lams_cr_node.lams_cr_workspace-has-lams_cr_node.enabled=true
+relations.lams_cr_workspace-lams_cr_node.lams_cr_workspace-has-lams_cr_node.target-many=true
+relations.lams_cr_workspace-lams_cr_workspace_credential.lams_cr_workspace-has-lams_cr_workspace_credential.enabled=true
+relations.lams_cr_workspace-lams_cr_workspace_credential.lams_cr_workspace-has-lams_cr_workspace_credential.target-many=true
+relations.lams_cr_workspace-lams_cr_workspace_credential.lams_cr_workspace_credential-has-lams_cr_workspace.enabled=true
+relations.lams_cr_workspace-lams_cr_workspace_credential.lams_cr_workspace_credential-has-lams_cr_workspace.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_credential.x=34
+tables.lams_cr_credential.y=27
+tables.lams_cr_node.x=496
+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_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.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_tools.x=707
 tables.lams_cr_workspace_tools.y=20
Index: lams_contentrepository/db/start_mysql.bat
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/db/start_mysql.bat,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/db/start_mysql.bat	31 Dec 2004 21:36:13 -0000	1.1
@@ -0,0 +1,25 @@
+@echo off
+
+:CHECK_HOME
+if not "%MYSQL_HOME%" == "" goto CHECK_MYSQL
+echo .
+echo Error: MYSQL_HOME is not set correctly.
+echo .
+goto END
+
+:CHECK_MYSQL
+
+if exist "%MYSQL_HOME%\bin\mysqld-nt.exe" goto RUN
+echo .
+echo Error: %MYSQL_HOME%\bin\mysqld-nt.exe not found.
+echo .
+goto END
+
+:RUN
+
+echo Starting MySQL daemon stand-alone...
+start "MySQL" "%MYSQL_HOME%\bin\mysqld-nt.exe" --standalone -l --default-table-type=InnoDB
+echo done!
+:END
+
+pause
Index: lams_contentrepository/db/stop_mysql.bat
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/db/stop_mysql.bat,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/db/stop_mysql.bat	31 Dec 2004 21:36:13 -0000	1.1
@@ -0,0 +1,26 @@
+@echo off
+
+:CHECK_HOME
+if not "%MYSQL_HOME%" == "" goto CHECK_MYSQL
+echo .
+echo Error: MYSQL_HOME is not set correctly.
+echo .
+goto END
+
+:CHECK_MYSQL
+
+if exist "%MYSQL_HOME%\bin\mysqladmin.exe" goto RUN
+echo .
+echo Error: %MYSQL_HOME%\bin\mysqladmin.exe not found.
+echo .
+goto END
+
+:RUN
+
+echo Shutting down MySQL daemon...
+start "MySQL" "%MYSQL_HOME%\bin\mysqladmin.exe" -u root shutdown
+echo done!
+:END
+
+pause
+
Index: lams_contentrepository/db/sql/create_content_repository_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/db/sql/Attic/create_content_repository_tables.sql,v
diff -u -r1.2 -r1.3
--- lams_contentrepository/db/sql/create_content_repository_tables.sql	23 Dec 2004 00:05:58 -0000	1.2
+++ lams_contentrepository/db/sql/create_content_repository_tables.sql	31 Dec 2004 21:36:13 -0000	1.3
@@ -5,20 +5,71 @@
 DROP TABLE IF EXISTS lams_cr_node_version_property;
 DROP TABLE IF EXISTS lams_cr_node_version;
 DROP TABLE IF EXISTS lams_cr_node;
-DROP TABLE IF EXISTS lams_cr_workspace_tools;
-DROP TABLE IF EXISTS lams_cr_tool;
+DROP TABLE IF EXISTS lams_cr_workspace_credential;
+DROP TABLE IF EXISTS lams_cr_credential;
 DROP TABLE IF EXISTS lams_cr_workspace;
 
+
+--
+-- Table structure for table 'lams_cr_workspace'
+--
+
+CREATE TABLE lams_cr_workspace (
+  workspace_id bigint(20) unsigned NOT NULL auto_increment,
+  name varchar(255) NOT NULL default '0',
+  root_node_id bigint(20) unsigned default '0',
+  PRIMARY KEY  (workspace_id),
+  UNIQUE KEY workspace_id (workspace_id,name),
+  KEY name (name)
+) TYPE=InnoDB COMMENT='Content repository workspace';
+
+--
+-- Table structure for table 'lams_cr_credential'
+--
+
+CREATE TABLE lams_cr_credential (
+  credential_id bigint(20) unsigned NOT NULL auto_increment,
+  name varchar(255) NOT NULL default '0',
+  password varchar(255) NOT NULL default '0',
+  PRIMARY KEY  (credential_id),
+  UNIQUE KEY name (name)
+) TYPE=InnoDB COMMENT='Records the identification properties for a tool.';
+
+--
+-- Table structure for table 'lams_cr_workspace_credential'
+--
+
+CREATE TABLE lams_cr_workspace_credential (
+  workspace_id bigint(20) unsigned NOT NULL default '0',
+  credential_id bigint(20) unsigned NOT NULL default '0',
+  PRIMARY KEY  (credential_id,workspace_id),
+  INDEX (credential_id),
+  INDEX (workspace_id),
+  CONSTRAINT FK_lams_cr_workspace_credential_1 
+  		FOREIGN KEY (credential_id) 
+  		REFERENCES lams_cr_credential(credential_id) 
+  		ON DELETE NO ACTION ON UPDATE NO ACTION,
+  CONSTRAINT FK_lams_cr_workspace_credential_2 
+  		FOREIGN KEY (workspace_id) 
+  		REFERENCES lams_cr_workspace (workspace_id) 
+  		ON DELETE NO ACTION ON UPDATE NO ACTION
+) TYPE=InnoDB COMMENT='Maps which tools access which workspaces';
+
 ---
 --- Table structure for table 'lams_cr_node'
 ---
 
 CREATE TABLE lams_cr_node (
   node_id bigint(20) unsigned NOT NULL auto_increment,
+  workspace_id bigint(20) unsigned NOT NULL default '0',
   path varchar(255) NOT NULL default '0',
   PRIMARY KEY  (node_id),
   UNIQUE KEY node_id (node_id),
-  KEY path (path)
+  KEY workspace_id (workspace_id),
+  CONSTRAINT FK_lams_cr_node_1 
+  		FOREIGN KEY (workspace_id) 
+  		REFERENCES lams_cr_workspace (workspace_id) 
+  		ON DELETE NO ACTION ON UPDATE NO ACTION
 ) TYPE=InnoDB COMMENT='The main table containing the node definition';
 
 --
@@ -37,7 +88,7 @@
   created_date_time timestamp(14) NOT NULL,
   parent_node_id bigint(20) unsigned default '0',
   parent_version_id bigint(20) unsigned default '0',
-  PRIMARY KEY  (id),
+  PRIMARY KEY  (nv_id),
   INDEX (node_id, version_id),
   INDEX (parent_node_id),
   CONSTRAINT FK_lams_cr_node_version_1 
@@ -66,49 +117,4 @@
   		ON DELETE NO ACTION ON UPDATE NO ACTION
 ) TYPE=InnoDB COMMENT='Records the property for a node';
 
---
--- Table structure for table 'lams_cr_workspace'
---
-
-CREATE TABLE lams_cr_workspace (
-  workspace_id bigint(20) unsigned NOT NULL auto_increment,
-  name varchar(255) NOT NULL default '0',
-  root_node_id bigint(20) unsigned default '0',
-  PRIMARY KEY  (workspace_id),
-  UNIQUE KEY workspace_id (workspace_id,name),
-  KEY name (name)
-) TYPE=InnoDB COMMENT='Content repository workspace';
---
--- Table structure for table 'lams_cr_tool'
---
-
-CREATE TABLE lams_cr_tool (
-  tool_id bigint(20) unsigned NOT NULL auto_increment,
-  name varchar(255) NOT NULL default '0',
-  password varchar(255) NOT NULL default '0',
-  PRIMARY KEY  (tool_id),
-  UNIQUE KEY id (tool_id,name),
-  KEY name (name)
-) TYPE=InnoDB COMMENT='Records the identification properties for a tool.';
-
---
--- Table structure for table 'lams_cr_workspace_tools'
---
-
-CREATE TABLE lams_cr_workspace_tools (
-  workspace_id bigint(20) unsigned NOT NULL default '0',
-  tool_id bigint(20) unsigned NOT NULL default '0',
-  PRIMARY KEY  (tool_id,workspace_id),
-  INDEX (tool_id),
-  INDEX (workspace_id),
-  CONSTRAINT FK_lams_cr_workspace_tools_1 
-  		FOREIGN KEY (tool_id) 
-  		REFERENCES lams_cr_tool(tool_id) 
-  		ON DELETE NO ACTION ON UPDATE NO ACTION,
-  CONSTRAINT FK_lams_cr_workspace_tools_2 
-  		FOREIGN KEY (workspace_id) 
-  		REFERENCES lams_cr_workspace (workspace_id) 
-  		ON DELETE NO ACTION ON UPDATE NO ACTION
-) TYPE=InnoDB COMMENT='Maps which tools access which workspaces';
-
 SET FOREIGN_KEY_CHECKS=1;
Index: lams_contentrepository/db/sql/insert_test_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/db/sql/Attic/insert_test_data.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/db/sql/insert_test_data.sql	31 Dec 2004 21:36:13 -0000	1.1
@@ -0,0 +1,8 @@
+
+DELETE from lams_cr_workspace_credential  ;
+DELETE from lams_cr_credential ;
+DELETE from lams_cr_workspace  ;
+
+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);