Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml
===================================================================
diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd3f488ff70266c8a676e11ee261b74b7a4c43d51
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml	(.../CrNode.hbm.xml)	(revision 09decccca1a4d871be5772d51638fa13aa928349)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml	(.../CrNode.hbm.xml)	(revision d3f488ff70266c8a676e11ee261b74b7a4c43d51)
@@ -140,6 +140,19 @@
         </meta>
         <column name="workspace_id" />
     </many-to-one>
-
+    <!-- bi-directional many-to-one association to CrNodeVersion - which is my parent node? -->
+    <many-to-one
+        name="parentNodeVersion"
+        class="org.lamsfoundation.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="parent_nv_id"         
+        </meta>
+        <column name="parent_nv_id" />
+    </many-to-one>
 </class>
 </hibernate-mapping>
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml
===================================================================
diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd3f488ff70266c8a676e11ee261b74b7a4c43d51
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml	(.../CrNodeVersion.hbm.xml)	(revision 09decccca1a4d871be5772d51638fa13aa928349)
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml	(.../CrNodeVersion.hbm.xml)	(revision d3f488ff70266c8a676e11ee261b74b7a4c43d51)
@@ -88,46 +88,35 @@
         <column name="node_id" />
     </many-to-one>
 
-    <!-- bi-directional many-to-one association to CrNodeVersion - which is my parent node? -->
-    <many-to-one
-        name="parentNodeVersion"
-        class="org.lamsfoundation.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="parent_nv_id"         
-        </meta>
-        <column name="parent_nv_id" />
-    </many-to-one>
     <!-- bi-directional one-to-many association to CrNodeVersion - what are my child nodes? -->
-    <set
-        name="childNodeVersions"
-        lazy="false"
-        inverse="true"
-		cascade="all-delete-orphan"
-    >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="false"
-            cascade="all-delete-orphan"
+<!-- don't use this at present - would want to lazy load but can't work out how I actually -->
+<!--  get the set later. So do everything manually for the moment -->
+<!--  <set																 -->
+<!--          name="childNodes"											 -->
+<!--          lazy="false"												 -->
+<!--          inverse="true"										 	 -->
+<!--  		cascade="all-delete-orphan"									 -->
+<!--      >										 					 	 -->
+<!--          <meta attribute="field-description">						 -->
+<!--             @hibernate.set											 -->
+<!--              lazy="true"											 -->
+<!--              inverse="false"										 -->
+<!--              cascade="all-delete-orphan"							 -->
+<!--  																	 -->
+<!--             @hibernate.collection-key								 -->
+<!--              column="parent_nv_id"									 -->
+<!--  																	 -->
+<!--             @hibernate.collection-one-to-many						 -->
+<!--              class="org.lamsfoundation.lams.contentrepository.CrNodeVersion"	-->
+<!--          </meta>													 -->
+<!--          <key>														 -->
+<!--              <column name="parent_nv_id" />						 -->
+<!--          </key>													 -->
+<!--          <one-to-many 												 -->
+<!--              class="org.lamsfoundation.lams.contentrepository.CrNode"		-->
+<!--          />														 -->
+<!--      </set>														 -->
 
-           @hibernate.collection-key
-            column="parent_nv_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.contentrepository.CrNodeVersion"
-        </meta>
-        <key>
-            <column name="parent_nv_id" />
-        </key>
-        <one-to-many 
-            class="org.lamsfoundation.lams.contentrepository.CrNodeVersion"
-        />
-    </set>
      <!-- bi-directional one-to-many association to CrNodeVersionProperty -->
     <set
         name="crNodeVersionProperties"
Index: lams_contentrepository/db/sql/create_content_repository_tables.sql
===================================================================
diff -u -rce142bc43a9462537c3c578e9ed2bac72d600375 -rd3f488ff70266c8a676e11ee261b74b7a4c43d51
--- lams_contentrepository/db/sql/create_content_repository_tables.sql	(.../create_content_repository_tables.sql)	(revision ce142bc43a9462537c3c578e9ed2bac72d600375)
+++ lams_contentrepository/db/sql/create_content_repository_tables.sql	(.../create_content_repository_tables.sql)	(revision d3f488ff70266c8a676e11ee261b74b7a4c43d51)
@@ -55,6 +55,8 @@
 
 ---
 --- Table structure for table 'lams_cr_node'
+--- A node can only belong to one parent - so each time a new version of 
+--- a package is created, all the nodes are recreated.
 ---
 
 CREATE TABLE lams_cr_node (
@@ -64,12 +66,18 @@
   type varchar(255) NOT NULL,
   created_date_time timestamp(14) NOT NULL,
   next_version_id bigint(20) unsigned NOT NULL default '1',
+  parent_nv_id bigint(20) unsigned,
   PRIMARY KEY  (node_id),
   UNIQUE KEY node_id (node_id),
-  KEY workspace_id (workspace_id),
+  INDEX (workspace_id),
+  INDEX (parent_nv_id),
   CONSTRAINT FK_lams_cr_node_1 
   		FOREIGN KEY (workspace_id) 
-  		REFERENCES lams_cr_workspace (workspace_id) 
+  		REFERENCES lams_cr_workspace (workspace_id)
+  		ON DELETE NO ACTION ON UPDATE NO ACTION,
+  CONSTRAINT FK_lams_cr_node_2 
+  		FOREIGN KEY (parent_nv_id) 
+  		REFERENCES lams_cr_node_version (nv_id) 
   		ON DELETE NO ACTION ON UPDATE NO ACTION
 ) TYPE=InnoDB COMMENT='The main table containing the node definition';
 
@@ -79,25 +87,17 @@
 -- 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 (
   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,
-  parent_nv_id bigint(20) unsigned,
   PRIMARY KEY  (nv_id),
   INDEX (node_id, version_id),
-  INDEX (parent_nv_id),
   CONSTRAINT FK_lams_cr_node_version_1 
   		FOREIGN KEY (node_id) 
   		REFERENCES lams_cr_node (node_id) 
-  		ON DELETE NO ACTION ON UPDATE NO ACTION,
-  CONSTRAINT FK_lams_cr_node_version_2 
-  		FOREIGN KEY (parent_nv_id) 
-  		REFERENCES lams_cr_node_version (nv_id) 
   		ON DELETE NO ACTION ON UPDATE NO ACTION
 ) TYPE=InnoDB COMMENT='Represents a version of a node';
 
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java
===================================================================
diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd3f488ff70266c8a676e11ee261b74b7a4c43d51
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java	(.../CrNode.java)	(revision 09decccca1a4d871be5772d51638fa13aa928349)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java	(.../CrNode.java)	(revision d3f488ff70266c8a676e11ee261b74b7a4c43d51)
@@ -10,6 +10,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.log4j.Logger;
 
 
 /** 
@@ -19,7 +20,9 @@
 */
 public class CrNode implements Serializable {
 
-    /** identifier field */
+	protected Logger log = Logger.getLogger(CrNode.class);
+
+	/** identifier field */
     private Long nodeId;
 
     /** nullable persistent field */
@@ -38,6 +41,9 @@
     private org.lamsfoundation.lams.contentrepository.CrWorkspace crWorkspace;
 
     /** persistent field */
+    private org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion;
+
+    /** versions of this node. persistent field */
     private Set crNodeVersions;
     
     /** transitory field. 
@@ -47,12 +53,13 @@
 	private SortedSet versionHistory = null;
 
     /** full constructor */
-    public CrNode(String path, String type, Date createdDateTime, Long nextVersionId, org.lamsfoundation.lams.contentrepository.CrWorkspace crWorkspace, Set crNodeVersions) {
+    public CrNode(String path, String type, Date createdDateTime, Long nextVersionId, org.lamsfoundation.lams.contentrepository.CrWorkspace crWorkspace, org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion, Set crNodeVersions) {
         this.path = path;
         this.type = type;
         this.createdDateTime = createdDateTime;
         this.nextVersionId = nextVersionId;
         this.crWorkspace = crWorkspace;
+        this.parentNodeVersion = parentNodeVersion;
         this.crNodeVersions = crNodeVersions;
     }
 
@@ -61,10 +68,11 @@
     }
 
     /** minimal constructor */
-    public CrNode(String type, Long nextVersionId, org.lamsfoundation.lams.contentrepository.CrWorkspace crWorkspace, Set crNodeVersions) {
+    public CrNode(String type, Long nextVersionId, org.lamsfoundation.lams.contentrepository.CrWorkspace crWorkspace,  org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion, Set crNodeVersions) {
         this.type = type;
         this.nextVersionId = nextVersionId;
         this.crWorkspace = crWorkspace;
+        this.parentNodeVersion = parentNodeVersion;
         this.crNodeVersions = crNodeVersions;
     }
 
@@ -155,6 +163,23 @@
         this.crWorkspace = crWorkspace;
     }
 
+    /**
+     * Get the parent node/version to this node.
+     *  
+     *            @hibernate.many-to-one
+     *             not-null="true"
+     *            @hibernate.column name="parent_nv_id"         
+     *         
+     */
+    public org.lamsfoundation.lams.contentrepository.CrNodeVersion getParentNodeVersion() {
+        return this.parentNodeVersion;
+    }
+
+    public void setParentNodeVersion(org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion) {
+        this.parentNodeVersion = parentNodeVersion;
+    }
+
+
     /** 
      *            @hibernate.set
      *             lazy="false"
@@ -193,6 +218,7 @@
             .append(this.getType(), castOther.getType())
             .append(this.getCreatedDateTime(), castOther.getCreatedDateTime())
             .append(this.getCrWorkspace(), castOther.getCrWorkspace())
+            .append(this.getParentNodeVersion(), castOther.getParentNodeVersion())
             .isEquals();
     }
 
@@ -203,6 +229,7 @@
             .append(getType())
             .append(getCreatedDateTime())
             .append(getCrWorkspace())
+            .append(getParentNodeVersion())			
             .toHashCode();
     }
 
@@ -263,8 +290,13 @@
 	public CrNodeVersion getNodeVersion(Long versionId) 
 		{
 
+		long start = System.currentTimeMillis();
+		String key = "getNodeVersion "+versionId;
+
 		CrNodeVersion nodeVersion = null;
 		Set nodeVersionSet = getCrNodeVersions();
+		log.error(key+" gotSet "+(System.currentTimeMillis()-start));
+		
 		if ( nodeVersionSet != null ) {
 			Iterator iter = nodeVersionSet.iterator();
 			if ( versionId != null ) {
@@ -273,6 +305,7 @@
 				nodeVersion = findLatestVersion(iter);
 			}
 		} 
+		log.error(key+" gotVersion "+(System.currentTimeMillis()-start));
 		return nodeVersion;
 	}
 	
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java
===================================================================
diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd3f488ff70266c8a676e11ee261b74b7a4c43d51
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java	(.../CrNodeVersion.java)	(revision 09decccca1a4d871be5772d51638fa13aa928349)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java	(.../CrNodeVersion.java)	(revision d3f488ff70266c8a676e11ee261b74b7a4c43d51)
@@ -31,36 +31,32 @@
     /** persistent field */
     private org.lamsfoundation.lams.contentrepository.CrNode node;
 
-    /** persistent field */
-    private org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion;
+    /* child Nodes. persistent field 
+    private Set childNodes;
+    */
 
     /** persistent field */
-    private Set childNodeVersions;
-
-    /** persistent field */
     private Set crNodeVersionProperties;
 
     /** full constructor */
-    public CrNodeVersion(Long versionId, Date createdDateTime, org.lamsfoundation.lams.contentrepository.CrNode node, org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion, Set crNodeVersionProperties, Set childNodeVersions) {
+    public CrNodeVersion(Long versionId, Date createdDateTime, org.lamsfoundation.lams.contentrepository.CrNode node, Set crNodeVersionProperties) {
         this.versionId = versionId;
         this.createdDateTime = createdDateTime;
         this.node = node;
-        this.parentNodeVersion = parentNodeVersion;
         this.crNodeVersionProperties = crNodeVersionProperties;
-        this.childNodeVersions = childNodeVersions;
+        //this.childNodes = childNodes;
     }
 
     /** default constructor */
     public CrNodeVersion() {
     }
 
     /** minimal constructor */
-    public CrNodeVersion(Long versionId, org.lamsfoundation.lams.contentrepository.CrNode node, org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion, Set crNodeVersionProperties, Set childNodeVersions) {
+    public CrNodeVersion(Long versionId, org.lamsfoundation.lams.contentrepository.CrNode node,Set crNodeVersionProperties) {
         this.versionId = versionId;
         this.node = node;
-        this.parentNodeVersion = parentNodeVersion;
         this.crNodeVersionProperties = crNodeVersionProperties;
-        this.childNodeVersions = childNodeVersions;
+        //this.childNodes = childNodes;
     }
 
     /** 
@@ -123,20 +119,6 @@
     }
 
     /** 
-     *            @hibernate.many-to-one
-     *             not-null="true"
-     *            @hibernate.column name="parent_nv_id"         
-     *         
-     */
-    public org.lamsfoundation.lams.contentrepository.CrNodeVersion getParentNodeVersion() {
-        return this.parentNodeVersion;
-    }
-
-    public void setParentNodeVersion(org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion) {
-        this.parentNodeVersion = parentNodeVersion;
-    }
-
-    /** 
      *            @hibernate.set
      *             lazy="false"
      *             inverse="true"
@@ -155,11 +137,14 @@
         this.crNodeVersionProperties = crNodeVersionProperties;
     }
 
-    /** 
+    /* 
      * Gets the set of child nodes. Do not use this method if you can use
-     * addChildNodeVersion(), removeChildNodeVersion() or 
-     * getChildNodeVersion() instead.
+     * addChildNode(), removeChildNode() or 
+     * getChildNode() instead.
      * 
+     * This is lazy loaded, so will need special care when you need these
+     * details.
+     * 
      *            @hibernate.set
      *             lazy="false"
      *             inverse="true"
@@ -169,88 +154,88 @@
      *            @hibernate.collection-one-to-many
      *             class="org.lamsfoundation.lams.contentrepository.CrNodeVersion"
      *         
-     */
-    public Set getChildNodeVersions() {
-        return this.childNodeVersions;
+    public Set getChildNodes() {
+        return this.childNodes;
     }
+     */
 
-    /**
+    /*
     * Assigns a new set of child nodes. Do not use this method if 
-    * you can use addChildNodeVersion(), removeChildNodeVersion() or 
-    * getChildNodeVersion() instead.
-    */
-    public void setChildNodeVersions(Set childNodeVersions) {
-        this.childNodeVersions = childNodeVersions;
+    * you can use addChildNode(), removeChildNode() or 
+    * getChildNode() instead.
+    public void setChildNodes(Set childNodes) {
+        this.childNodes = childNodes;
     }
+    */
 
-    /** Add a child node to the childNodeVersions collection. 
-     * Use this method rather than calling getChildNodeVersions()
-     * and adding to the set. See also removeChildNodeVersion() 
-     * and getChildNodeVersion();
+    /** Add a child node to the child collection. 
+     * Use this method rather than calling getChildNodes()
+     * and adding to the set. See also removeChildNode() 
+     * and getChildNode();
      * 
      * @param childNode
-     */
-    public void addChildNodeVersion(CrNodeVersion childNode) {
-    	Set set = getChildNodeVersions();
+    public void addChildNode(CrNode childNode) {
+    	Set set = getChildNodes();
     	
     	if ( set == null ) {
     		set = new HashSet();
-    		setChildNodeVersions(set);
+    		setChildNodes(set);
     	}
     	
-    	getChildNodeVersions().add(childNode);
+    	getChildNodes().add(childNode);
     }
+     */
 
-    /** Remove a child node to the childNodeVersions collection. 
-     * Use this method rather than calling getChildNodeVersions()
-     * and iterating through the set. See also addChildNodeVersion() 
-     * and getChildNodeVersion();
+    /** Remove a child node to the childNodes collection. 
+     * Use this method rather than calling getChildNodes()
+     * and iterating through the set. See also addChildNode() 
+     * and getChildNode();
      * 
      * Uses equals method defined in this class.
      * 
      * Not tested!!!!
      * 
      * @param childNode
-     */
-    public void removeChildNodeVersion(CrNodeVersion childNode) {
-    	Set set = getChildNodeVersions();
+    public void removeChildNode(CrNode childNode) {
+    	Set set = getChildNodes();
     	
     	if ( set != null ) {
     		Iterator iter = set.iterator();
     		boolean removed = false;
     		while ( iter.hasNext() && ! removed ) {
-				CrNodeVersion element = (CrNodeVersion) iter.next();
+    			CrNode element = (CrNode) iter.next();
 				if ( element.equals(childNode) ) {
 					iter.remove();
 				}
 			}
     	}
     }
+     */
 
-    /** Remove a child node to the childNodeVersions collection. 
-     * Use this method rather than calling getChildNodeVersions()
-     * and iterating through the set. See also addChildNodeVersion() 
-     * and removeChildNodeVersion();
+    /** Get a child node from the childNodes collection. 
+     * Use this method rather than calling getChildNodes()
+     * and iterating through the set. See also addChildNode() 
+     * and removeChildNode();
      * 
      * @param relPath of child
-     */
-    public CrNodeVersion getChildNodeVersion(String relPath) {
+    public CrNode getChildNode(String relPath) {
     	 
-    	if ( getChildNodeVersions() == null )
+    	if ( getChildNodes() == null )
     		return null;
     
-    	CrNodeVersion childNode = null;
-   		Iterator iter = getChildNodeVersions().iterator();
+    	CrNode childNode = null;
+   		Iterator iter = getChildNodes().iterator();
 		while (iter.hasNext() && childNode == null) {
-			CrNodeVersion element = (CrNodeVersion) iter.next();
-	    	String path = element.getNode().getPath();
+			CrNode element = (CrNode) iter.next();
+	    	String path = element.getPath();
 	    	if ( ( relPath == null && path == null ) || 
 				 ( relPath != null && relPath.equals(path)) ) {
 	    		childNode = element;
 			}
 		}
 		return childNode;
     }
+     */
 
     public String toString() {
         return new ToStringBuilder(this)
@@ -269,7 +254,6 @@
             .append(this.getVersionId(), castOther.getVersionId())
             .append(this.getCreatedDateTime(), castOther.getCreatedDateTime())
             .append(this.getNode(), castOther.getNode())
-            .append(this.getParentNodeVersion(), castOther.getParentNodeVersion())
             .isEquals();
     }
 
@@ -279,7 +263,6 @@
             .append(getVersionId())
             .append(getCreatedDateTime())
             .append(getNode())
-            .append(getParentNodeVersion())
             .toHashCode();
     }
     
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleRepository.java
===================================================================
diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd3f488ff70266c8a676e11ee261b74b7a4c43d51
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleRepository.java	(.../SimpleRepository.java)	(revision 09decccca1a4d871be5772d51638fa13aa928349)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleRepository.java	(.../SimpleRepository.java)	(revision d3f488ff70266c8a676e11ee261b74b7a4c43d51)
@@ -320,8 +320,12 @@
 	 * Does not cache the node. If versionId is null, then gets the latest version.
 	 * @throws ItemNotFoundException*/
 	private SimpleVersionedNode getNode(Long workspaceId, Long uuid, Long versionId) throws ItemNotFoundException {
+		long start = System.currentTimeMillis();
+		String key = "getNode "+uuid;
 		SimpleVersionedNode dbNode = (SimpleVersionedNode) beanFactory.getBean("node", SimpleVersionedNode.class);
+		log.error(key+" beanCreated "+(System.currentTimeMillis()-start));
 		dbNode.loadData(workspaceId, uuid,versionId);
+		log.error(key+" loadedData "+(System.currentTimeMillis()-start));
 		return dbNode;
 	}
 	
@@ -543,7 +547,10 @@
 			String relPath) throws AccessDeniedException,
 			ItemNotFoundException, FileException {
 
-		IVersionedNodeAdmin latestNodeVersion = getNode(ticket.getWorkspaceId(),uuid,version);
+		long start = System.currentTimeMillis();
+
+		IVersionedNode latestNodeVersion = getNode(ticket.getWorkspaceId(),uuid,version);
+		log.error("getFileItem latestNodeVersion "+(System.currentTimeMillis()-start));
 		
 		if ( relPath == null ) {
 			
@@ -554,7 +561,9 @@
 		} else {
     	
    			// find the node indicated by the relPath
-   			return latestNodeVersion.getNode(relPath);
+			IVersionedNode childNode = latestNodeVersion.getNode(relPath); 
+			log.error("getFileItem latestNodeVersion.getNode "+(System.currentTimeMillis()-start));
+   			return childNode;
 		}
 	}
 	
@@ -564,15 +573,19 @@
 	public List getPackageNodes(ITicket ticket, Long uuid, Long version) throws AccessDeniedException,
 			ItemNotFoundException, FileException {
 
+		long start = System.currentTimeMillis();
 		IVersionedNodeAdmin latestNodeVersion = getNode(ticket.getWorkspaceId(),uuid,version);
+		log.error("getPackageNodes latestNodeVersion "+(System.currentTimeMillis()-start));
 		
 		Set childNodes = latestNodeVersion.getChildNodes();
 		int childNodesSize = childNodes != null ? childNodes.size() : 0;
+		log.error("getPackageNodes getChildNodes "+(System.currentTimeMillis()-start));
 		
 		ArrayList list = new ArrayList(1+childNodesSize);
 		list.add(latestNodeVersion);
 		list.addAll(childNodes);
 
+		log.error("getPackageNodes end "+(System.currentTimeMillis()-start));
 		return list;
 	}
 
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionedNode.java
===================================================================
diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd3f488ff70266c8a676e11ee261b74b7a4c43d51
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionedNode.java	(.../SimpleVersionedNode.java)	(revision 09decccca1a4d871be5772d51638fa13aa928349)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionedNode.java	(.../SimpleVersionedNode.java)	(revision d3f488ff70266c8a676e11ee261b74b7a4c43d51)
@@ -63,6 +63,7 @@
 
 	private CrNode node = null;
 	private CrNodeVersion nodeVersion = null;
+	private List childNodes = null;
 	private InputStream newIStream = null;
 	private String filePath = null; // transient data - set when the input stream is written out.
 	private ITicket ticket = null; // transient data - using for grouping nodes in a session
@@ -111,11 +112,16 @@
 		CrNodeVersion parentNodeVersion = parentNode != null ? parentNode.nodeVersion : null; 
 		createCrNode(relPath, nodeTypeName, workspace, parentNodeVersion); 
 		if ( parentNode != null ) {
-			parentNode.nodeVersion.addChildNodeVersion(this.nodeVersion);
+			parentNode.addChildNode(this.node);
 		}
-		
 	}
 
+	private void addChildNode(CrNode newChild) {
+		if ( childNodes == null ) {
+			childNodes = new ArrayList();
+		}
+		childNodes.add(newChild);
+	}
 	/** Load the data from the database (or other datastore).
 	 * Creates the CrNode and CrNodeVersion objects. 
 	 * Equivalent of initialiseNode for existing nodes
@@ -126,6 +132,8 @@
 	 * crNode and crNodeVersion objects will be disconnected
 	 * from the session, as the session will have been ended
 	 * with the Spring transaction.
+	 * 
+	 * If versionId is null, then gets the latest version
 	 */
 	protected void loadData(Long workspaceId, Long uuid, Long versionId) throws ItemNotFoundException {
 
@@ -137,12 +145,15 @@
 			throw new ItemNotFoundException("Workspace Id is null, unable to find node.");
 		}
 
-		// If version id is null, then get latest version!
 		node = null;
 		nodeVersion = null;
 
+		long start = System.currentTimeMillis();
+		String key = "loadData "+uuid;
+
 		try {
 			node = (CrNode) nodeDAO.find(CrNode.class, uuid);
+			log.error(key+" nodeRetrieved "+(System.currentTimeMillis()-start));
 		} catch (HibernateObjectRetrievalFailureException e ) {
 		}
 
@@ -165,6 +176,7 @@
 		 * to be created? 
 		 */
 		nodeVersion = node.getNodeVersion(versionId);
+		log.error(key+" versionsRetrieved "+(System.currentTimeMillis()-start));
 		if ( nodeVersion == null ) {
 			throw new ItemNotFoundException("No version " 
 					+ ( versionId != null ? "#"+versionId.toString() : "")
@@ -200,9 +212,9 @@
 		// get next version id
 		Long nextVersionId = this.node.incrementNextVersionId();
 		
+		this.node.setParentNodeVersion(existingNode.node.getParentNodeVersion());
 		nodeVersion = createCrNodeVersion(node.getType(), 
-						new Date(System.currentTimeMillis()), nextVersionId,
-						existingNode.nodeVersion.getParentNodeVersion());
+						new Date(System.currentTimeMillis()), nextVersionId);
 		node.getCrNodeVersions().add(nodeVersion);
 	}
 
@@ -461,8 +473,8 @@
 		Date createdDate = new Date(System.currentTimeMillis());
 
 		// start the next version id at 1, which is used straight away by incrementNextVersionId()
-		node = new CrNode(relPath, nodeTypeName, createdDate, new Long(1), workspace, null);
-		nodeVersion = createCrNodeVersion(nodeTypeName, createdDate, node.incrementNextVersionId(), parentNode);  
+		node = new CrNode(relPath, nodeTypeName, createdDate, new Long(1), workspace, parentNode, null);
+		nodeVersion = createCrNodeVersion(nodeTypeName, createdDate, node.incrementNextVersionId());  
 		
 		HashSet versions = new HashSet();
 		versions.add(nodeVersion);
@@ -473,13 +485,12 @@
 	/** Create a version part of a node. 
 	 */
 	protected CrNodeVersion createCrNodeVersion(String nodeTypeName,  
-				Date createdDate, Long versionId, CrNodeVersion parentNode) {
+				Date createdDate, Long versionId) {
 		
 		nodeVersion = new CrNodeVersion();
 		nodeVersion.setCreatedDateTime(createdDate);
 		nodeVersion.setNode(node);
 		nodeVersion.setVersionId(versionId);
-		nodeVersion.setParentNodeVersion(parentNode);
 		// nvId is set automatically on save.
 		// ??nodeId is set automatically on save
 		return nodeVersion; 
@@ -616,9 +627,9 @@
 					}
 				}
 				String msg = "Result of rolling back file changes:";
-				if ( deleted.length() > 0 )
+				if ( deleted != null && deleted.length() > 0 )
 					msg = msg + "   deleted file(s) "+deleted;
-				if ( failedDeleted.length() > 0)
+				if ( failedDeleted != null && failedDeleted.length() > 0)
 					msg = msg + "   unable to delete file(s) "+failedDeleted;
 				log.error(msg);
 			}
@@ -646,6 +657,18 @@
 			nodeVersion.setVersionDescription(versionDescription);
 	
 		nodeDAO.insert(node);
+		
+		// child nodes are done manually as the set is lazy loaded
+		// and can't work out how to do that properly using the DAO template!
+		// 'cause the session goes away.
+		if ( childNodes != null ) {
+			Iterator iter = childNodes.iterator();
+			while ( iter.hasNext() ) {
+				CrNode node = (CrNode) iter.next();
+				nodeDAO.insert(node);
+			}
+		}
+
 	}
 
 	/** Write the file out (if one exists). Sets the private attribute filePath.
@@ -681,18 +704,24 @@
     public IVersionedNode getNode(String relPath) 
     	throws ItemNotFoundException {
     	
+		String key = "getNode "+getUUID();
+		long start = System.currentTimeMillis();
+		log.error(key+" start 0");
+
 		nodeObjectInitilised("Unable to get child node.");
 		
     	if ( log.isDebugEnabled() ) {
     		log.debug("getNode for path "+relPath+" start.");
     	}
 
-		CrNodeVersion childNodeVersion = nodeVersion.getChildNodeVersion(relPath);
+		CrNode childNode = nodeDAO.findChildNode(nodeVersion, relPath);
+		log.error(key+" childNodeDB"+(System.currentTimeMillis()-start));
 		
-		if ( childNodeVersion != null ) {
+		if ( childNode != null ) {
 			SimpleVersionedNode newNode = (SimpleVersionedNode) beanFactory.getBean("node", SimpleVersionedNode.class);
-			newNode.node = childNodeVersion.getNode();
-			newNode.nodeVersion = childNodeVersion;
+			newNode.node = childNode;
+			newNode.nodeVersion = childNode.getNodeVersion(null); // get latest and only version
+			log.error(key+" returningNode"+(System.currentTimeMillis()-start));
 			return (IVersionedNode) newNode;
 		} else {
     		throw new ItemNotFoundException("Unable to find node with path "+relPath
@@ -705,16 +734,16 @@
 	 * @see org.lamsfoundation.lams.contentrepository.IVersionedNode#getChildNodes()
      */
     public Set getChildNodes() {
-    	Set childCrNodeVersions = nodeVersion.getChildNodeVersions();
+    	List childCrNodes = nodeDAO.findChildNodes(nodeVersion);
     	Set childNodes = new HashSet(); 
     		
-    	if ( childCrNodeVersions != null ) {
-    		Iterator iter = childCrNodeVersions.iterator();
+    	if ( childCrNodes != null ) {
+    		Iterator iter = childCrNodes.iterator();
     		while (iter.hasNext()) {
-				CrNodeVersion element = (CrNodeVersion) iter.next();
+    			CrNode element = (CrNode) iter.next();
 				SimpleVersionedNode newNode = (SimpleVersionedNode) beanFactory.getBean("node", SimpleVersionedNode.class);
-				newNode.node = element.getNode();
-				newNode.nodeVersion = element;
+				newNode.node = element;
+				newNode.nodeVersion = element.getNodeVersion(null);
 				childNodes.add(newNode);
 			}
     	}
@@ -734,7 +763,7 @@
 
     	nodeObjectInitilised("Unable to check if there is a parent node.");
 		
-		return (nodeVersion.getParentNodeVersion() != null);
+		return (node.getParentNodeVersion() != null);
 
     }
 
@@ -756,7 +785,7 @@
 	 * @see org.lamsfoundation.lams.contentrepository.IVersionedNode#hasNodes()
      */
     public boolean hasNodes() {
-    	Set childNodes = nodeVersion.getChildNodeVersions();
+    	List childNodes = nodeDAO.findChildNodes(nodeVersion);
     	return (childNodes != null && childNodes.size() > 0);
     }
 
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java
===================================================================
diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd3f488ff70266c8a676e11ee261b74b7a4c43d51
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java	(.../INodeDAO.java)	(revision 09decccca1a4d871be5772d51638fa13aa928349)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java	(.../INodeDAO.java)	(revision d3f488ff70266c8a676e11ee261b74b7a4c43d51)
@@ -6,6 +6,9 @@
 import java.io.Serializable;
 import java.util.List;
 
+import org.lamsfoundation.lams.contentrepository.CrNode;
+import org.lamsfoundation.lams.contentrepository.CrNodeVersion;
+
 /**
  * Data access routines for Nodes, versions and properties
  * 
@@ -26,4 +29,8 @@
 
 	public List findAll(Class objClass);
 	
+	public List findChildNodes(CrNodeVersion parentNodeVersion);
+	public CrNode findChildNode(CrNodeVersion parentNodeVersion, String relPath);
+
+	
 }
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java
===================================================================
diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd3f488ff70266c8a676e11ee261b74b7a4c43d51
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java	(.../NodeDAO.java)	(revision 09decccca1a4d871be5772d51638fa13aa928349)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java	(.../NodeDAO.java)	(revision d3f488ff70266c8a676e11ee261b74b7a4c43d51)
@@ -7,6 +7,8 @@
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.contentrepository.CrNode;
+import org.lamsfoundation.lams.contentrepository.CrNodeVersion;
 import org.lamsfoundation.lams.contentrepository.dao.INodeDAO;
 import org.springframework.orm.hibernate.support.HibernateDaoSupport;
 
@@ -42,4 +44,65 @@
 		return this.getHibernateTemplate().find(query);
 	}
 	
+	/** Get all child nodes for a node/version.
+	 * 
+	 * The child/parent relationship set is lazy loaded to make things
+	 * more efficient. But as the repository doesn't keep the session
+	 * open, the lazy loading can't occur! So load manually.
+	 * 
+	 * @param workspaceId
+	 * @return Set of CrNodes that are child nodes of this node/version 
+	 */
+	public List findChildNodes(CrNodeVersion parentNodeVersion) {
+
+		if ( log.isDebugEnabled() )
+			log.debug("Getting all child nodes for "+parentNodeVersion);
+		
+		String queryString = "from CrNode as n where n.parentNodeVersion = ?";
+		List nodes = getHibernateTemplate().find(queryString,parentNodeVersion);
+		
+		if(nodes.size() == 0){
+			log.debug("No nodes found");
+			return null;
+		}else{
+			if ( log.isDebugEnabled() )
+				log.debug("Returning "+nodes.size()+" nodes.");
+			return nodes;
+		}
+	}
+
+
+	/** Get all child nodes for a node/version.
+	 * 
+	 * The child/parent relationship set is lazy loaded to make things
+	 * more efficient. But as the repository doesn't keep the session
+	 * open, the lazy loading can't occur! So load manually.
+	 * 
+	 * @param workspaceId
+	 * @return Set of CrNodes that are child nodes of this node/version 
+	 */
+	public CrNode findChildNode(CrNodeVersion parentNodeVersion, String relPath) {
+
+		long start = System.currentTimeMillis();
+
+		if ( log.isDebugEnabled() )
+			log.debug("Getting child node from "+parentNodeVersion+" path "+relPath);
+		
+		
+		String queryString = "from CrNode as n where n.parentNodeVersion = ? and n.path = ? ";
+		List nodes = getHibernateTemplate().find(queryString,new Object[] {parentNodeVersion, relPath});
+		
+		log.error("findChildNodeDBLookup"+(System.currentTimeMillis()-start));
+		
+		if(nodes.size() == 0){
+			log.debug("No nodes found");
+			return null;
+		}else{
+			if ( nodes.size() == 0 ) {
+				log.error(nodes.size()+" matches found for "+parentNodeVersion+" path "+relPath);
+			}
+			return (CrNode) nodes.get(0);
+		}
+	}
+
 }
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java
===================================================================
diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd3f488ff70266c8a676e11ee261b74b7a4c43d51
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java	(.../WorkspaceDAO.java)	(revision 09decccca1a4d871be5772d51638fa13aa928349)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java	(.../WorkspaceDAO.java)	(revision d3f488ff70266c8a676e11ee261b74b7a4c43d51)
@@ -57,14 +57,6 @@
 	 * the necessary info when workspace is returned to the calling 
 	 * code. 
 	 * 
-	 * In fact, doing getNodes() here still doesn't work - there isn't
-	 * a session! So as a hack, I'll look up the nodes directly.
-	 * Yuck. The only other solution I can find easily doing a google
-	 * search is using OpenSessionInViewInterceptor/OpenSessionInViewFilter
-	 * but they seem to be designed for using when the whole item is beind
-	 * passed to a webapp - and we don't necessarily have a webapp here.
-	 * Maybe I'm just missing something in HibernateDaoSupport!
-	 * 
 	 * @param workspaceId
 	 * @return Set of CrNodes applicable to this workspace. 
 	 */
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/Download.java
===================================================================
diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd3f488ff70266c8a676e11ee261b74b7a4c43d51
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/Download.java	(.../Download.java)	(revision 09decccca1a4d871be5772d51638fa13aa928349)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/Download.java	(.../Download.java)	(revision d3f488ff70266c8a676e11ee261b74b7a4c43d51)
@@ -146,7 +146,7 @@
 			version = RepositoryDispatchAction.getLong(request.getParameter(RepositoryDispatchAction.VERSION_NAME));
 			
 			IVersionedNode node = getFileItem(ticket, uuid, version,null);
-			log.error(callId+" getFileItem1 (ms) "+(System.currentTimeMillis()-start));
+			log.error(callId+" getFileItem1 "+(System.currentTimeMillis()-start));
 			// update versionId in case it was null and we got the latest version...
 			version = node.getVersion();
 			
@@ -194,8 +194,9 @@
 			if ( relPathString == null )
 				errorInContent(request, response, "Filename is missing. "+expectedFormat,null);
 
+			log.error(callId+" beforeGetFileItem2 "+(System.currentTimeMillis()-start));
 			IVersionedNode node = getFileItem(ticket, uuid, version, relPathString);
-			log.error(callId+" getFileItem2 (ms) "+(System.currentTimeMillis()-start));
+			log.error(callId+" getFileItem2 "+(System.currentTimeMillis()-start));
 			if ( ! node.isNodeType(NodeType.FILENODE) ) {
 				errorInContent(request, response,"Unexpected type of node "
 						+node.getNodeType()+" Expected File node. Data is "+node,null);
@@ -204,7 +205,7 @@
 
 		}
 		
-		log.error(callId+" handleFileNode (ms) "+(System.currentTimeMillis()-start));
+		log.error(callId+" handleFileNode "+(System.currentTimeMillis()-start));
 		
 	}