Index: lams_contentrepository/lib/commons-codec-1.1.jar
===================================================================
diff -u
Binary files differ
Index: lams_contentrepository/lib/struts/struts-el.jar
===================================================================
diff -u -ra86374bdc1bc8f0b251d931d0b9da0725a9fdd95 -rf367bd85ea6759364758deec6a8d2c623f32f51b
Binary files differ
Index: lams_contentrepository/lib/struts/struts.jar
===================================================================
diff -u -rf8e8b8eab8ee835edcd8f6c75b249717e62edc11 -rf367bd85ea6759364758deec6a8d2c623f32f51b
Binary files differ
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/AddFileContentAction.java
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -rf367bd85ea6759364758deec6a8d2c623f32f51b
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/AddFileContentAction.java	(.../AddFileContentAction.java)	(revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/AddFileContentAction.java	(.../AddFileContentAction.java)	(revision f367bd85ea6759364758deec6a8d2c623f32f51b)
@@ -26,7 +26,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
@@ -76,8 +75,7 @@
 		log.debug("In getNode, ticket is "+ticket);
 		if ( ticket == null ) {
 			log.error("Ticket missing from session");
-        	return returnError(mapping, request, 
-        			new ActionError("error.noTicket"));
+        	return returnError(mapping, request, "error.noTicket");
 		} 
 		
 		AddFileContentForm addFileContentForm = (AddFileContentForm) form;
@@ -100,8 +98,7 @@
 			is = theFile.getInputStream();
 		} catch (Exception e) {
 			log.error("Error getting file from input form.", e);
-	       	return returnError(mapping, request, 
-        			new ActionError("exception.file"));
+	       	return returnError(mapping, request, "exception.file");
 		} 
 
 		
@@ -164,8 +161,7 @@
 		log.debug("In getNode, ticket is "+ticket);
 		if ( ticket == null ) {
 			log.error("Ticket missing from session");
-        	return returnError(mapping, request, 
-        			new ActionError("error.noTicket"));
+        	return returnError(mapping, request,"error.noTicket");
 		} 
 		
 		AddFileContentForm addFileContentForm = (AddFileContentForm) form;
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/NodeSelectionAction.java
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -rf367bd85ea6759364758deec6a8d2c623f32f51b
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/NodeSelectionAction.java	(.../NodeSelectionAction.java)	(revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/NodeSelectionAction.java	(.../NodeSelectionAction.java)	(revision f367bd85ea6759364758deec6a8d2c623f32f51b)
@@ -30,7 +30,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
@@ -78,8 +77,7 @@
 		log.debug("In getList, ticket is "+ticket);
 		if ( ticket == null ) {
 			log.error("Ticket missing from session");
-        	return returnError(mapping, request, 
-        			new ActionError("error.noTicket"));
+        	return returnError(mapping, request, "error.noTicket");
 		} 
 		
 		// get the map of nodes and put it in the request,
@@ -163,17 +161,15 @@
 		log.debug("In getList, ticket is "+ticket);
 		if ( ticket == null ) {
 			log.error("Ticket missing from session");
-        	return returnError(mapping, request, 
-        			new ActionError("error.noTicket"));
+        	return returnError(mapping, request,"error.noTicket");
 		}
 		
 		Long uuid = getLong(request.getParameter(UUID_NAME));
 		Long version = getLong(request.getParameter(VERSION_NAME));
 
 		if ( uuid == null ) {
 			log.error("UUID missing");
-        	return returnError(mapping, request, 
-        			new ActionError("error.uuidMissing"));
+        	return returnError(mapping, request,"error.uuidMissing");
 		} 
 
 		log.debug("Deleting node "+uuid+" version "+version);
@@ -221,17 +217,15 @@
 		log.debug("In deleteNode, ticket is "+ticket);
 		if ( ticket == null ) {
 			log.error("Ticket missing from session");
-        	return returnError(mapping, request, 
-        			new ActionError("error.noTicket"));
+        	return returnError(mapping, request, "error.noTicket");
 		} 
 		
 		Long uuid = getLong(request.getParameter(UUID_NAME));
 		Long version = getLong(request.getParameter(VERSION_NAME));
 	
 		if ( uuid == null ) {
 			log.error("UUID missing");
-        	return returnError(mapping, request, 
-        			new ActionError("error.uuidMissing"));
+        	return returnError(mapping, request, "error.uuidMissing");
 		} 
 
 
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/RepositoryDispatchAction.java
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -rf367bd85ea6759364758deec6a8d2c623f32f51b
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/RepositoryDispatchAction.java	(.../RepositoryDispatchAction.java)	(revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/RepositoryDispatchAction.java	(.../RepositoryDispatchAction.java)	(revision f367bd85ea6759364758deec6a8d2c623f32f51b)
@@ -25,11 +25,10 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
 import org.lamsfoundation.lams.contentrepository.ITicket;
@@ -58,10 +57,11 @@
 	
 	/** Adds this error to the errors, then goes to the error forward */
 	protected ActionForward returnError(ActionMapping mapping, 
-			HttpServletRequest request, ActionError error) {
-		ActionErrors errors = new ActionErrors();
-		errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-		saveErrors(request,errors);		
+			HttpServletRequest request, String errorKey) {
+		ActionMessages am = new ActionMessages(); 
+		am.add( ActionMessages.GLOBAL_MESSAGE,  
+	           new ActionMessage( errorKey ) ); 
+		saveErrors( request, am ); 
 		return mapping.findForward(ERROR_PATH);
 	}
 
@@ -101,8 +101,7 @@
 		log.debug("In getNode, ticket is "+ticket);
 		if ( ticket == null ) {
 			log.error("Ticket missing from session");
-        	return returnError(mapping, request, 
-        			new ActionError("error.noTicket"));
+        	return returnError(mapping, request, "error.noTicket");
 		} 
 
 		log.debug("About to logout");
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/form/AddFileContentForm.java
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -rf367bd85ea6759364758deec6a8d2c623f32f51b
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/form/AddFileContentForm.java	(.../AddFileContentForm.java)	(revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/form/AddFileContentForm.java	(.../AddFileContentForm.java)	(revision f367bd85ea6759364758deec6a8d2c623f32f51b)
@@ -23,10 +23,10 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
 import org.apache.struts.upload.FormFile;
 
 /** 
@@ -64,18 +64,18 @@
 		if ( errors == null ) errors = new ActionErrors();
 		
 		if ( isEmpty(method) ) {
-			errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("errors.mandatory", "Method"));
+			errors.add(ActionErrors.GLOBAL_MESSAGE, new ActionMessage( "errors.mandatory", "Method"));
 		}
 
 		if ( isEmpty(description) ) {
-			errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("errors.mandatory", "Description"));
+			errors.add(ActionErrors.GLOBAL_MESSAGE, new ActionMessage( "errors.mandatory", "Description"));
 		}
 		if ( "uploadFile".equals(method) && theFile==null ) {
-			errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("errors.mandatory", "File"));
+			errors.add(ActionErrors.GLOBAL_MESSAGE, new ActionMessage( "errors.mandatory", "File"));
 		}
 		
 		if ( "uploadPackage".equals(method) && isEmpty(dirName) ) {
-			errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("errors.mandatory", "Directory Name"));
+			errors.add(ActionErrors.GLOBAL_MESSAGE, new ActionMessage( "errors.mandatory", "Directory Name"));
 		}
 
 		if ( errors.size() == 0 ) return null;
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/form/LoginRepositoryForm.java
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -rf367bd85ea6759364758deec6a8d2c623f32f51b
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/form/LoginRepositoryForm.java	(.../LoginRepositoryForm.java)	(revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/form/LoginRepositoryForm.java	(.../LoginRepositoryForm.java)	(revision f367bd85ea6759364758deec6a8d2c623f32f51b)
@@ -23,10 +23,10 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
 
 /** 
  * MyEclipse Struts
@@ -64,15 +64,15 @@
 		if ( errors == null ) errors = new ActionErrors();
 		
 		if ( getToolName() == null || getToolName().length() < 1 ) {
-			errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("errors.mandatory","Tool Name"));
+			errors.add(ActionErrors.GLOBAL_MESSAGE, new ActionMessage( "errors.mandatory","Tool Name"));
 		}
 		
 		if ( getWorkspaceName() == null || getWorkspaceName().length() < 1 ) {
-			errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("errors.mandatory","Tool Name"));
+			errors.add(ActionErrors.GLOBAL_MESSAGE, new ActionMessage( "errors.mandatory","Tool Name"));
 		}
 
 		if ( getIndentificationString() == null || getIndentificationString().length() < 1 ) {
-			errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("errors.mandatory","Tool Name"));
+			errors.add(ActionErrors.GLOBAL_MESSAGE, new ActionMessage( "errors.mandatory","Tool Name"));
 		}
 
 		if ( errors.size() == 0 ) return null;