- * To create your own Atom protocol implementation you must implement this interface and create a concrete sub-class of - * {@link com.sun.syndication.propono.atom.server.AtomHandlerFactory} which is capable of instantiating it. + * To create your own Atom protocol implementation you must implement this interface and create a + * concrete sub-class of {@link com.sun.syndication.propono.atom.server.AtomHandlerFactory} which is + * capable of instantiating it. *
*/ public interface AtomHandler { @@ -40,8 +40,10 @@ public interface AtomHandler { public String getAuthenticatedUsername(); /** - * Return {@link com.sun.syndication.propono.atom.common.AtomService} object that contains the {@link com.sun.syndication.propono.atom.common.Workspace} - * objects available to the currently authenticated user and within those the {@link com.sun.syndication.propono.atom.common.Collection} avalaible. + * Return {@link com.sun.syndication.propono.atom.common.AtomService} object that contains the + * {@link com.sun.syndication.propono.atom.common.Workspace} objects available to the currently + * authenticated user and within those the + * {@link com.sun.syndication.propono.atom.common.Collection} avalaible. */ public AtomService getAtomService(AtomRequest req) throws AtomException; @@ -52,14 +54,15 @@ public interface AtomHandler { /** * Return collection or portion of collection specified by request. - * + * * @param req Details of HTTP request */ public Feed getCollection(AtomRequest req) throws AtomException; /** - * Store new entry in collection specified by request and return representation of entry as it is stored on server. - * + * Store new entry in collection specified by request and return representation of entry as it + * is stored on server. + * * @param req Details of HTTP request * @return Location URL of new entry */ @@ -67,36 +70,36 @@ public interface AtomHandler { /** * Get entry specified by request. - * + * * @param req Details of HTTP request */ public Entry getEntry(AtomRequest req) throws AtomException; /** * Get media resource specified by request. - * + * * @param req Details of HTTP request */ public AtomMediaResource getMediaResource(AtomRequest req) throws AtomException; /** * Update entry specified by request and return new entry as represented on the server. - * + * * @param req Details of HTTP request */ public void putEntry(AtomRequest req, Entry entry) throws AtomException; /** * Delete entry specified by request. - * + * * @param req Details of HTTP request */ public void deleteEntry(AtomRequest req) throws AtomException; /** - * Store media data in collection specified by request, create an Atom media-link entry to store metadata for the new media file and return that entry to - * the caller. - * + * Store media data in collection specified by request, create an Atom media-link entry to store + * metadata for the new media file and return that entry to the caller. + * * @param req Details of HTTP request * @param entry New entry initialzied with only title and content type * @return Location URL of new media entry @@ -105,42 +108,42 @@ public interface AtomHandler { /** * Update the media file part of a media-link entry. - * + * * @param req Details of HTTP request */ public void putMedia(AtomRequest req) throws AtomException; /** * Return true if specified request represents URI of a Service Document. - * + * * @param req Details of HTTP request */ public boolean isAtomServiceURI(AtomRequest req); /** * Return true if specified request represents URI of a Categories Document. - * + * * @param req Details of HTTP request */ public boolean isCategoriesURI(AtomRequest req); /** * Return true if specified request represents URI of a collection. - * + * * @param req Details of HTTP request */ public boolean isCollectionURI(AtomRequest req); /** * Return true if specified request represents URI of an Atom entry. - * + * * @param req Details of HTTP request */ public boolean isEntryURI(AtomRequest req); /** * Return true if specified patrequesthinfo represents media-edit URI. - * + * * @param req Details of HTTP request */ public boolean isMediaEditURI(AtomRequest req); diff --git a/src/main/java/com/rometools/propono/atom/server/AtomMediaResource.java b/src/main/java/com/rometools/propono/atom/server/AtomMediaResource.java index cb0bd36..6b427d7 100644 --- a/src/main/java/com/rometools/propono/atom/server/AtomMediaResource.java +++ b/src/main/java/com/rometools/propono/atom/server/AtomMediaResource.java @@ -1,10 +1,10 @@ -/* +/* * Copyright 2007 Sun Microsystems, Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software diff --git a/src/main/java/com/rometools/propono/atom/server/AtomServlet.java b/src/main/java/com/rometools/propono/atom/server/AtomServlet.java index 50b6282..b440b15 100644 --- a/src/main/java/com/rometools/propono/atom/server/AtomServlet.java +++ b/src/main/java/com/rometools/propono/atom/server/AtomServlet.java @@ -35,12 +35,12 @@ import javax.servlet.http.HttpServletResponse; import org.jdom2.Document; import org.jdom2.output.Format; import org.jdom2.output.XMLOutputter; -import com.rometools.propono.atom.common.AtomService; -import com.rometools.propono.atom.common.Categories; -import com.rometools.propono.utils.Utilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.rometools.propono.atom.common.AtomService; +import com.rometools.propono.atom.common.Categories; +import com.rometools.propono.utils.Utilities; import com.sun.syndication.feed.atom.Content; import com.sun.syndication.feed.atom.Entry; import com.sun.syndication.feed.atom.Feed; diff --git a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandler.java b/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandler.java index a558b13..b1e0b9c 100644 --- a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandler.java +++ b/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandler.java @@ -22,6 +22,9 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.rometools.propono.atom.common.AtomService; import com.rometools.propono.atom.common.Categories; import com.rometools.propono.atom.server.AtomException; @@ -29,9 +32,6 @@ import com.rometools.propono.atom.server.AtomHandler; import com.rometools.propono.atom.server.AtomMediaResource; import com.rometools.propono.atom.server.AtomRequest; import com.rometools.propono.atom.server.AtomServlet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.sun.syndication.feed.atom.Entry; import com.sun.syndication.feed.atom.Feed; diff --git a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomService.java b/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomService.java index e68ce65..3df365c 100644 --- a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomService.java +++ b/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomService.java @@ -30,14 +30,14 @@ import com.rometools.propono.utils.Utilities; *
* # Define list of collections to be offered
* propono.atomserver.filebased.collections=entries,gifimages
- *
+ *
* # Defines 'entries' collection, accepts entries
* propono.atomserver.filebased.collection.entries.title=Entries
* propono.atomserver.filebased.collection.entries.singular=entry
* propono.atomserver.filebased.collection.entries.plural=entries
* propono.atomserver.filebased.collection.entries.accept=application/atom+xml;type=entry
* propono.atomserver.filebased.collection.entries.categories=general,category1,category2
- *
+ *
* # Defines 'gifimages' collection, accepts only GIF files
* propono.atomserver.filebased.collection.gifimages.title=GIF Images
* propono.atomserver.filebased.collection.gifimages.singular=gif
diff --git a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedCollection.java b/src/main/java/com/rometools/propono/atom/server/impl/FileBasedCollection.java
index 7dc6439..26efd37 100644
--- a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedCollection.java
+++ b/src/main/java/com/rometools/propono/atom/server/impl/FileBasedCollection.java
@@ -37,6 +37,7 @@ import javax.activation.MimetypesFileTypeMap;
import org.jdom2.Document;
import org.jdom2.output.XMLOutputter;
+
import com.rometools.propono.atom.common.Categories;
import com.rometools.propono.atom.common.Collection;
import com.rometools.propono.atom.common.rome.AppModule;
@@ -45,7 +46,6 @@ import com.rometools.propono.atom.server.AtomException;
import com.rometools.propono.atom.server.AtomMediaResource;
import com.rometools.propono.atom.server.AtomNotFoundException;
import com.rometools.propono.utils.Utilities;
-
import com.sun.syndication.feed.WireFeed;
import com.sun.syndication.feed.atom.Category;
import com.sun.syndication.feed.atom.Content;
diff --git a/src/main/java/com/rometools/propono/blogclient/BlogResource.java b/src/main/java/com/rometools/propono/blogclient/BlogResource.java
index 4f5cab2..e9ffa55 100644
--- a/src/main/java/com/rometools/propono/blogclient/BlogResource.java
+++ b/src/main/java/com/rometools/propono/blogclient/BlogResource.java
@@ -1,10 +1,10 @@
-/*
+/*
* Copyright 2007 Dave Johnson (Blogapps project)
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -20,8 +20,9 @@ import java.io.InputStream;
/**
* Represents a file that has been uploaded to a blog.
*
- * Resources are modeled as a type of BlogEntry, but be aware: not all servers can save resource metadata (i.e. title, category, author, etc.). MetaWeblog based
- * servers can't save metadata at all and Atom protocol servers are not required to preserve uploaded file metadata.
+ * Resources are modeled as a type of BlogEntry, but be aware: not all servers can save resource
+ * metadata (i.e. title, category, author, etc.). MetaWeblog based servers can't save metadata at
+ * all and Atom protocol servers are not required to preserve uploaded file metadata.
*/
public interface BlogResource extends BlogEntry {
diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomCollection.java b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomCollection.java
index ef87d0a..72eddec 100644
--- a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomCollection.java
+++ b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomCollection.java
@@ -27,7 +27,6 @@ import com.rometools.propono.blogclient.Blog;
import com.rometools.propono.blogclient.BlogClientException;
import com.rometools.propono.blogclient.BlogEntry;
import com.rometools.propono.blogclient.BlogResource;
-
import com.sun.syndication.feed.atom.Category;
/**
diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntry.java b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntry.java
index e4abddb..af53fb3 100644
--- a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntry.java
+++ b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntry.java
@@ -26,7 +26,6 @@ import com.rometools.propono.blogclient.BaseBlogEntry;
import com.rometools.propono.blogclient.BlogClientException;
import com.rometools.propono.blogclient.BlogEntry;
import com.rometools.propono.utils.ProponoException;
-
import com.sun.syndication.feed.atom.Entry;
import com.sun.syndication.feed.atom.Link;
import com.sun.syndication.feed.module.Module;
diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntryIterator.java b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntryIterator.java
index a436189..74e0956 100644
--- a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntryIterator.java
+++ b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntryIterator.java
@@ -17,12 +17,13 @@ package com.rometools.propono.blogclient.atomprotocol;
import java.util.Iterator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.rometools.propono.atom.client.ClientEntry;
import com.rometools.propono.atom.client.ClientMediaEntry;
import com.rometools.propono.blogclient.BlogClientException;
import com.rometools.propono.blogclient.BlogEntry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Atom protocol implementation of BlogClient entry iterator.
diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomResource.java b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomResource.java
index 9b8825b..97a0d3c 100644
--- a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomResource.java
+++ b/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomResource.java
@@ -25,7 +25,6 @@ import com.rometools.propono.atom.client.ClientMediaEntry;
import com.rometools.propono.blogclient.BlogClientException;
import com.rometools.propono.blogclient.BlogEntry;
import com.rometools.propono.blogclient.BlogResource;
-
import com.sun.syndication.feed.atom.Link;
/**
diff --git a/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogBlog.java b/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogBlog.java
index 1f0aa51..5367d57 100644
--- a/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogBlog.java
+++ b/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogBlog.java
@@ -28,6 +28,7 @@ import java.util.TreeMap;
import org.apache.xmlrpc.client.XmlRpcClient;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
+
import com.rometools.propono.blogclient.Blog;
import com.rometools.propono.blogclient.BlogClientException;
import com.rometools.propono.blogclient.BlogEntry;
diff --git a/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogConnection.java b/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogConnection.java
index 5ddb8d7..8800f19 100644
--- a/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogConnection.java
+++ b/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogConnection.java
@@ -25,6 +25,7 @@ import java.util.Map;
import org.apache.xmlrpc.XmlRpcException;
import org.apache.xmlrpc.client.XmlRpcClient;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
+
import com.rometools.propono.blogclient.Blog;
import com.rometools.propono.blogclient.BlogClientException;
import com.rometools.propono.blogclient.BlogConnection;
diff --git a/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogResource.java b/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogResource.java
index 2537ace..440cd74 100644
--- a/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogResource.java
+++ b/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogResource.java
@@ -20,6 +20,7 @@ import java.util.HashMap;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.GetMethod;
+
import com.rometools.propono.blogclient.BlogClientException;
import com.rometools.propono.blogclient.BlogResource;
diff --git a/src/test/java/com/rometools/propono/atom/client/AtomClientTest.java b/src/test/java/com/rometools/propono/atom/client/AtomClientTest.java
index f734d5a..468ce57 100644
--- a/src/test/java/com/rometools/propono/atom/client/AtomClientTest.java
+++ b/src/test/java/com/rometools/propono/atom/client/AtomClientTest.java
@@ -15,13 +15,6 @@
*/
package com.rometools.propono.atom.client;
-import com.rometools.propono.atom.client.ClientCollection;
-import com.rometools.propono.atom.client.ClientWorkspace;
-import com.rometools.propono.atom.client.BasicAuthStrategy;
-import com.rometools.propono.atom.client.ClientEntry;
-import com.rometools.propono.atom.client.AtomClientFactory;
-import com.rometools.propono.atom.client.ClientAtomService;
-import com.rometools.propono.atom.client.ClientMediaEntry;
import java.io.FileInputStream;
import java.util.ArrayList;
import java.util.List;
@@ -31,12 +24,12 @@ import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.junit.Ignore;
-import com.rometools.propono.atom.common.Categories;
-import com.rometools.propono.atom.common.Collection;
-import com.rometools.propono.utils.ProponoException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.rometools.propono.atom.common.Categories;
+import com.rometools.propono.atom.common.Collection;
+import com.rometools.propono.utils.ProponoException;
import com.sun.syndication.feed.atom.Category;
import com.sun.syndication.feed.atom.Content;
diff --git a/src/test/java/com/rometools/propono/atom/client/BloggerDotComTest.java b/src/test/java/com/rometools/propono/atom/client/BloggerDotComTest.java
index 7c9e541..fc02902 100644
--- a/src/test/java/com/rometools/propono/atom/client/BloggerDotComTest.java
+++ b/src/test/java/com/rometools/propono/atom/client/BloggerDotComTest.java
@@ -15,11 +15,6 @@
*/
package com.rometools.propono.atom.client;
-import com.rometools.propono.atom.client.ClientCollection;
-import com.rometools.propono.atom.client.GDataAuthStrategy;
-import com.rometools.propono.atom.client.ClientEntry;
-import com.rometools.propono.atom.client.AtomClientFactory;
-import com.rometools.propono.atom.client.ClientAtomService;
import java.util.Iterator;
import junit.framework.Test;
diff --git a/src/test/java/com/rometools/propono/atom/common/AtomServiceTest.java b/src/test/java/com/rometools/propono/atom/common/AtomServiceTest.java
index 0d45676..86f6f6b 100644
--- a/src/test/java/com/rometools/propono/atom/common/AtomServiceTest.java
+++ b/src/test/java/com/rometools/propono/atom/common/AtomServiceTest.java
@@ -15,10 +15,6 @@
*/
package com.rometools.propono.atom.common;
-import com.rometools.propono.atom.common.Collection;
-import com.rometools.propono.atom.common.Workspace;
-import com.rometools.propono.atom.common.Categories;
-import com.rometools.propono.atom.common.AtomService;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/src/test/java/com/rometools/propono/atom/common/CollectionTest.java b/src/test/java/com/rometools/propono/atom/common/CollectionTest.java
index b4a060d..fb05fee 100644
--- a/src/test/java/com/rometools/propono/atom/common/CollectionTest.java
+++ b/src/test/java/com/rometools/propono/atom/common/CollectionTest.java
@@ -15,7 +15,6 @@
*/
package com.rometools.propono.atom.common;
-import com.rometools.propono.atom.common.Collection;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
diff --git a/src/test/java/com/rometools/propono/atom/server/AtomClientServerTest.java b/src/test/java/com/rometools/propono/atom/server/AtomClientServerTest.java
index 19f0a77..3f8e292 100644
--- a/src/test/java/com/rometools/propono/atom/server/AtomClientServerTest.java
+++ b/src/test/java/com/rometools/propono/atom/server/AtomClientServerTest.java
@@ -31,6 +31,9 @@ import org.mortbay.http.HttpContext;
import org.mortbay.http.HttpServer;
import org.mortbay.http.SocketListener;
import org.mortbay.jetty.servlet.ServletHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.rometools.propono.atom.client.AtomClientFactory;
import com.rometools.propono.atom.client.BasicAuthStrategy;
import com.rometools.propono.atom.client.ClientAtomService;
@@ -42,9 +45,6 @@ import com.rometools.propono.atom.common.Categories;
import com.rometools.propono.atom.common.Collection;
import com.rometools.propono.atom.common.Workspace;
import com.rometools.propono.utils.ProponoException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.sun.syndication.feed.atom.Category;
import com.sun.syndication.feed.atom.Content;
diff --git a/src/test/java/com/rometools/propono/atom/server/TestAtomHandlerFactory.java b/src/test/java/com/rometools/propono/atom/server/TestAtomHandlerFactory.java
index 60ea5a9..eec2e59 100644
--- a/src/test/java/com/rometools/propono/atom/server/TestAtomHandlerFactory.java
+++ b/src/test/java/com/rometools/propono/atom/server/TestAtomHandlerFactory.java
@@ -16,8 +16,6 @@
*/
package com.rometools.propono.atom.server;
-import com.rometools.propono.atom.server.AtomHandlerFactory;
-import com.rometools.propono.atom.server.AtomHandler;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/src/test/java/com/rometools/propono/blogclient/SimpleBlogClientTest.java b/src/test/java/com/rometools/propono/blogclient/SimpleBlogClientTest.java
index 0637cb6..0d04035 100644
--- a/src/test/java/com/rometools/propono/blogclient/SimpleBlogClientTest.java
+++ b/src/test/java/com/rometools/propono/blogclient/SimpleBlogClientTest.java
@@ -15,11 +15,6 @@
*/
package com.rometools.propono.blogclient;
-import com.rometools.propono.blogclient.BlogEntry;
-import com.rometools.propono.blogclient.BlogResource;
-import com.rometools.propono.blogclient.BlogConnection;
-import com.rometools.propono.blogclient.Blog;
-import com.rometools.propono.blogclient.BlogConnectionFactory;
import java.io.File;
import java.util.Iterator;
@@ -28,11 +23,11 @@ import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.junit.Ignore;
-import com.rometools.propono.blogclient.Blog.Collection;
-import com.rometools.propono.utils.Utilities;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.rometools.propono.blogclient.Blog.Collection;
+import com.rometools.propono.utils.Utilities;
import com.sun.syndication.io.impl.Atom10Parser;
/**