From d82d24c3ba6832a1378ee6afaf4cc38c830dc44c Mon Sep 17 00:00:00 2001 From: Stuart Lewis Date: Wed, 11 Jun 2008 11:11:05 +0000 Subject: [PATCH] (Zuki Ebetsu / Stuart Lewis) [1990660] SWORD Service Document are malformed / Corrected Atom publishing MIME types git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@2960 9c30dcfa-912a-0410-8fc2-9e0234be79fd --- .../java/org/purl/sword/server/DepositServlet.java | 3 +-- .../org/purl/sword/server/ServiceDocumentServlet.java | 3 +-- dspace/CHANGES | 10 ++++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/server/DepositServlet.java b/dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/server/DepositServlet.java index 28d75af53c..feee54eafb 100644 --- a/dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/server/DepositServlet.java +++ b/dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/server/DepositServlet.java @@ -185,8 +185,7 @@ public class DepositServlet extends HttpServlet { // Print out the Deposit Response response.setStatus(dr.getHttpResponse()); - // response.setContentType("application/atomserv+xml"); - response.setContentType("application/xml"); + response.setContentType("application/atom+xml; charset=UTF-8"); PrintWriter out = response.getWriter(); out.write(dr.marshall()); out.flush(); diff --git a/dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/server/ServiceDocumentServlet.java b/dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/server/ServiceDocumentServlet.java index 76a7b7bebe..2dc5afb73a 100644 --- a/dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/server/ServiceDocumentServlet.java +++ b/dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/server/ServiceDocumentServlet.java @@ -80,8 +80,7 @@ public class ServiceDocumentServlet extends HttpServlet { ServiceDocument sd = myRepository.doServiceDocument(sdr); // Print out the Service Document - // response.setContentType("application/atomserv+xml"); - response.setContentType("application/xml"); + response.setContentType("application/atomsvc+xml; charset=UTF-8"); PrintWriter out = response.getWriter(); out.write(sd.marshall()); out.flush(); diff --git a/dspace/CHANGES b/dspace/CHANGES index edbbb9088f..20d4734f20 100644 --- a/dspace/CHANGES +++ b/dspace/CHANGES @@ -1,3 +1,13 @@ +(Stuart Lewis) +- [1947036] Patch for SF Bug1896960 SWORD authentication and LDAP + [1989874] LDAPAuthentication + pluggable method broken for current users + +(Zuki Ebetsu / Stuart Lewis) +- [1990660] SWORD Service Document are malformed / Corrected Atom publishing MIME types + +1.5 final +========= + (Mark Diggory) - New options for ItemImporter to support bitstream permissions and descriptions.