Thread: [sword-app-changelog] SF.net SVN: sword-app:[252] JavaClient2.0

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

Revision: 252
          http://sword-app.svn.sourceforge.net/sword-app/?rev=252&view=rev
Author:   richard-jones
Date:     2011-04-19 17:49:46 +0000 (Tue, 19 Apr 2011)

Log Message:
-----------
partial Java client for the SWORD 2.0 implementation; covers Create and some of Retrieve

Added Paths:
-----------
    JavaClient2.0/pom.xml
    JavaClient2.0/src/
    JavaClient2.0/src/main/
    JavaClient2.0/src/main/java/
    JavaClient2.0/src/main/java/org/
    JavaClient2.0/src/main/java/org/swordapp/
    JavaClient2.0/src/main/java/org/swordapp/client/
    JavaClient2.0/src/main/java/org/swordapp/client/AuthCredentials.java
    JavaClient2.0/src/main/java/org/swordapp/client/ClientConfiguration.java
    JavaClient2.0/src/main/java/org/swordapp/client/CollectionEntries.java
    JavaClient2.0/src/main/java/org/swordapp/client/Content.java
    JavaClient2.0/src/main/java/org/swordapp/client/Deposit.java
    JavaClient2.0/src/main/java/org/swordapp/client/DepositReceipt.java
    JavaClient2.0/src/main/java/org/swordapp/client/EntryPart.java
    JavaClient2.0/src/main/java/org/swordapp/client/HttpHeaders.java
    JavaClient2.0/src/main/java/org/swordapp/client/ProtocolViolationException.java
    JavaClient2.0/src/main/java/org/swordapp/client/SWORDClient.java
    JavaClient2.0/src/main/java/org/swordapp/client/SWORDClientException.java
    JavaClient2.0/src/main/java/org/swordapp/client/SWORDCollection.java
    JavaClient2.0/src/main/java/org/swordapp/client/SWORDError.java
    JavaClient2.0/src/main/java/org/swordapp/client/SWORDMultipartRequestEntity.java
    JavaClient2.0/src/main/java/org/swordapp/client/SWORDWorkspace.java
    JavaClient2.0/src/main/java/org/swordapp/client/ServiceDocument.java
    JavaClient2.0/src/main/java/org/swordapp/client/Statement.java
    JavaClient2.0/src/main/java/org/swordapp/client/SwordCli.java
    JavaClient2.0/src/main/java/org/swordapp/client/UriRegistry.java
    JavaClient2.0/src/test/
    JavaClient2.0/src/test/java/
    JavaClient2.0/src/test/java/org/
    JavaClient2.0/src/test/java/org/swordapp/
    JavaClient2.0/src/test/java/org/swordapp/client/
    JavaClient2.0/src/test/java/org/swordapp/client/test/
    JavaClient2.0/src/test/java/org/swordapp/client/test/ClientTests.java

Added: JavaClient2.0/pom.xml
===================================================================

--- JavaClient2.0/pom.xml	                        (rev 0)
+++ JavaClient2.0/pom.xml	2011-04-19 17:49:46 UTC (rev 252)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.swordapp</groupId>
+    <artifactId>sword-client</artifactId>
+    <version>2.0</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.15</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.abdera</groupId>
+          <artifactId>abdera-client</artifactId>
+          <version>1.1.1</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

Added: JavaClient2.0/src/main/java/org/swordapp/client/AuthCredentials.java
===================================================================
--- JavaClient2.0/src/main/java/org/swordapp/client/AuthCredentials.java	                        (rev 0)
+++ JavaClient2.0/src/main/java/org/swordapp/client/AuthCredentials.java	2011-04-19 17:49:46 UTC (rev 252)
@@ -0,0 +1,70 @@
+package org.swordapp.client;
+
+public class AuthCredentials
+{
+    private String username;
+    private String password;
+    private String onBehalfOf;
+    private String target = null;
+    private String realm = null;
+
+    public AuthCredentials(String username, String password, String onBehalfOf, String target, String realm)
+    {
+        this.username = username;
+        this.password = password;
+        this.onBehalfOf = onBehalfOf;
+        this.target = target;
+        this.realm = realm;
+    }
+
+    public AuthCredentials(String username, String password, String target, String realm)
+    {
+        this.username = username;
+        this.password = password;
+        this.target = target;
+        this.realm = realm;
+    }
+
+    public AuthCredentials(String username, String password, String onBehalfOf)
+    {
+        this.username = username;
+        this.password = password;
+        this.onBehalfOf = onBehalfOf;
+    }
+
+    public AuthCredentials(String username, String password)
+    {
+        this.username = username;
+        this.password = password;
+    }
+
+    public AuthCredentials(String onBehalfOf)
+    {
+        this.onBehalfOf = onBehalfOf;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public String getOnBehalfOf()
+    {
+        return onBehalfOf;
+    }
+
+    public String getTarget()
+    {
+        return target;
+    }
+
+    public String getRealm()
+    {
+        return realm;
+    }
+}

Added: JavaClient2.0/src/main/java/org/swordapp/client/ClientConfiguration.java
===================================================================
--- JavaClient2.0/src/main/java/org/swordapp/client/ClientConfiguration.java	                        (rev 0)
+++ JavaClient2.0/src/main/java/org/swordapp/client/ClientConfiguration.java	2011-04-19 17:49:46 UTC (rev 252)
@@ -0,0 +1,27 @@
+package org.swordapp.client;
+
+public class ClientConfiguration
+{
+    private String userAgent = "SWORD Client 2.0";
+    private boolean returnDepositReceipt = true;
+
+    public String getUserAgent()
+    {
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent)
+    {
+        this.userAgent = userAgent;
+    }
+
+    public boolean returnDepositReceipt()
+    {
+        return returnDepositReceipt;
+    }
+
+    public void setReturnDepositReceipt(boolean returnDepositReceipt)
+    {
+        this.returnDepositReceipt = returnDepositReceipt;
+    }
+}

Added: JavaClient2.0/src/main/java/org/swordapp/client/CollectionEntries.java
===================================================================
--- JavaClient2.0/src/main/java/org/swordapp/client/CollectionEntries.java	                        (rev 0)
+++ JavaClient2.0/src/main/java/org/swordapp/client/CollectionEntries.java	2011-04-19 17:49:46 UTC (rev 252)
@@ -0,0 +1,31 @@
+package org.swordapp.client;
+
+import org.apache.abdera.model.Entry;
+import org.apache.abdera.model.Feed;
+
+import java.util.List;
+
+public class CollectionEntries
+{
+    private Feed feed;
+
+    public CollectionEntries(Feed feed)
+    {
+        this.feed = feed;
+    }
+
+    public Feed getFeed()
+    {
+        return feed;
+    }
+
+    public List<Entry> getEntries()
+    {
+        return this.feed.getEntries();
+    }
+
+    public Entry getEntry(String s)
+    {
+        return this.feed.getEntry(s);
+    }
+}

Added: JavaClient2.0/src/main/java/org/swordapp/client/Content.java
===================================================================
--- JavaClient2.0/src/main/java/org/swordapp/client/Content.java	                        (rev 0)
+++ JavaClient2.0/src/main/java/org/swordapp/client/Content.java	2011-04-19 17:49:46 UTC (rev 252)
@@ -0,0 +1,54 @@
+package org.swordapp.client;
+
+import org.apache.abdera.model.Feed;
+
+import javax.activation.MimeType;
+import java.io.InputStream;
+
+public class Content
+{
+    private MimeType mimeType;
+    private String packaging;
+    private InputStream inputStream;
+    private Feed feed;
+
+    public MimeType getMimeType()
+    {
+        return mimeType;
+    }
+
+    public void setMimeType(MimeType mimeType)
+    {
+        this.mimeType = mimeType;
+    }
+
+    public String getPackaging()
+    {
+        return packaging;
+    }
+
+    public void setPackaging(String packaging)
+    {
+        this.packaging = packaging;
+    }
+
+    public InputStream getInputStream()
+    {
+        return inputStream;
+    }
+
+    public void setInputStream(InputStream inputStream)
+    {
+        this.inputStream = inputStream;
+    }
+
+    public Feed getFeed()
+    {
+        return feed;
+    }
+
+    public void setFeed(Feed feed)
+    {
+        this.feed = feed;
+    }
+}

Added: JavaClient2.0/src/main/java/org/swordapp/client/Deposit.java
===================================================================
--- JavaClient2.0/src/main/java/org/swordapp/client/Deposit.java	                        (rev 0)
+++ JavaClient2.0/src/main/java/org/swordapp/client/Deposit.java	2011-04-19 17:49:46 UTC (rev 252)
@@ -0,0 +1,167 @@
+package org.swordapp.client;
+
+import java.io.InputStream;
+
+public class Deposit
+{
+    private EntryPart entryPart = null;
+    private InputStream file = null;
+    private String filename;
+    private String mimeType;
+    private String slug = null;
+    private String md5 = null;
+    private String packaging;
+    private boolean inProgress = false;
+    private boolean suppressMetadata = false;
+
+    public Deposit(EntryPart entryPart)
+    {
+        this(entryPart, null, false, false);
+    }
+
+    public Deposit(EntryPart entryPart, String slug, boolean inProgress, boolean suppressMetadata)
+    {
+        this.entryPart = entryPart;
+        this.slug = slug;
+        this.inProgress = inProgress;
+        this.suppressMetadata = suppressMetadata;
+    }
+
+    public Deposit(InputStream file, String filename, String mimeType, String packaging)
+    {
+        this.file = file;
+        this.filename = filename;
+        this.mimeType = mimeType;
+        this.packaging = packaging;
+    }
+
+    public Deposit(EntryPart entryPart, InputStream file, String filename, String mimeType, String packaging)
+    {
+        this.entryPart = entryPart;
+        this.file = file;
+        this.filename = filename;
+        this.mimeType = mimeType;
+        this.packaging = packaging;
+
+        // now, since we have got an EntryPart and an InputStream, we need to set the content src of the EntryPart
+        this.entryPart.referenceMediaPart(mimeType);
+    }
+
+    public Deposit(InputStream file, String filename, String mimeType, String packaging,
+                   String slug, String md5, boolean inProgress, boolean suppressMetadata)
+    {
+        this.file = file;
+        this.filename = filename;
+        this.mimeType = mimeType;
+        this.packaging = packaging;
+        this.slug = slug;
+        this.md5 = md5;
+        this.inProgress = inProgress;
+        this.suppressMetadata = suppressMetadata;
+    }
+
+    public boolean isEntryOnly()
+    {
+        return this.entryPart != null && this.file == null;
+    }
+
+    public boolean isMultipart()
+    {
+        return this.entryPart != null && this.file != null;
+    }
+
+    public boolean isBinaryOnly()
+    {
+        return this.entryPart == null && this.file != null;
+    }
+
+    public EntryPart getEntryPart()
+    {
+        return entryPart;
+    }
+
+    public void setEntryPart(EntryPart entryPart)
+    {
+        this.entryPart = entryPart;
+    }
+
+    public InputStream getFile()
+    {
+        return file;
+    }
+
+    public void setFile(InputStream file)
+    {
+        this.file = file;
+    }
+
+    public String getFilename()
+    {
+        return filename;
+    }
+
+    public void setFilename(String filename)
+    {
+        this.filename = filename;
+    }
+
+    public String getMimeType()
+    {
+        return mimeType;
+    }
+
+    public void setMimeType(String mimeType)
+    {
+        this.mimeType = mimeType;
+    }
+
+    public String getSlug()
+    {
+        return slug;
+    }
+
+    public void setSlug(String slug)
+    {
+        this.slug = slug;
+    }
+
+    public String getMd5()
+    {
+        return md5;
+    }
+
+    public void setMd5(String md5)
+    {
+        this.md5 = md5;
+    }
+
+    public String getPackaging()
+    {
+        return packaging;
+    }
+
+    public void setPackaging(String packaging)
+    {
+        this.packaging = packaging;
+    }
+
+    public boolean isInProgress()
+    {
+        return inProgress;
+    }
+
+    public void setInProgress(boolean inProgress)
+    {
+        this.inProgress = inProgress;
+    }
+
+    public boolean isSuppressMetadata()
+    {
+        return suppressMetadata;
+    }
+
+    public void setSuppressMetadata(boolean suppressMetadata)
+    {
+        this.suppressMetadata = suppressMetadata;
+    }
+}

Added: JavaClient2.0/src/main/java/org/swordapp/client/DepositReceipt.java
===================================================================
--- JavaClient2.0/src/main/java/org/swordapp/client/DepositReceipt.java	                        (rev 0)
+++ JavaClient2.0/src/main/java/org/swordapp/client/DepositReceipt.java	2011-04-19 17:49:46 UTC (rev 252)
@@ -0,0 +1,42 @@
+package org.swordapp.client;
+
+import org.apache.abdera.i18n.iri.IRI;
+import org.apache.abdera.model.Entry;
+import org.apache.abdera.model.Link;
+
+import javax.activation.MimeType;
+
+public class DepositReceipt
+{
+    private Entry entry;
+
+    public DepositReceipt(Entry entry)
+    {
+        this.entry = entry;
+    }
+
+    public Entry getEntry()
+    {
+        return entry;
+    }
+
+    public IRI getContentSrc()
+    {
+        return this.entry.getContentSrc();
+    }
+
+    public MimeType getContentMimeType()
+    {
+        return this.entry.getContentMimeType();
+    }
+
+    public Link getEditMediaLink(String type)
+    {
+        return this.getEditMediaLink(type, null);
+    }
+
+    public Link getEditMediaLink(String type, String hreflang)
+    {
+        return this.entry.getEditMediaLink(type, hreflang);
+    }
+}

Added: JavaClient2.0/src/main/java/org/swordapp/client/EntryPart.java
===================================================================
--- JavaClient2.0/src/main/java/org/swordapp/client/EntryPart.java	                        (rev 0)
+++ JavaClient2.0/src/main/java/org/swordapp/client/EntryPart.java	2011-04-19 17:49:46 UTC (rev 252)
@@ -0,0 +1,48 @@
+package org.swordapp.client;
+
+import org.apache.abdera.Abdera;
+import org.apache.abdera.i18n.iri.IRI;
+import org.apache.abdera.model.Element;
+import org.apache.abdera.model.Entry;
+import org.apache.abdera.model.ExtensibleElement;
+
+import javax.xml.namespace.QName;
+import java.util.UUID;
+
+public class EntryPart
+{
+    private Entry entry;
+
+    public EntryPart()
+    {
+        Abdera ab = new Abdera();
+        this.entry = ab.newEntry();
+    }
+
+    public Entry getEntry()
+    {
+        return entry;
+    }
+
+    public void referenceMediaPart(String mimeType)
+    {
+        String uuid = UUID.randomUUID().toString();
+        this.entry.setContent(new IRI("cid:" + uuid), mimeType);
+    }
+
+    public Element addDublinCore(String field, String value)
+    {
+        QName term = new QName(UriRegistry.DC_NAMESPACE, field);
+        return this.entry.addSimpleExtension(term, value);
+    }
+
+    public Element addSimpleExtension(QName qName, String s)
+    {
+        return this.entry.addSimpleExtension(qName, s);
+    }
+
+    public <T extends ExtensibleElement> T addExtension(Element element)
+    {
+        return this.entry.addExtension(element);
+    }
+}

Added: JavaClient2.0/src/main/java/org/swordapp/client/HttpHeaders.java
===================================================================
--- JavaClient2.0/src/main/java/org/swordapp/client/HttpHeaders.java	                        (rev 0)
+++ JavaClient2.0/src/main/java/org/swordapp/client/HttpHeaders.java	2011-04-19 17:49:46 UTC (rev 252)
@@ -0,0 +1,121 @@
+package org.swordapp.client;
+
+import org.apache.abdera.protocol.client.ClientResponse;
+import org.apache.abdera.protocol.client.RequestOptions;
+import org.apache.log4j.Logger;
+
+public class HttpHeaders
+{
+    private static Logger log = Logger.getLogger(HttpHeaders.class);
+
+    public void addContentDisposition(RequestOptions options, String filename)
+            throws SWORDClientException
+    {
+        if (filename == null || "".equals(filename))
+        {
+            log.error("No filename has been specified for the Content-Disposition, but this is a required field; throwing Exception");
+            throw new SWORDClientException("No filename has been specified for the Content-Disposition, but this is a required field");
+        }
+        options.addHeader("Content-Disposition", "attachment; filename=" + filename);
+    }
+
+    public void addContentMd5(RequestOptions options, String checksum)
+    {
+        if (checksum != null && !"".equals(checksum))
+        {
+            if (log.isDebugEnabled())
+            {
+                log.debug("Adding HTTP Header to RequestOptions; Content-MD5: " + checksum);
+            }
+            options.addHeader("Content-MD5", checksum);
+        }
+    }
+
+    public void addPackaging(RequestOptions options, String packaging)
+    {
+        if (packaging != null && !"".equals(packaging))
+        {
+            if (log.isDebugEnabled())
+            {
+                log.debug("Adding HTTP Header to RequestOptions; Packaging: " + packaging);
+            }
+            options.addHeader("Packaging", packaging);
+        }
+    }
+
+    public void addAcceptPackaging(RequestOptions options, String packaging)
+    {
+        if (packaging != null && !"".equals(packaging))
+        {
+            if (log.isDebugEnabled())
+            {
+                log.debug("Adding HTTP Header to RequestOptions; Accept-Packaging: " + packaging);
+            }
+            options.addHeader("Accept-Packaging", packaging);
+        }
+    }
+
+    public void addAccept(RequestOptions options, String mimeType)
+    {
+        if (mimeType != null && !"".equals(mimeType))
+        {
+            if (log.isDebugEnabled())
+            {
+                log.debug("Adding HTTP Header to RequestOptions; Accept: " + mimeType);
+            }
+            options.addHeader("Accept", mimeType);
+        }
+    }
+
+    public void addInProgress(RequestOptions options, boolean inProgress)
+    {
+        if (log.isDebugEnabled())
+        {
+            log.debug("Adding HTTP Header to RequestOptions; In-Progress: " + (inProgress ? "true" : "false"));
+        }
+        options.addHeader("In-Progress", inProgress ? "true" : "false");
+    }
+
+    public void addSuppressMetadata(RequestOptions options, boolean suppressMetadata)
+    {
+        if (log.isDebugEnabled())
+        {
+            log.debug("Adding HTTP Header to RequestOptions; Suppress-Metadata: " + (suppressMetadata ? "true" : "false"));
+        }
+        options.addHeader("Suppress-Metadata", suppressMetadata ? "true" : "false");
+    }
+
+    public void addSlug(RequestOptions options, String slug)
+    {
+        if (slug != null && !"".equals(slug))
+        {
+            if (log.isDebugEnabled())
+            {
+                log.debug("Adding HTTP Header to RequestOptions; Slug: " + slug);
+            }
+            options.addHeader("Slug", slug);
+        }
+    }
+
+    public void addOnBehalfOf(RequestOptions options, String username)
+    {
+        if (username != null && !"".equals(username))
+        {
+            if (log.isDebugEnabled())
+            {
+                log.debug("Adding HTTP Header to RequestOptions; On-Behalf-Of: " + username);
+            }
+            options.addHeader("On-Behalf_of", username);
+        }
+    }
+
+    public String getLocation(ClientResponse resp)
+    {
+        return resp.getHeader("Location");
+    }
+
+    public String getPackaging(ClientResponse resp)
+    {
+        return resp.getHeader("Packaging");
+    }
+}

Added: JavaClient2.0/src/main/java/org/swordapp/client/ProtocolViolationException.java
===================================================================
--- JavaClient2.0/src/main/java/org/swordapp/client/ProtocolViolationException.java	                        (rev 0)
+++ JavaClient2.0/src/main/java/org/swordapp/client/ProtocolViolationException.java	2011-04-19 17:49:46 UTC (rev 252)
@@ -0,0 +1,24 @@
+package org.swordapp.client;
+
+public class ProtocolViolationException extends Exception
+{
+    public ProtocolViolationException()
+    {
+        super();
+    }
+
+    public ProtocolViolationException(String message)
+    {
+        super(message);
+    }
+
+    public ProtocolViolationException(String message, Throwable cause)
+    {
+        super(message, cause);
+    }
+
+    public ProtocolViolationException(Throwable cause)
+    {
+        super(cause);
+    }
+}

Added: JavaClient2.0/src/main/java/org/swordapp/client/SWORDClient.java
===================================================================
--- JavaClient2.0/src/main/java/org/swordapp/client/SWORDClient.java	                        (rev 0)
+++ JavaClient2.0/src/main/java/org/swordapp/client/SWORDClient.java	2011-04-19 17:49:46 UTC (rev 252)
@@ -0,0 +1,584 @@
+package org.swordapp.client;
+
+import org.apache.abdera.Abdera;
+import org.apache.abdera.model.Document;
+import org.apache.abdera.model.Entry;
+import org.apache.abdera.model.Feed;
+import org.apache.abdera.model.Service;
+import org.apache.abdera.protocol.Response;
+import org.apache.abdera.protocol.client.AbderaClient;
+import org.apache.abdera.protocol.client.ClientResponse;
+import org.apache.abdera.protocol.client.RequestOptions;
+import org.apache.abdera.protocol.client.util.MultipartRelatedRequestEntity;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
+import org.apache.log4j.Logger;
+
+import javax.activation.MimeType;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+public class SWORDClient
+{
+    private static Logger log = Logger.getLogger(SWORDClient.class);
+
+    private ClientConfiguration config;
+
+    private Abdera abdera;
+
+    public SWORDClient()
+    {
+        this(new ClientConfiguration());
+    }
+
+    public SWORDClient(ClientConfiguration config)
+    {
+        this.config = config;
+        this.abdera = new Abdera();
+    }
+
+    public ServiceDocument getServiceDocument(String sdURL)
+            throws SWORDClientException, ProtocolViolationException
+    {
+        return this.getServiceDocument(sdURL, null);
+    }
+
+    public ServiceDocument getServiceDocument(String sdURL, AuthCredentials auth)
+            throws SWORDClientException, ProtocolViolationException
+    {
+        // do some error checking and validations
+        if (sdURL == null)
+        {
+            log.error("Null string passed in to getServiceDocument; returning null");
+            return null;
+        }
+        if (log.isDebugEnabled())
+        {
+            log.debug("getting service document from " + sdURL);
+        }
+
+        AbderaClient client = new AbderaClient(this.abdera);
+        RequestOptions options = this.getDefaultRequestOptions();
+
+        // prepare the bits of the request
+
+        // ensure that the URL is valid
+        URL url = this.formaliseURL(sdURL);
+        if (log.isDebugEnabled())
+        {
+            log.debug("Formalised Service Document URL to " + url.toString());
+        }
+
+        // sort out the HTTP basic authentication credentials
+        this.prepAuth(auth, client, options);
+
+        // log the request
+        this.logGetRequest(auth, url.toString(), "Service Document");
+
+        // make the request for the service document
+        if (log.isDebugEnabled())
+        {
+           log.debug("Connecting to Server to retrieve Service Document from " + url.toString() + " ...");
+        }
+        ClientResponse resp = client.get(url.toString(), options);
+        if (log.isDebugEnabled())
+        {
+            log.debug("Successfully retrieved Service Document from " + url.toString());
+        }
+
+        // if the response is successful, get the service document out of the response,
+        // and wrap it in the SWORD ServiceDocument class
+        if (resp.getType() == Response.ResponseType.SUCCESS)
+        {
+            log.info("Retrieved Service Document from " + url.toString() + " with HTTP success code");
+            Document<Service> doc = resp.getDocument();
+            Service sd = doc.getRoot();
+            ServiceDocument ssd = new ServiceDocument(sd);
+            return ssd;
+        }
+
+        // if we don't get anything respond with null
+        log.warn("Unable to retrieve service document from " + url.toString() + "; responded with " + resp.getStatus()
+                + ". Possible problem with SWORD server, or URL");
+        return null;
+    }
+
+    public CollectionEntries listCollection(SWORDCollection collection)
+            throws SWORDClientException, ProtocolViolationException
+    {
+        return this.listCollection(collection.getHref().toString(), null);
+    }
+
+    public CollectionEntries listCollection(String colURL)
+            throws SWORDClientException, ProtocolViolationException
+    {
+        return this.listCollection(colURL, null);
+    }
+
+    public CollectionEntries listCollection(SWORDCollection collection, AuthCredentials auth)
+            throws SWORDClientException, ProtocolViolationException
+    {
+        return this.listCollection(collection.getHref().toString(), auth);
+    }
+
+    public CollectionEntries listCollection(String colURL, AuthCredentials auth)
+            throws SWORDClientException, ProtocolViolationException
+    {
+        // do some error checking and validation
+        if (colURL == null)
+        {
+            log.error("Null URL passed in to listCollection; returning null");
+            return null;
+        }
+        if (log.isDebugEnabled())
+        {
+            log.debug("listing collection contents from " + colURL);
+        }
+
+        AbderaClient client = new AbderaClient(this.abdera);
+        RequestOptions options = this.getDefaultRequestOptions();
+
+        // ensure that the URL is valid
+        URL url = this.formaliseURL(colURL);
+        if (log.isDebugEnabled())
+        {
+            log.debug("Formalised Collection URL to " + url.toString());
+        }
+
+        // sort out the HTTP basic authentication credentials
+        this.prepAuth(auth, client, options);
+
+        // log the request
+        this.logGetRequest(auth, colURL, "Collection Entry List");
+
+        // make the request for the service document
+        if (log.isDebugEnabled())
+        {
+           log.debug("Connecting to Server to list contents of Collection " + url.toString() + " ...");
+        }
+        ClientResponse resp = client.get(url.toString(), options);
+        if (log.isDebugEnabled())
+        {
+            log.debug("Successfully retrieved Collection contents list from " + url.toString());
+        }
+
+        // if the response is successful, get the service document out of the response,
+        // and wrap it in the SWORD ServiceDocument class
+        if (resp.getType() == Response.ResponseType.SUCCESS)
+        {
+            log.info("Successfully retrieved Collection Entry List from " + url.toString());
+            Document<Feed> doc = resp.getDocument();
+            Feed feed = doc.getRoot();
+            CollectionEntries ce = new CollectionEntries(feed);
+            return ce;
+        }
+
+        // if we don't get anything respond with null
+        log.warn("Unable to retrieve collection entry list from " + url.toString() + "; responded with " + resp.getStatus()
+                + ". Possible problem with SWORD server, or URL");
+        return null;
+    }
+
+    public DepositReceipt getDepositReceipt(String editURL)
+            throws SWORDClientException
+    {
+        return null;
+    }
+
+    public Statement getStatement()
+            throws SWORDClientException
+    {
+        return null;
+    }
+
+    public DepositReceipt deposit(SWORDCollection collection, Deposit deposit)
+            throws SWORDClientException, SWORDError, ProtocolViolationException
+    {
+        return this.deposit(collection.getHref().toString(), deposit, null);
+    }
+
+    public DepositReceipt deposit(String targetURL, Deposit deposit)
+            throws SWORDClientException, SWORDError, ProtocolViolationException
+    {
+        return this.deposit(targetURL, deposit, null);
+    }
+
+    public DepositReceipt deposit(SWORDCollection collection, Deposit deposit, AuthCredentials auth)
+            throws SWORDClientException, SWORDError, ProtocolViolationException
+    {
+        return this.deposit(collection.getHref().toString(), deposit, auth);
+    }
+
+    public DepositReceipt deposit(String targetURL, Deposit deposit, AuthCredentials auth)
+            throws SWORDClientException, SWORDError, ProtocolViolationException
+    {
+        // some initial error checking and validation
+        if (targetURL == null)
+        {
+            log.error("Null URL passed into deposit method");
+            throw new SWORDClientException("Null URL passed into deposit method");
+        }
+        if (deposit == null)
+        {
+            log.error("Null Deposit Object passed into deposit method");
+            throw new SWORDClientException("Null Deposit Object passed into deposit method");
+        }
+        if (log.isDebugEnabled())
+        {
+            log.debug("beginning deposit on Collection url " + targetURL);
+        }
+
+        AbderaClient client = new AbderaClient(this.abdera);
+        RequestOptions options = this.getDefaultRequestOptions();
+        HttpHeaders http = new HttpHeaders();
+
+        // ensure that the URL is valid
+        URL url = this.formaliseURL(targetURL);
+        if (log.isDebugEnabled())
+        {
+            log.debug("Formalised Collection URL to " + url.toString());
+ ...
 
[truncated message content]