Index: lams_contentrepository/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/.classpath,v
diff -u -r1.12 -r1.13
--- lams_contentrepository/.classpath	26 Jul 2005 14:34:52 -0000	1.12
+++ lams_contentrepository/.classpath	6 Sep 2006 01:38:26 -0000	1.13
@@ -4,8 +4,9 @@
 	<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="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams.jar"/>
+	<classpathentry kind="lib" path="D:/jboss-4.0.2/server/default/lib/jboss-j2ee.jar"/>
+	<classpathentry kind="lib" path="D:/jboss-4.0.2/server/default/lib/javax.servlet.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/Attic/CrNodeVersion.hbm.xml,v
diff -u -r1.5 -r1.6
--- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml	6 Oct 2005 06:38:03 -0000	1.5
+++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml	6 Sep 2006 01:38:25 -0000	1.6
@@ -46,6 +46,15 @@
             length="14"
         />
 
+        <property
+            name="userId"
+            type="java.lang.Integer"
+            update="true"
+            insert="true"
+            column="user_id"
+            not-null="true"
+        />
+
         <many-to-one
             name="node"
             class="org.lamsfoundation.lams.contentrepository.CrNode"
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java,v
diff -u -r1.10 -r1.11
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java	5 Apr 2006 23:24:18 -0000	1.10
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java	6 Sep 2006 01:38:25 -0000	1.11
@@ -78,7 +78,7 @@
 
 	/** Create the CrNode and its initial CrNodeVersion.  
 	 */
-	public CrNode(String relPath, String nodeTypeName, Date createdDateTime, CrWorkspace workspace, 
+	public CrNode(String relPath, String nodeTypeName, Date createdDateTime, Integer userId, CrWorkspace workspace, 
 			CrNodeVersion parentNodeVersion, String versionDescription)	{ 
 		
         this.path = relPath;
@@ -90,7 +90,7 @@
         
         this.crWorkspace = workspace;
         this.parentNodeVersion = parentNodeVersion;
-		this.addCrNodeVersion(new CrNodeVersion(this, createdDateTime, incrementNextVersionId(), versionDescription));
+		this.addCrNodeVersion(new CrNodeVersion(this, createdDateTime, incrementNextVersionId(), versionDescription, userId));
 	}
 
     /** full constructor */
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java,v
diff -u -r1.7 -r1.8
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java	5 Apr 2006 23:24:18 -0000	1.7
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java	6 Sep 2006 01:38:25 -0000	1.8
@@ -54,6 +54,9 @@
     private Date createdDateTime;
 
     /** persistent field */
+    private Integer userId;
+
+    /** persistent field */
     private org.lamsfoundation.lams.contentrepository.CrNode node;
 
     /* child Nodes. persistent field 
@@ -78,10 +81,11 @@
 
 	/** Normal constructor 
 	 */
-	public CrNodeVersion (CrNode node, Date createdDate, Long versionId, String versionDescription) {
+	public CrNodeVersion (CrNode node, Date createdDate, Long versionId, String versionDescription, Integer userId) {
 		this.createdDateTime = createdDate;
 		this.node = node;
 		this.versionId = versionId;
+		this.userId = userId;
 		setVersionDescription(versionDescription);
 	}
 
@@ -142,6 +146,21 @@
         this.createdDateTime = createdDateTime;
     }
 
+	/** 
+     *            @hibernate.property
+     *		       type="java.lang.Integer"
+     *		       column="user_id"
+     *			   not-null="true"
+     */
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+
     /** 
      * bi-directional many-to-one association to CrNode
      * 
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IVersionedNode.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IVersionedNode.java,v
diff -u -r1.4 -r1.5
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IVersionedNode.java	5 Apr 2006 23:24:18 -0000	1.4
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IVersionedNode.java	6 Sep 2006 01:38:25 -0000	1.5
@@ -200,5 +200,12 @@
 	 */
 	public InputStream getFile() throws FileException;
 
+   /**
+     * Get the user_id of the user who created this node.
+     *  
+     * @return userId
+     */
+    public Integer getUserId();
 
+
 }
\ No newline at end of file
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/package.html
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/package.html,v
diff -u -r1.5 -r1.6
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/package.html	30 Nov 2005 02:34:30 -0000	1.5
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/package.html	6 Sep 2006 01:38:25 -0000	1.6
@@ -193,15 +193,17 @@
 							fileInputStream, 
 							filename, 
 							fileMimeType, 
-							"This is the initial version");
+							"This is the initial version",
+							user.getUserId());
 
 	User uploads a new version of the file:
 	NodeKey nodeKey2 = repositoryService.updateFileItem(repositoryTicket, 
 							nodeKey1.getUuid(), 
 							filename,
 							fileInputStream, 
 							fileMimeType, 
-							"This is the updated version);
+							"This is the updated version,
+							user.getUserId());
 
 	Get the second version of the file:
 	IVersionedNode node = repositoryService.getFileItem(repositoryTicket, 
@@ -210,12 +212,14 @@
 	Copy the initial version of the file node. CopyNodeVersion copies the specified version or last version (if not specified), duplicates the actual files.
 	NodeKey nodeKey3 = repositoryService.copyNodeVersion(repositoryTicket, 
 							nodeKey1.getUuId(),
-							nodeKey1.getVersion());
+							nodeKey1.getVersion(),
+							user.getUserId());
 
 	Copy the latest version of the file node. 
 	NodeKey nodeKey3 = repositoryService.copyNodeVersion(repositoryTicket, 
 							nodeKey1.getUuId(),
-							null);
+							null,
+							user.getUserId());
 
 	Delete the second version of the file:
 	String[] problemFiles = repositoryService.deleteVersion(repositoryTicket,nodeKey2.getUuid(), nodeKey2.getVersion());
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java,v
diff -u -r1.8 -r1.9
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java	28 May 2006 23:54:58 -0000	1.8
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java	6 Sep 2006 01:38:25 -0000	1.9
@@ -87,6 +87,9 @@
     /**
      * Save a file in the content repository.
      * 
+     * TODO To be removed from the system and replaced with the call with the user id.
+	 * @Deprecated
+     * 
      * @param stream Input filestream. Mandatory.
      * @param fileName Input filename. Mandatory.
      * @param mimeType Mimetype of file. Optional.
@@ -102,8 +105,35 @@
             RepositoryCheckedException;
 
     /**
+     * Save a file in the content repository.
+     * 
+     * @param stream Input filestream. Mandatory.
+     * @param fileName Input filename. Mandatory.
+     * @param mimeType Mimetype of file. Optional.
+     * @param fileProperty is this for online or offline instructions? Should be TYPE_ONLINE or TYPE_OFFLINE. Mandatory.
+     * @return key to the new content repository node
+     * @throws InvalidParameterException One of the mandatory parameters is missing.
+     * @throws FileException An error occured writing the input stream to disk.
+     * @throws RepositoryCheckedException Some other error occured.
+     */
+    public abstract NodeKey uploadFile(InputStream stream, String fileName,
+            String mimeType, String fileProperty, Integer userId)
+            throws RepositoryCheckedException, InvalidParameterException,
+            RepositoryCheckedException;
+
+    /**
      * Save a directory of files in the content repository.
      * 
+     * TODO To be removed from the system and replaced with the call with the user id.
+	 * @Deprecated
+	 */
+    public abstract NodeKey uploadPackage(String dirPath, String startFile) 
+    throws RepositoryCheckedException, InvalidParameterException, 
+    RepositoryCheckedException;
+
+    /**
+     * Save a directory of files in the content repository.
+     * 
 	 * @param ticket ticket issued on login. Identifies tool and workspace - mandatory 
 	 * @param dirPath directory path containing files - mandatory
 	 * @param startFile relative path of initial file - optional
@@ -112,7 +142,7 @@
      * @throws FileException An error occured writing the files to disk.
      * @throws RepositoryCheckedException Some other error occured.
      */
-    public abstract NodeKey uploadPackage(String dirPath, String startFile) 
+    public abstract NodeKey uploadPackage(String dirPath, String startFile, Integer userId) 
     		throws RepositoryCheckedException, InvalidParameterException, 
     		RepositoryCheckedException;
  
@@ -127,14 +157,26 @@
 
     /**
      * Copy an entry in the content repository.
-     * 
+     * TODO To be removed from the system and replaced with the call with the user id.
+	 * @Deprecated
+	 *
      * @param uuid id of the file node. Mandatory
      * @throws ItemNotFoundException Node to copy cannot be found 
      * @throws RepositoryCheckedException Some other error occured.
      */
     public abstract NodeKey copyFile(Long uuid) 
     		throws ItemNotFoundException, RepositoryCheckedException;
 
+    /**
+     * Copy an entry in the content repository.
+     * 
+     * @param uuid id of the file node. Mandatory
+     * @throws ItemNotFoundException Node to copy cannot be found 
+     * @throws RepositoryCheckedException Some other error occured.
+     */
+    public abstract NodeKey copyFile(Long uuid, Integer userId) 
+    		throws ItemNotFoundException, RepositoryCheckedException;
+
     /** Get a file node. 
      * @param uuid id of the file node. Mandatory
      * @throws FileException An error occured writing the input stream to disk.
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java,v
diff -u -r1.11 -r1.12
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java	25 May 2006 06:07:50 -0000	1.11
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java	6 Sep 2006 01:38:25 -0000	1.12
@@ -188,6 +188,14 @@
 	}
 
     /**
+     * TODO To be removed from the system and replaced with the call with the user id.
+     */
+    public NodeKey uploadFile(InputStream stream, String fileName, String mimeType, String fileProperty) throws RepositoryCheckedException, InvalidParameterException, RepositoryCheckedException {
+		log.error("uploadFile(InputStream stream, String fileName, String mimeType, String fileProperty) to be removed - it sets the owner of files in the content repository to 1. Some tool needs to be updated.");
+		return uploadFile(stream, fileName, mimeType, fileProperty, new Integer(1));
+    }
+
+    /**
      * Save a file in the content repository.
      * 
      * @param stream Input filestream. Mandatory.
@@ -199,18 +207,18 @@
      * @throws FileException An error occured writing the input stream to disk.
      * @throws RepositoryCheckedException Some other error occured.
      */
-    public NodeKey uploadFile(InputStream stream, String fileName, String mimeType, String fileProperty) throws RepositoryCheckedException, InvalidParameterException, RepositoryCheckedException {
+    public NodeKey uploadFile(InputStream stream, String fileName, String mimeType, String fileProperty, Integer userId) throws RepositoryCheckedException, InvalidParameterException, RepositoryCheckedException {
         if ( fileProperty == null )
             throw new InvalidParameterException("uploadFile: fileProperty parameter empty. Should be either TYPE_ONLINE or TYPE_OFFLINE");
 	    
         NodeKey nodeKey = null;
         try {
 		    try {
-		        nodeKey = getRepositoryService().addFileItem(getTicket(false), stream, fileName, mimeType, null);
+		        nodeKey = getRepositoryService().addFileItem(getTicket(false), stream, fileName, mimeType, null, userId);
 		    } catch (AccessDeniedException e) {
 		        log.warn("Unable to access repository to add file "+fileName
 					+"AccessDeniedException: "+e.getMessage()+" Retrying login.");
-	            nodeKey = getRepositoryService().addFileItem(getTicket(true), stream, fileName, mimeType, null);
+	            nodeKey = getRepositoryService().addFileItem(getTicket(true), stream, fileName, mimeType, null, userId);
 		    }
 	        
 		    try {
@@ -231,6 +239,14 @@
     }
 
     /**
+     * TODO To be removed from the system and replaced with the call with the user id.
+     */
+    public NodeKey uploadPackage(String dirPath, String startFile) throws RepositoryCheckedException, InvalidParameterException, RepositoryCheckedException {
+		log.error("uploadPackage(String dirPath, String startFile)  to be removed - it sets the owner of files in the content repository to 1. Some tool needs to be updated.");
+		return uploadPackage(dirPath, startFile, new Integer(1));
+    }
+
+    /**
      * Save a directory of files in the content repository.
      * 
 	 * @param ticket ticket issued on login. Identifies tool and workspace - mandatory 
@@ -241,18 +257,18 @@
      * @throws FileException An error occured writing the files to disk.
      * @throws RepositoryCheckedException Some other error occured.
      */
-    public NodeKey uploadPackage(String dirPath, String startFile) throws RepositoryCheckedException, InvalidParameterException, RepositoryCheckedException {
+    public NodeKey uploadPackage(String dirPath, String startFile, Integer userId) throws RepositoryCheckedException, InvalidParameterException, RepositoryCheckedException {
         if ( dirPath == null )
             throw new InvalidParameterException("uploadFile: dirPath parameter empty. Directory containing files must be supplied");
          	    
         NodeKey nodeKey = null;
         try {
 		    try {
-		        nodeKey = getRepositoryService().addPackageItem(getTicket(false), dirPath, startFile, null);
+		        nodeKey = getRepositoryService().addPackageItem(getTicket(false), dirPath, startFile, null, userId);
 		    } catch (AccessDeniedException e) {
 		        log.warn("Unable to access repository to add directory of files. AccessDeniedException: "
 		        		+e.getMessage()+" Retrying login.");
-		        nodeKey = getRepositoryService().addPackageItem(getTicket(true), dirPath, startFile, null);
+		        nodeKey = getRepositoryService().addPackageItem(getTicket(true), dirPath, startFile, null, userId);
 		    }
 	        
         } catch (RepositoryCheckedException e2) {
@@ -296,21 +312,29 @@
 		} 
     }
     /**
+     * TODO To be removed from the system and replaced with the call with the user id.
+     */
+    public NodeKey copyFile(Long uuid) throws ItemNotFoundException, RepositoryCheckedException {
+		log.error("copyFile(Long uuid) to be removed - it sets the owner of files in the content repository to 1. Some tool needs to be updated.");
+    	return copyFile(uuid, new Integer(1));
+    }
+
+    /**
      * Copy an entry in the content repository.
      * 
      * @param uuid id of the file node. Mandatory
      * @throws ItemNotFoundException Node to copy cannot be found 
      * @throws RepositoryCheckedException Some other error occured.
      */
-    public NodeKey copyFile(Long uuid) throws ItemNotFoundException, RepositoryCheckedException {
+    public NodeKey copyFile(Long uuid, Integer userId) throws ItemNotFoundException, RepositoryCheckedException {
         NodeKey nodeKey = null;
         try {
 	        try {
-				nodeKey = getRepositoryService().copyNodeVersion(getTicket(false), uuid, null);
+				nodeKey = getRepositoryService().copyNodeVersion(getTicket(false), uuid, null, userId);
 		    } catch (AccessDeniedException e) {
 		        log.warn("Unable to access repository to add copy node "+uuid
 					+"AccessDeniedException: "+e.getMessage()+" Retrying login.");
-	            nodeKey = getRepositoryService().copyNodeVersion(getTicket(true), uuid, null);
+	            nodeKey = getRepositoryService().copyNodeVersion(getTicket(true), uuid, null, userId);
 		    }
 	    } catch (ItemNotFoundException e) {
 	        log.warn("Unable to to copy node "+uuid
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/INodeFactory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/INodeFactory.java,v
diff -u -r1.2 -r1.3
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/INodeFactory.java	5 Apr 2006 23:24:18 -0000	1.2
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/INodeFactory.java	6 Sep 2006 01:38:24 -0000	1.3
@@ -52,7 +52,7 @@
 	public abstract SimpleVersionedNode createFileNode(CrWorkspace workspace,
 			SimpleVersionedNode parentNode, String relPath,
 			InputStream istream, String filename, String mimeType,
-			String versionDescription)
+			String versionDescription, Integer userId)
 			throws org.lamsfoundation.lams.contentrepository.InvalidParameterException;
 
 	/**
@@ -64,7 +64,7 @@
 	 * @throws RepositoryRuntimeException if an internal error occurs.
 	 */
 	public abstract SimpleVersionedNode createPackageNode(
-			CrWorkspace workspace, String initialPath, String versionDescription)
+			CrWorkspace workspace, String initialPath, String versionDescription, Integer userId)
 			throws org.lamsfoundation.lams.contentrepository.InvalidParameterException;
 
 	/**
@@ -75,7 +75,7 @@
 	 * @throws RepositoryRuntimeException if an internal error occurs.
 	 */
 	public abstract SimpleVersionedNode createDataNode(CrWorkspace workspace,
-			SimpleVersionedNode parentNode, String versionDescription)
+			SimpleVersionedNode parentNode, String versionDescription, Integer userId)
 			throws org.lamsfoundation.lams.contentrepository.InvalidParameterException;
 
 	/**
@@ -117,7 +117,8 @@
 	 * @throws RepositoryRuntimeException if an internal error occurs.
 	 * @see org.lamsfoundation.lams.contentrepository.IVersionedNode#createNewVersion(java.lang.String, java.lang.String)
 	 */
-	public abstract SimpleVersionedNode getNodeNewVersion(Long workspaceId, Long uuid, Long versionId, String versionDescription) throws ItemNotFoundException;
+	public abstract SimpleVersionedNode getNodeNewVersion(Long workspaceId, Long uuid, Long versionId, 
+			String versionDescription, Integer userId) throws ItemNotFoundException;
 
 
 	/** Copy the supplied node/version to a new node. Does not copy the history
@@ -131,7 +132,7 @@
 	 *   file, filename or mimetype properties are invalid.
 	 * @throws ValueFormatException will only occur if there is an internal bug as it will only happen if the filename or mimetype properties are not strings. 
 	 */
-	public abstract SimpleVersionedNode copy(SimpleVersionedNode originalNode)
+	public abstract SimpleVersionedNode copy(SimpleVersionedNode originalNode, Integer userId)
 			throws FileException, ValueFormatException,
 			InvalidParameterException;
 
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java,v
diff -u -r1.11 -r1.12
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java	23 Jun 2006 06:14:16 -0000	1.11
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java	6 Sep 2006 01:38:24 -0000	1.12
@@ -131,6 +131,15 @@
 	public void updateCredentials(ICredentials oldCredential, ICredentials newCredential)
 		throws AccessDeniedException, RepositoryCheckedException;
 
+	/**
+    * TODO To be removed from the system and replaced with the call with the user id.
+	 * @Deprecated
+	*/
+	public abstract NodeKey addFileItem(ITicket ticket, InputStream istream, String filename,
+			String mimeType, String versionDescription) 
+		throws FileException, AccessDeniedException, InvalidParameterException;
+	
+
 	/** 
 	 * Add a new file to the repository. This will create 
 	 * a completely new entry (node) in the repository, starting
@@ -139,14 +148,15 @@
 	 * @param istream new file, as an input stream - mandatory
 	 * @param mimeType mime type of file - optional
 	 * @param versionDescription human readable comment about the version - optional
+	 * @param userId user who is creating this node - mandatory
 	 * @return nodeKey (uuid and version)
      * @throws AccessDeniedException if ticket doesn't allow this action
      * @throws FileException if unable to save node due to file error
      * @throws InvalidParameterException if a required parameter is missing
      * @throws RepositoryRuntimeException if any internal errors have occured 
 	 */
 	public abstract NodeKey addFileItem(ITicket ticket, InputStream istream, String filename,
-					String mimeType, String versionDescription) 
+					String mimeType, String versionDescription, Integer userId) 
 			throws FileException, AccessDeniedException, InvalidParameterException;
 
 	/** 
@@ -161,14 +171,15 @@
 	 * @param dirPath directory path containing files - mandatory
 	 * @param startFile relative path of initial file - optional
 	 * @param versionDescription human readable comment about the version - optional
+	 * @param userId user who is creating this node - mandatory
 	 * @return nodeKey (uuid and version)
      * @throws AccessDeniedException if ticket doesn't allow this action
      * @throws FileException if unable to save node due to file error
      * @throws InvalidParameterException if a required parameter is missing
      * @throws RepositoryRuntimeException if any internal errors have occured 
 	 */
 	public abstract NodeKey addPackageItem(ITicket ticket, String dirPath, String startFile,
-				String versionDescription) 
+				String versionDescription, Integer userId) 
 		throws AccessDeniedException, InvalidParameterException, FileException;
 
     /** 
@@ -179,6 +190,7 @@
      * @param istream new file, as an input stream - mandatory
      * @param versionDescription human readable comment about the version - optional
      * @param mimeType mime type of file - optional
+	 * @param userId user who is creating this node - mandatory
      * @throws AccessDeniedException if ticket doesn't allow this action
      * @throws ItemNotFoundException if node with uuid cannot be found
      * @throws FileException if unable to save node due to file error
@@ -187,7 +199,7 @@
      */
 	public NodeKey updateFileItem(ITicket ticket, Long uuid, String filename, 
 	   				InputStream istream, String mimeType, 
-					String versionDescription) 
+					String versionDescription, Integer userId) 
 	   		throws AccessDeniedException, ItemNotFoundException, 
 					FileException, InvalidParameterException;
 
@@ -205,14 +217,15 @@
 	 * @param startFile relative path of initial file - optional
 	 * @param versionDescription human readable comment about the version - optional
 	 * @return nodeKey (uuid and version)
+	 * @param userId user who is creating this node - mandatory
      * @throws AccessDeniedException if ticket doesn't allow this action
      * @throws ItemNotFoundException if node with uuid cannot be found
      * @throws FileException if unable to save node due to file error
      * @throws InvalidParameterException if a required parameter is missing
      * @throws RepositoryRuntimeException if any internal errors have occured 
 	 */
 	public abstract NodeKey updatePackageItem(ITicket ticket, Long uuid, String dirPath,
-			String startFile, String versionDescription)
+			String startFile, String versionDescription, Integer userId)
 			throws AccessDeniedException, ItemNotFoundException, 
 			FileException, InvalidParameterException ;
 
@@ -246,11 +259,12 @@
 	 * @param ticket ticket issued on login. Identifies tool and workspace - mandatory 
 	 * @param uuid id of the file/package - mandatory
 	 * @param version desired version - if null gets latest version
+	 * @param userId user who is creating this node - mandatory
 	 * @return nodeKey (uuid and version)
 	 * @throws AccessDeniedException if the ticket is invalid
 	 * @throws ItemNotFoundException if the node cannot be found
      */
-    public NodeKey copyNodeVersion(ITicket ticket, Long uuid, Long versionId) throws AccessDeniedException, ItemNotFoundException;
+    public NodeKey copyNodeVersion(ITicket ticket, Long uuid, Long versionId, Integer userId) throws AccessDeniedException, ItemNotFoundException;
 
 	/** 
 	 * Get an item from the repository based on the UUID. This
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java,v
diff -u -r1.2 -r1.3
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java	5 Apr 2006 23:24:18 -0000	1.2
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java	6 Sep 2006 01:38:22 -0000	1.3
@@ -70,11 +70,12 @@
 	 * @see org.lamsfoundation.lams.contentrepository.service.INodeFactory#createFileNode(org.lamsfoundation.lams.contentrepository.CrWorkspace, org.lamsfoundation.lams.contentrepository.service.SimpleVersionedNode, java.lang.String, java.io.InputStream, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	public SimpleVersionedNode createFileNode(CrWorkspace workspace, SimpleVersionedNode parentNode, 
-			String relPath, InputStream istream, String filename, String mimeType, String versionDescription) 
+			String relPath, InputStream istream, String filename, String mimeType, 
+			String versionDescription, Integer userId) 
 					throws org.lamsfoundation.lams.contentrepository.InvalidParameterException {
 
 		SimpleVersionedNode initialNodeVersion = createBasicNode(NodeType.FILENODE,
-				workspace, parentNode, relPath, versionDescription);
+				workspace, parentNode, relPath, versionDescription, userId);
 		initialNodeVersion.setFile(istream, filename, mimeType);
 
 		return initialNodeVersion;
@@ -84,11 +85,11 @@
 	 * @see org.lamsfoundation.lams.contentrepository.service.INodeFactory#createPackageNode(org.lamsfoundation.lams.contentrepository.CrWorkspace, java.lang.String, java.lang.String)
 	 */
 	public SimpleVersionedNode createPackageNode(CrWorkspace workspace, 
-			String initialPath, String versionDescription) 
+			String initialPath, String versionDescription, Integer userId) 
 					throws org.lamsfoundation.lams.contentrepository.InvalidParameterException {
 
 		SimpleVersionedNode initialNodeVersion = createBasicNode(NodeType.PACKAGENODE, 
-				workspace, null, null, versionDescription);
+				workspace, null, null, versionDescription, userId);
 		initialNodeVersion.setProperty(PropertyName.INITIALPATH, initialPath);
 
 		return initialNodeVersion;
@@ -98,24 +99,24 @@
 	 * @see org.lamsfoundation.lams.contentrepository.service.INodeFactory#createDataNode(org.lamsfoundation.lams.contentrepository.CrWorkspace, org.lamsfoundation.lams.contentrepository.service.SimpleVersionedNode, java.lang.String)
 	 */
 	public SimpleVersionedNode createDataNode(CrWorkspace workspace, SimpleVersionedNode parentNode, 
-			String versionDescription) 
+			String versionDescription, Integer userId) 
 					throws org.lamsfoundation.lams.contentrepository.InvalidParameterException {
 
 		SimpleVersionedNode initialNodeVersion = createBasicNode(NodeType.DATANODE, 
-				workspace, parentNode, null, versionDescription);
+				workspace, parentNode, null, versionDescription, userId);
 			
 		return initialNodeVersion;
 	}
 	
 	/** Create the core part of a node */
 	private SimpleVersionedNode createBasicNode(String nodeType, CrWorkspace workspace, SimpleVersionedNode parentNode, 
-			String relPath, String versionDescription) {
+			String relPath, String versionDescription, Integer userId) {
 		
 		SimpleVersionedNode initialNodeVersion = (SimpleVersionedNode) beanFactory.getBean("node", SimpleVersionedNode.class);
 
 		Date createdDate = new Date(System.currentTimeMillis());
 		CrNodeVersion parentNodeVersion = parentNode != null ? parentNode.getNodeVersion() : null; 
-		CrNode node = new CrNode(relPath, nodeType, createdDate, workspace, parentNodeVersion, versionDescription);
+		CrNode node = new CrNode(relPath, nodeType, createdDate, userId, workspace, parentNodeVersion, versionDescription);
 		CrNodeVersion nodeVersion = node.getNodeVersion(null);
 
 		initialNodeVersion.setNode(node);
@@ -172,7 +173,7 @@
 	/* (non-Javadoc)
 	 * @see org.lamsfoundation.lams.contentrepository.service.INodeFactory#getNode(java.lang.Long, java.lang.Long, java.lang.Long, java.lang.String)
 	 */
-	public SimpleVersionedNode getNodeNewVersion(Long workspaceId, Long uuid, Long versionId, String versionDescription) throws ItemNotFoundException {
+	public SimpleVersionedNode getNodeNewVersion(Long workspaceId, Long uuid, Long versionId, String versionDescription, Integer userId) throws ItemNotFoundException {
 
 		SimpleVersionedNode existingNode = getNode(workspaceId, uuid, versionId);
 		CrNode existingCrNode = existingNode.getNode();
@@ -182,7 +183,7 @@
 		
 		SimpleVersionedNode newNode = (SimpleVersionedNode) beanFactory.getBean("node", SimpleVersionedNode.class);
 		newNode.setNode(existingCrNode);
-		CrNodeVersion newVersion = new CrNodeVersion(existingCrNode, new Date(System.currentTimeMillis()), nextVersionId, versionDescription); 
+		CrNodeVersion newVersion = new CrNodeVersion(existingCrNode, new Date(System.currentTimeMillis()), nextVersionId, versionDescription, userId); 
 		newNode.setNodeVersion(newVersion);
 		existingCrNode.addCrNodeVersion(newVersion);
 		
@@ -192,9 +193,9 @@
 	/* (non-Javadoc)
 	 * @see org.lamsfoundation.lams.contentrepository.service.INodeFactory#copy(org.lamsfoundation.lams.contentrepository.service.SimpleVersionedNode)
 	 */
-	public SimpleVersionedNode copy( SimpleVersionedNode originalNode ) throws FileException, ValueFormatException, InvalidParameterException {
+	public SimpleVersionedNode copy( SimpleVersionedNode originalNode, Integer userId ) throws FileException, ValueFormatException, InvalidParameterException {
 		
-		return copy(originalNode, null);
+		return copy(originalNode, null, userId);
 	}
 	
 	/** Private method to handle the recursive copy. The parent node is needed to set up the
@@ -207,14 +208,14 @@
 	 * @throws ValueFormatException
 	 * @throws InvalidParameterException
 	 */
-	private SimpleVersionedNode copy( SimpleVersionedNode originalNode, CrNodeVersion parentNodeVersion ) throws FileException, ValueFormatException, InvalidParameterException {
+	private SimpleVersionedNode copy( SimpleVersionedNode originalNode, CrNodeVersion parentNodeVersion, Integer userId ) throws FileException, ValueFormatException, InvalidParameterException {
 		
 		SimpleVersionedNode newNode = (SimpleVersionedNode) beanFactory.getBean("node", SimpleVersionedNode.class);
 
 		// copy the basic CrNode/CrNodeVersion fields. Set a new timestamp and new ids
 		Date createdDate = new Date(System.currentTimeMillis());
 		
-		CrNode newCrNode = new CrNode(originalNode.getPath(), originalNode.getNodeType(), createdDate, 
+		CrNode newCrNode = new CrNode(originalNode.getPath(), originalNode.getNodeType(), createdDate, userId,
 				originalNode.getNode().getCrWorkspace(), parentNodeVersion, originalNode.getVersionDescription());
 		newNode.setNode(newCrNode);
 		
@@ -247,7 +248,7 @@
 		Iterator iter = originalNode.getChildNodes().iterator();
 		while ( iter.hasNext() ) {
 			SimpleVersionedNode childNode = (SimpleVersionedNode) iter.next();
-			SimpleVersionedNode newChildNode = this.copy(childNode, newCrNodeVersion);
+			SimpleVersionedNode newChildNode = this.copy(childNode, newCrNodeVersion, userId);
 			newNode.addChildNode(newChildNode);
 		}
 		
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java,v
diff -u -r1.10 -r1.11
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java	30 May 2006 04:19:08 -0000	1.10
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java	6 Sep 2006 01:38:24 -0000	1.11
@@ -24,7 +24,6 @@
 /* $$Id$$ */	
 package org.lamsfoundation.lams.contentrepository.service;
 
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -39,7 +38,6 @@
 import java.util.SortedSet;
 import java.util.TreeMap;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
 import org.lamsfoundation.lams.contentrepository.CrCredential;
@@ -64,8 +62,10 @@
 import org.lamsfoundation.lams.contentrepository.ValidationException;
 import org.lamsfoundation.lams.contentrepository.ValueFormatException;
 import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
+import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.contentrepository.dao.ICredentialDAO;
 import org.lamsfoundation.lams.contentrepository.dao.IWorkspaceDAO;
+import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.FileUtilException;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtil;
@@ -361,18 +361,31 @@
 		return ( ticket != null &&  ticketIdSet.contains(ticket.getTicketId()) );
     }
 
+	/**
+	 * Import tool content 
+	 * TODO Remove once all tools converted to supply user id. 
+	 */
+	public NodeKey addFileItem(ITicket ticket, InputStream istream,
+			String filename, String mimeType, String versionDescription)
+			throws FileException, AccessDeniedException,
+			InvalidParameterException {
+		log.error("addFileItem() to be removed - it sets the owner of files in the content repository to 1. Some tool needs to be updated.");
+		return addFileItem(ticket, istream,
+				filename, mimeType, versionDescription, new Integer(1));
+	}
+
 	/* (non-Javadoc)
 	 * @see org.lamsfoundation.lams.contentrepository.IRepository#addFileItem(org.lamsfoundation.lams.contentrepository.ITicket, java.io.InputStream, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	public NodeKey addFileItem(ITicket ticket, InputStream istream,
-			String filename, String mimeType, String versionDescription)
+			String filename, String mimeType, String versionDescription, Integer userId)
 			throws FileException, AccessDeniedException,
 			InvalidParameterException {
 		
     	try { 
     		CrWorkspace workspace = getWorkspace(ticket.getWorkspaceId());
     		SimpleVersionedNode initialNodeVersion = nodeFactory.createFileNode(workspace, 
-    				 null, null, istream, filename, mimeType, versionDescription); 
+    				 null, null, istream, filename, mimeType, versionDescription, userId); 
        		initialNodeVersion.save();
     		return initialNodeVersion.getNodeKey();
 		} catch ( ValidationException e) {
@@ -391,7 +404,7 @@
 	 * @see org.lamsfoundation.lams.contentrepository.IRepository#addPackageItem(org.lamsfoundation.lams.contentrepository.ITicket, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	public NodeKey addPackageItem(ITicket ticket, String dirPath,
-			String startFile, String versionDescription)
+			String startFile, String versionDescription, Integer userId)
 			throws AccessDeniedException, InvalidParameterException,
 			FileException {
 		
@@ -406,10 +419,10 @@
 		}
 
     	SimpleVersionedNode packageNode = null;
-   		packageNode = nodeFactory.createPackageNode(workspace, startFile, versionDescription); 
+   		packageNode = nodeFactory.createPackageNode(workspace, startFile, versionDescription, userId); 
     	
 		try { 
-			packageNode.addPackageFiles(workspace, dirPath, versionDescription); 
+			packageNode.addPackageFiles(workspace, dirPath, versionDescription, userId); 
 			packageNode.save();
     	} catch ( ValidationException e) {
     		// if this is thrown, then it is bug - nothing external should cause it.
@@ -512,12 +525,12 @@
 	 * @see org.lamsfoundation.lams.contentrepository.IRepository#updateFileItem(org.lamsfoundation.lams.contentrepository.ITicket, java.lang.Long, java.lang.String, java.io.InputStream, java.lang.String, java.lang.String)
 	 */
 	public NodeKey updateFileItem(ITicket ticket, Long uuid, String filename,
-			InputStream istream, String mimeType, String versionDescription)
+			InputStream istream, String mimeType, String versionDescription, Integer userId)
 			throws AccessDeniedException, ItemNotFoundException, FileException,
 			InvalidParameterException {
 	   	
 		SimpleVersionedNode newNodeVersion = nodeFactory.getNodeNewVersion(ticket.getWorkspaceId(), 
-				uuid, null, versionDescription);
+				uuid, null, versionDescription, userId);
 
 	   	if ( ! newNodeVersion.isNodeType( NodeType.FILENODE) )
 	   		throw new InvalidParameterException("Node is not a file node - it is a "+newNodeVersion.getNodeType()
@@ -537,12 +550,12 @@
 	 * @see org.lamsfoundation.lams.contentrepository.IRepository#updatePackageItem(org.lamsfoundation.lams.contentrepository.ITicket, java.lang.Long, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	public NodeKey updatePackageItem(ITicket ticket, Long uuid, String dirPath,
-			String startFile, String versionDescription)
+			String startFile, String versionDescription, Integer userId)
 			throws AccessDeniedException, ItemNotFoundException, FileException,
 			InvalidParameterException {
 		
 		SimpleVersionedNode newNodeVersion = nodeFactory.getNodeNewVersion(ticket.getWorkspaceId(), 
-				uuid, null, versionDescription);
+				uuid, null, versionDescription, userId);
 
 	   	if ( ! newNodeVersion.isNodeType( NodeType.PACKAGENODE) )
 	   		throw new InvalidParameterException("Node is not a package node - it is a "+newNodeVersion.getNodeType()
@@ -553,7 +566,7 @@
 		try { 
 			CrWorkspace workspace = getWorkspace(ticket.getWorkspaceId());
 			
-			newNodeVersion.addPackageFiles(workspace, dirPath, versionDescription); 
+			newNodeVersion.addPackageFiles(workspace, dirPath, versionDescription, userId); 
 			newNodeVersion.save();
 
     	} catch ( ValidationException e) {
@@ -591,12 +604,12 @@
     /* (non-Javadoc)
 	 * @see org.lamsfoundation.lams.contentrepository.IRepository#copyNodeVersion(org.lamsfoundation.lams.contentrepository.ITicket, java.lang.Long, java.lang.Long)
 	 */
-    public NodeKey copyNodeVersion(ITicket ticket, Long uuid, Long versionId) throws AccessDeniedException, ItemNotFoundException {
+    public NodeKey copyNodeVersion(ITicket ticket, Long uuid, Long versionId, Integer userId) throws AccessDeniedException, ItemNotFoundException {
 
         
     	try { 
             SimpleVersionedNode originalNode = nodeFactory.getNode(ticket.getWorkspaceId(),uuid,versionId);
-           	SimpleVersionedNode newNode = nodeFactory.copy(originalNode);
+           	SimpleVersionedNode newNode = nodeFactory.copy(originalNode, userId);
            	newNode.save();
     		return newNode.getNodeKey();
     		 
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java,v
diff -u -r1.8 -r1.9
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java	5 Apr 2006 23:24:18 -0000	1.8
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java	6 Sep 2006 01:38:24 -0000	1.9
@@ -309,6 +309,16 @@
 		
 	}
 	
+	/**
+	 * @see org.lamsfoundation.lams.contentrepository.IVersionedNode#getUserId()
+	 */
+	public Integer getUserId() {
+		nodeObjectInitilised("Unable to get user id.");
+		return nodeVersion.getUserId();
+		
+	}
+	
+
 	/** Get the file, as an inputstream. It is the responsibility 
 	 * of the caller to close the stream. Note: this should only be 
 	 * called once the node is saved - do not call it directly after
@@ -803,7 +813,7 @@
 	 * @throws InvalidParameterException
 	 * @throws FileException
 	 */
-	protected void addPackageFiles(CrWorkspace workspace, String dirPath, String versionDescription) 
+	protected void addPackageFiles(CrWorkspace workspace, String dirPath, String versionDescription, Integer userId) 
 				throws InvalidParameterException, FileException, ValidationException {
 		
     	File directory = new File(dirPath);
@@ -817,7 +827,7 @@
     	if ( removePathToMakeRelPath.charAt(removePathToMakeRelPath.length()-1) != File.separatorChar )
     		removePathToMakeRelPath += File.separatorChar;
 		
-    	processDirectory(workspace, removePathToMakeRelPath, directory, versionDescription);
+    	processDirectory(workspace, removePathToMakeRelPath, directory, versionDescription, userId);
 	}
 
 	/** 
@@ -838,7 +848,7 @@
 	 * not be null.
 	 * @throws FileException
 	 */
-	private void processDirectory(CrWorkspace workspace, String removePathToMakeRelPath, File dirFile, String versionDescription) 
+	private void processDirectory(CrWorkspace workspace, String removePathToMakeRelPath, File dirFile, String versionDescription, Integer userId) 
 			throws InvalidParameterException, FileException, ValidationException {
 
 		if ( ! dirFile.exists() || ! dirFile.isDirectory() || ! dirFile.canRead() ) {
@@ -858,7 +868,7 @@
 				if ( file.isDirectory() ) {
 					
 					// recurse to get files in this directory
-					processDirectory(workspace, removePathToMakeRelPath, file, versionDescription);
+					processDirectory(workspace, removePathToMakeRelPath, file, versionDescription, userId);
 					
 				} else {
 					
@@ -881,7 +891,7 @@
 					// the file node. Mime type is unknown.
 					// no need to the new node as a childe node, as createFileNode will do it.
 					FileInputStream istream = new FileInputStream(file);
-					nodeFactory.createFileNode(workspace, this, relPath, istream, filename, null, versionDescription);
+					nodeFactory.createFileNode(workspace, this, relPath, istream, filename, null, versionDescription, userId);
 				}
 			}
 			
@@ -915,9 +925,9 @@
 	 *   file, filename or mimetype properties are invalid.
 	 * @throws ValueFormatException will only occur if there is an internal bug as it will only happen if the filename or mimetype properties are not strings. 
 	 */
-	public SimpleVersionedNode copy( ) throws FileException, ValueFormatException, InvalidParameterException  {
+	public SimpleVersionedNode copy( Integer userId) throws FileException, ValueFormatException, InvalidParameterException  {
 		
-		return nodeFactory.copy(this);
+		return nodeFactory.copy(this, userId);
 
 	}
 
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/AddFileContentAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/AddFileContentAction.java,v
diff -u -r1.6 -r1.7
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/AddFileContentAction.java	5 Apr 2006 23:24:18 -0000	1.6
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/AddFileContentAction.java	6 Sep 2006 01:38:26 -0000	1.7
@@ -58,6 +58,7 @@
  */
 public class AddFileContentAction extends RepositoryDispatchAction {
 
+	public static final Integer dummyUserId = new Integer(1);
 	// --------------------------------------------------------- Instance Variables
 
 	// --------------------------------------------------------- Methods
@@ -120,11 +121,11 @@
 			if ( uuid != null ) {
 				// create a new version of this node
 				nodeKey = getRepository().updateFileItem(ticket, uuid, filename,
-						is, contentType, versionDescription);
+						is, contentType, versionDescription, dummyUserId);
 			} else {
 				// create a new node
 				nodeKey = getRepository().addFileItem(ticket, is, filename, 
-						contentType, versionDescription);
+						contentType, versionDescription, dummyUserId);
 			}
 
 			// normally the application would store the node key and
@@ -198,10 +199,10 @@
 			if ( uuid != null ) {
 				// create a new version of this node
 				nodeKey = getRepository().updatePackageItem(ticket, uuid, dirName,
-						entryString, versionDescription);
+						entryString, versionDescription, dummyUserId);
 			} else {
 				// create a new node
-				nodeKey = getRepository().addPackageItem(ticket,dirName, entryString, versionDescription);
+				nodeKey = getRepository().addPackageItem(ticket,dirName, entryString, versionDescription, dummyUserId);
 			}
 			
 			// normally the application would store the node key and
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/NodeSelectionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/NodeSelectionAction.java,v
diff -u -r1.7 -r1.8
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/NodeSelectionAction.java	5 Apr 2006 23:24:18 -0000	1.7
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/NodeSelectionAction.java	6 Sep 2006 01:38:26 -0000	1.8
@@ -305,7 +305,7 @@
 		log.debug("Copy node "+uuid+" version "+version);
 
 		try {
-			NodeKey key = getRepository().copyNodeVersion(ticket,uuid,version);
+			NodeKey key = getRepository().copyNodeVersion(ticket,uuid,version, AddFileContentAction.dummyUserId);
 			log.info("Copy node, new ids "+key);
 			return getList(mapping,form,request,response);
 
Index: lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/client/TestToolContentHandlerImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/client/Attic/TestToolContentHandlerImpl.java,v
diff -u -r1.6 -r1.7
--- lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/client/TestToolContentHandlerImpl.java	5 Apr 2006 23:24:18 -0000	1.6
+++ lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/client/TestToolContentHandlerImpl.java	6 Sep 2006 01:38:27 -0000	1.7
@@ -104,9 +104,9 @@
     public void testUploadFile() {
         try {
             NodeKey offlineNodeKey = handler.uploadFile(CRResources.getSingleFile(), CRResources.singleFileName, 
-                    CRResources.singleFileMimeType, ToolContentHandlerImpl.TYPE_OFFLINE);
+                    CRResources.singleFileMimeType, ToolContentHandlerImpl.TYPE_OFFLINE, mmmUser);
             NodeKey onlineNodeKey = handler.uploadFile(CRResources.getSingleFile(), CRResources.singleFileName, 
-                    CRResources.singleFileMimeType, ToolContentHandlerImpl.TYPE_ONLINE);
+                    CRResources.singleFileMimeType, ToolContentHandlerImpl.TYPE_ONLINE, mmmUser);
 
             Long uuid = offlineNodeKey.getUuid();
             IVersionedNode node = handler.getFileNode(uuid);
@@ -137,7 +137,7 @@
         try {
 		    // unpack the zip file so we have a directory to play with 
     	    String tempDir = ZipFileUtil.expandZip(CRResources.getZipFile(), CRResources.zipFileName);
-		    NodeKey nodeKey = handler.uploadPackage(tempDir, "index.html"); 
+		    NodeKey nodeKey = handler.uploadPackage(tempDir, "index.html", mmmUser); 
 
 		    Long uuid = nodeKey.getUuid();
             IVersionedNode node = handler.getFileNode(uuid);
Index: lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/BaseTestCase.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/Attic/BaseTestCase.java,v
diff -u -r1.7 -r1.8
--- lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/BaseTestCase.java	5 Apr 2006 23:24:19 -0000	1.7
+++ lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/BaseTestCase.java	6 Sep 2006 01:38:25 -0000	1.8
@@ -57,6 +57,7 @@
 	protected static final Long INITIAL_WORKSPACE_ID = new Long(1);
 	protected static final String INITIAL_WORKSPACE_USER = "atool";
 	protected static final char[] INITIAL_WORKSPACE_PASSWORD = {'a','t','o','o','l'};
+	protected static final Integer mmmUser = new Integer(4); 
 	
 	protected static final String SECONDARY_WORKSPACE = "atoolWorkspace2";
 
@@ -92,8 +93,9 @@
 
 	protected String[] getContextConfigLocation() {
 		return new String[] {
-				IRepositoryService.CORE_LOCAL_CONTEXT_PATH,
-		        IRepositoryService.REPOSITORY_CONTEXT_PATH,
+				"/org/lamsfoundation/lams/contentrepository/applicationContext.xml",
+				"/org/lamsfoundation/lams/localApplicationContext.xml",
+				"/org/lamsfoundation/lams/toolApplicationContext.xml",
 		        "/org/lamsfoundation/lams/contentrepository/testApplicationContext.xml"
 		        };
 	}
Index: lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/TestSimpleRepository.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/Attic/TestSimpleRepository.java,v
diff -u -r1.9 -r1.10
--- lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/TestSimpleRepository.java	5 Apr 2006 23:24:19 -0000	1.9
+++ lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/TestSimpleRepository.java	6 Sep 2006 01:38:25 -0000	1.10
@@ -436,15 +436,15 @@
 		try {
 			if ( uuid == null ) {
 				// new file
-				keys = repository.addFileItem(ticket, file, filename, null, v1Description);
+				keys = repository.addFileItem(ticket, file, filename, null, v1Description, mmmUser);
 				assertTrue("File save returns uuid",keys != null && keys.getUuid() != null);
 				assertTrue("File save got expected version "+expectedVersion,
 					keys != null && keys.getVersion() != null 
 					&& keys.getVersion().equals(expectedVersion));
 			} else {
 				// update existing node
 				keys = repository.updateFileItem(ticket, uuid, filename, 
-				        file, null, v2Description);
+				        file, null, v2Description, mmmUser);
 				assertTrue("File save returns same uuid",keys != null && keys.getUuid().equals(uuid));
 				assertTrue("File save got expected version "+expectedVersion,
 					keys != null && keys.getVersion() != null 
@@ -484,8 +484,8 @@
 
 	   // copy each version of the file node
 		try {
-			NodeKey copy1 = repository.copyNodeVersion(ticket, keys.getUuid(), one);
-			NodeKey copylatest = repository.copyNodeVersion(ticket, keys.getUuid(), null);
+			NodeKey copy1 = repository.copyNodeVersion(ticket, keys.getUuid(), one, mmmUser);
+			NodeKey copylatest = repository.copyNodeVersion(ticket, keys.getUuid(), null, mmmUser);
 
 			assertNotSame("Copy 1 is a different uuid to the original.", copy1.getUuid(), keys.getUuid());
 			checkFileNodeExist(fileDAO, copy1.getUuid(), one, 1, v1Description);
@@ -562,13 +562,13 @@
 			directory.list();
 
 			if ( uuid == null ) {
-				keys = repository.addPackageItem(ticket,  tempDir, "index.html", v1Description);
+				keys = repository.addPackageItem(ticket,  tempDir, "index.html", v1Description, mmmUser);
 				assertTrue("Package save returns uuid",keys != null && keys.getUuid() != null);
 				assertTrue("Package save got version 1",
 						keys != null && keys.getVersion() != null 
 						&& keys.getVersion().longValue() == 1);
 			} else {
-				keys = repository.updatePackageItem(ticket, uuid, tempDir, "index.html", v2Description);
+				keys = repository.updatePackageItem(ticket, uuid, tempDir, "index.html", v2Description, mmmUser);
 				assertTrue("Package save returns uuid",keys != null && keys.getUuid() != null);
 				assertTrue("Package save got version >1",
 						keys != null && keys.getVersion() != null 
@@ -606,7 +606,7 @@
 
 	    // copy the package node
 		try {
-			NodeKey copy = repository.copyNodeVersion(ticket, keys.getUuid(), null);
+			NodeKey copy = repository.copyNodeVersion(ticket, keys.getUuid(), null, mmmUser);
 
 			assertNotSame("Copy 1 is a different uuid to the original.", copy.getUuid(), keys.getUuid());
 			checkPackage(copy);
Index: lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/TestSimpleVersionedNode.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/Attic/TestSimpleVersionedNode.java,v
diff -u -r1.7 -r1.8
--- lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/TestSimpleVersionedNode.java	5 Apr 2006 23:24:19 -0000	1.7
+++ lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/TestSimpleVersionedNode.java	6 Sep 2006 01:38:25 -0000	1.8
@@ -409,9 +409,9 @@
 	public void testAddNode() {
 		try { 
 			// file nodes are tested in another test
-			SimpleVersionedNode dataNode = nodeFactory.createDataNode(getWorkspace(INITIAL_WORKSPACE_ID), null,"Initial Version");
+			SimpleVersionedNode dataNode = nodeFactory.createDataNode(getWorkspace(INITIAL_WORKSPACE_ID), null,"Initial Version", mmmUser);
 
-			SimpleVersionedNode packageNode = nodeFactory.createPackageNode(getWorkspace(INITIAL_WORKSPACE_ID), "index.html", "Initial Version");
+			SimpleVersionedNode packageNode = nodeFactory.createPackageNode(getWorkspace(INITIAL_WORKSPACE_ID), "index.html", "Initial Version", mmmUser);
 			
 			assertTrue("2 nodes created, but not saved into database ", 
 					dataNode != null && dataNode.getUUID() == null
@@ -474,7 +474,7 @@
 				
 			try {
 				if ( newUuid  == null ) {
-					fileNode = nodeFactory.createFileNode(getWorkspace(INITIAL_WORKSPACE_ID), null, null, null, filename, null, null);
+					fileNode = nodeFactory.createFileNode(getWorkspace(INITIAL_WORKSPACE_ID), null, null, null, filename, null, null, mmmUser);
 				} else {
 					fileNode = (SimpleVersionedNode) getNode(INITIAL_WORKSPACE_ID, newUuid);
 					fileNode.setFile(null, filename, null);
@@ -486,7 +486,7 @@
 
 			try {
 				if ( newUuid  == null ) {
-					fileNode = nodeFactory.createFileNode(getWorkspace(INITIAL_WORKSPACE_ID), null, null, is, null, null, null);
+					fileNode = nodeFactory.createFileNode(getWorkspace(INITIAL_WORKSPACE_ID), null, null, is, null, null, null, mmmUser);
 				} else {
 					fileNode = (SimpleVersionedNode) getNode(INITIAL_WORKSPACE_ID, newUuid);
 					fileNode.setFile(is, null, null);
@@ -497,7 +497,7 @@
 			}
 
 			
-			fileNode = nodeFactory.createFileNode(getWorkspace(INITIAL_WORKSPACE_ID), null, null, is, filename, null, null);
+			fileNode = nodeFactory.createFileNode(getWorkspace(INITIAL_WORKSPACE_ID), null, null, is, filename, null, null, mmmUser);
 			fileNode.setFile(is, filename, null);
 			saveCheckNode("File", NodeType.FILENODE, fileNode);
 			newUuid = fileNode.getUUID();
@@ -562,7 +562,7 @@
 	public void testAddNodeBadType() {
 		try {
 	
-			SimpleVersionedNode newNode = nodeFactory.createDataNode(getWorkspace(INITIAL_WORKSPACE_ID), null,"Initial Version");
+			SimpleVersionedNode newNode = nodeFactory.createDataNode(getWorkspace(INITIAL_WORKSPACE_ID), null,"Initial Version", mmmUser);
 			newNode.getNode().setType("XYZ");
 			newNode.save();
 			fail("NoSuchNodeTypeException should have been thrown");