sword-app-changelog Mailing List for SWORD (Page 17)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 110
          http://sword-app.svn.sourceforge.net/sword-app/?rev=110&view=rev
Author:   stuartlewis
Date:     2009-02-17 14:47:08 +0000 (Tue, 17 Feb 2009)

Log Message:
-----------
A SWORDServer can now throw a SWORDErrorException from the doServiceDocument method.

Modified Paths:
--------------
    java-common/trunk/src/main/java/org/purl/sword/base/SWORDErrorException.java
    java-common/trunk/src/main/java/org/purl/sword/server/DepositServlet.java
    java-common/trunk/src/main/java/org/purl/sword/server/DummyServer.java
    java-common/trunk/src/main/java/org/purl/sword/server/SWORDServer.java
    java-common/trunk/src/main/java/org/purl/sword/server/ServiceDocumentServlet.java

Modified: java-common/trunk/src/main/java/org/purl/sword/base/SWORDErrorException.java
===================================================================

--- java-common/trunk/src/main/java/org/purl/sword/base/SWORDErrorException.java	2009-02-17 14:45:54 UTC (rev 109)
+++ java-common/trunk/src/main/java/org/purl/sword/base/SWORDErrorException.java	2009-02-17 14:47:08 UTC (rev 110)
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, Aberystwyth University
+ * Copyright (c) 2009, Aberystwyth University
  *
  * All rights reserved.
  * 
@@ -57,9 +57,8 @@
 	/**
      * Create a new instance and store the specified data. 
      * 
-     * @param message The message for the exception. 
-     * @param source  The original exception that lead to this exception. This
-     *                can be <code>null</code>.
+     * @param errorURI The errorURI of the exception being thrown 
+     * @param description  A description of the error thrown.
      */
     public SWORDErrorException(String errorURI, String description)
     {  

Modified: java-common/trunk/src/main/java/org/purl/sword/server/DepositServlet.java
===================================================================
--- java-common/trunk/src/main/java/org/purl/sword/server/DepositServlet.java	2009-02-17 14:45:54 UTC (rev 109)
+++ java-common/trunk/src/main/java/org/purl/sword/server/DepositServlet.java	2009-02-17 14:47:08 UTC (rev 110)
@@ -334,7 +334,7 @@
 				
 				// Print out the Deposit Response
 				response.setStatus(dr.getHttpResponse());
-				if( (dr.getLocation()!= null) && (!dr.getLocation().equals("")))
+				if ((dr.getLocation() != null) && (!dr.getLocation().equals("")))
 				{
 					response.setHeader("Location", dr.getLocation());
 				}

Modified: java-common/trunk/src/main/java/org/purl/sword/server/DummyServer.java
===================================================================
--- java-common/trunk/src/main/java/org/purl/sword/server/DummyServer.java	2009-02-17 14:45:54 UTC (rev 109)
+++ java-common/trunk/src/main/java/org/purl/sword/server/DummyServer.java	2009-02-17 14:47:08 UTC (rev 110)
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, Aberystwyth University
+ * Copyright (c) 2009, Aberystwyth University
  *
  * All rights reserved.
  * 
@@ -96,7 +96,7 @@
 	 * @throws SWORDErrorException If something goes wrong, such as 
 	 */
 	public ServiceDocument doServiceDocument(ServiceDocumentRequest sdr) 
-	                           throws SWORDAuthenticationException, SWORDException {
+	                           throws SWORDAuthenticationException, SWORDErrorException, SWORDException {
 		// Authenticate the user
 		String username = sdr.getUsername();
 		String password = sdr.getPassword();
@@ -107,6 +107,13 @@
 				throw new SWORDAuthenticationException("Bad credentials");
 		}
 		
+		// Allow users to force the throwing of a SWORD error exception by setting
+		// the OBO user to 'error'
+		if ((sdr.getOnBehalfOf() != null) && (sdr.getOnBehalfOf().equals("error"))) {
+			// Throw the error exception
+			throw new SWORDErrorException(ErrorCodes.MEDIATION_NOT_ALLOWED, "Mediated deposits not allowed");
+		}
+		
 		// Create and return a dummy ServiceDocument
 		ServiceDocument document = new ServiceDocument();
 		Service service = new Service("1.3", true, true);
@@ -326,6 +333,8 @@
 		
 		dr.setEntry(se);
 		
+		dr.setLocation("http://www.myrepository.ac.uk/atom/" + counter);
+		
 		return dr;
 	}
 }

Modified: java-common/trunk/src/main/java/org/purl/sword/server/SWORDServer.java
===================================================================
--- java-common/trunk/src/main/java/org/purl/sword/server/SWORDServer.java	2009-02-17 14:45:54 UTC (rev 109)
+++ java-common/trunk/src/main/java/org/purl/sword/server/SWORDServer.java	2009-02-17 14:47:08 UTC (rev 110)
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, Aberystwyth University
+ * Copyright (c) 2009, Aberystwyth University
  *
  * All rights reserved.
  * 
@@ -61,13 +61,15 @@
 	 * @param sdr The Service Document Request object
 	 * 
 	 * @exception SWORDAuthenticationException Thrown if the authentication fails
+	 * @exception SWORDErrorException Thrown if there was an error with the input not matching
+	 *            the capabilities of the server
 	 * @exception SWORDException Thrown in an un-handalable Exception occurs. 
 	 *            This will be dealt with by sending a HTTP 500 Server Exception
 	 *
 	 * @return The ServiceDocument representing the service document
 	 */
 	public ServiceDocument doServiceDocument(ServiceDocumentRequest sdr)
-		throws SWORDAuthenticationException, SWORDException;
+		throws SWORDAuthenticationException, SWORDErrorException, SWORDException;
 	
 	/**
 	 * Answer a SWORD deposit
@@ -75,6 +77,8 @@
 	 * @param deposit The Deposit object
 	 * 
 	 * @exception SWORDAuthenticationException Thrown if the authentication fails
+	 * @exception SWORDErrorException Thrown if there was an error with the input not matching
+	 *            the capabilities of the server
 	 * @exception SWORDException Thrown if an un-handalable Exception occurs. 
 	 *            This will be dealt with by sending a HTTP 500 Server Exception
 	 * 

Modified: java-common/trunk/src/main/java/org/purl/sword/server/ServiceDocumentServlet.java
===================================================================
--- java-common/trunk/src/main/java/org/purl/sword/server/ServiceDocumentServlet.java	2009-02-17 14:45:54 UTC (rev 109)
+++ java-common/trunk/src/main/java/org/purl/sword/server/ServiceDocumentServlet.java	2009-02-17 14:47:08 UTC (rev 110)
@@ -50,6 +50,7 @@
 import org.apache.log4j.Logger;
 import org.purl.sword.base.HttpHeaders;
 import org.purl.sword.base.SWORDAuthenticationException;
+import org.purl.sword.base.SWORDErrorException;
 import org.purl.sword.base.SWORDException;
 import org.purl.sword.base.ServiceDocument;
 import org.purl.sword.base.ServiceDocumentRequest;
@@ -172,11 +173,13 @@
 				response.setHeader("WWW-Authenticate", s);
 				response.setStatus(401);
 			}
+		} catch (SWORDErrorException see) {
+			// Return the relevant HTTP status code
+			response.sendError(see.getStatus(), see.getDescription());
 		} catch (SWORDException se) {
 			se.printStackTrace();
 			// Throw a HTTP 500
-			response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, se
-					.getMessage());
+			response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, se.getMessage());
 		}
 	}
 
@@ -218,7 +221,7 @@
 	}
 
 	/**
-	 * Utility method to deicde if we are using HTTP Basic authentication
+	 * Utility method to decide if we are using HTTP Basic authentication
 	 * 
 	 * @return if HTTP Basic authentication is in use or not
 	 */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (11)	Dec (6)
2009	Jan (2)	Feb (64)	Mar (4)	Apr (2)	May (10)	Jun (26)	Jul	Aug	Sep (1)	Oct	Nov (1)	Dec
2010	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan (14)	Feb (7)	Mar (7)	Apr (37)	May (59)	Jun (4)	Jul (16)	Aug (3)	Sep (9)	Oct (1)	Nov	Dec (25)
2012	Jan (68)	Feb (5)	Mar (28)	Apr (12)	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

sword-app-changelog Mailing List for SWORD (Page 17)

sword-app-changelog — SVN changelog messages for the SWORD-APP project