From 7555644b3fed5ed191ede9f38085a580c4ba189c Mon Sep 17 00:00:00 2001
From: Dave Johnson <snoopdave@gmail.com>
Date: Sat, 5 Oct 2013 12:49:59 -0400
Subject: [PATCH] Moving to ROME 2.0.0 snapshot and JDOM2

---
 .gitignore                                                | 1 +
 pom.xml                                                   | 4 ++--
 .../rometools/propono/atom/client/ClientAtomService.java  | 6 +++---
 .../rometools/propono/atom/client/ClientCategories.java   | 8 ++++----
 .../rometools/propono/atom/client/ClientCollection.java   | 2 +-
 .../rometools/propono/atom/client/ClientMediaEntry.java   | 2 +-
 .../rometools/propono/atom/client/ClientWorkspace.java    | 2 +-
 .../org/rometools/propono/atom/client/EntryIterator.java  | 4 ++--
 .../org/rometools/propono/atom/common/AtomService.java    | 6 +++---
 .../org/rometools/propono/atom/common/Categories.java     | 2 +-
 .../org/rometools/propono/atom/common/Collection.java     | 2 +-
 .../java/org/rometools/propono/atom/common/Workspace.java | 2 +-
 .../propono/atom/common/rome/AppModuleGenerator.java      | 4 ++--
 .../propono/atom/common/rome/AppModuleParser.java         | 4 ++--
 .../org/rometools/propono/atom/server/AtomServlet.java    | 6 +++---
 .../propono/atom/server/impl/FileBasedCollection.java     | 4 ++--
 .../propono/blogclient/atomprotocol/AtomConnection.java   | 2 +-
 src/main/java/org/rometools/propono/utils/Utilities.java  | 8 ++++----
 .../rometools/propono/atom/common/AtomServiceTest.java    | 6 +++---
 19 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a6f89c2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/target/
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 04833ee..3158c30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.rometools</groupId>
     <artifactId>rome-propono</artifactId>
     <name>rome-propono</name>
-    <version>1.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <description>The ROME Propono subproject is a Java class library that
         supports publishing protocols, specifically the Atom Publishing Protocol
@@ -160,7 +160,7 @@
         <dependency>
             <groupId>org.rometools</groupId>
             <artifactId>rome</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/org/rometools/propono/atom/client/ClientAtomService.java b/src/main/java/org/rometools/propono/atom/client/ClientAtomService.java
index 2eef955..4fb6ccb 100644
--- a/src/main/java/org/rometools/propono/atom/client/ClientAtomService.java
+++ b/src/main/java/org/rometools/propono/atom/client/ClientAtomService.java
@@ -28,9 +28,9 @@ import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
 
 
 /**
diff --git a/src/main/java/org/rometools/propono/atom/client/ClientCategories.java b/src/main/java/org/rometools/propono/atom/client/ClientCategories.java
index 0fb5487..784ea3d 100644
--- a/src/main/java/org/rometools/propono/atom/client/ClientCategories.java
+++ b/src/main/java/org/rometools/propono/atom/client/ClientCategories.java
@@ -23,10 +23,10 @@ import org.rometools.propono.utils.ProponoException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import org.apache.commons.httpclient.methods.GetMethod;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 
 
 /** 
diff --git a/src/main/java/org/rometools/propono/atom/client/ClientCollection.java b/src/main/java/org/rometools/propono/atom/client/ClientCollection.java
index e24d1bd..a1d6bda 100644
--- a/src/main/java/org/rometools/propono/atom/client/ClientCollection.java
+++ b/src/main/java/org/rometools/propono/atom/client/ClientCollection.java
@@ -33,7 +33,7 @@ import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethodBase;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.methods.GetMethod;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * Models an Atom collection, extends Collection and adds methods for adding,
diff --git a/src/main/java/org/rometools/propono/atom/client/ClientMediaEntry.java b/src/main/java/org/rometools/propono/atom/client/ClientMediaEntry.java
index 5ac42e6..4560266 100644
--- a/src/main/java/org/rometools/propono/atom/client/ClientMediaEntry.java
+++ b/src/main/java/org/rometools/propono/atom/client/ClientMediaEntry.java
@@ -41,7 +41,7 @@ import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
 
 /**
  * Client implementation of Atom media-link entry, an Atom entry that provides
diff --git a/src/main/java/org/rometools/propono/atom/client/ClientWorkspace.java b/src/main/java/org/rometools/propono/atom/client/ClientWorkspace.java
index 3fc47c7..62cc1ed 100644
--- a/src/main/java/org/rometools/propono/atom/client/ClientWorkspace.java
+++ b/src/main/java/org/rometools/propono/atom/client/ClientWorkspace.java
@@ -21,7 +21,7 @@ import org.rometools.propono.atom.common.Workspace;
 import org.rometools.propono.utils.ProponoException;
 import java.util.Iterator;
 import java.util.List;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 
 /**
diff --git a/src/main/java/org/rometools/propono/atom/client/EntryIterator.java b/src/main/java/org/rometools/propono/atom/client/EntryIterator.java
index 13d8226..efa057e 100644
--- a/src/main/java/org/rometools/propono/atom/client/EntryIterator.java
+++ b/src/main/java/org/rometools/propono/atom/client/EntryIterator.java
@@ -26,8 +26,8 @@ import java.util.NoSuchElementException;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jdom.Document;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.input.SAXBuilder;
 
 
 /** 
diff --git a/src/main/java/org/rometools/propono/atom/common/AtomService.java b/src/main/java/org/rometools/propono/atom/common/AtomService.java
index 9ef7d8c..444febe 100644
--- a/src/main/java/org/rometools/propono/atom/common/AtomService.java
+++ b/src/main/java/org/rometools/propono/atom/common/AtomService.java
@@ -23,9 +23,9 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * Models an Atom Publishing Protocol Service Document.
diff --git a/src/main/java/org/rometools/propono/atom/common/Categories.java b/src/main/java/org/rometools/propono/atom/common/Categories.java
index c80b70e..71eb086 100644
--- a/src/main/java/org/rometools/propono/atom/common/Categories.java
+++ b/src/main/java/org/rometools/propono/atom/common/Categories.java
@@ -22,7 +22,7 @@ import com.sun.syndication.io.impl.Atom10Parser;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 
 /** 
diff --git a/src/main/java/org/rometools/propono/atom/common/Collection.java b/src/main/java/org/rometools/propono/atom/common/Collection.java
index 1f9ef94..fc36e28 100644
--- a/src/main/java/org/rometools/propono/atom/common/Collection.java
+++ b/src/main/java/org/rometools/propono/atom/common/Collection.java
@@ -22,7 +22,7 @@ import org.rometools.propono.utils.ProponoException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 
 /**
diff --git a/src/main/java/org/rometools/propono/atom/common/Workspace.java b/src/main/java/org/rometools/propono/atom/common/Workspace.java
index 90d1830..62b573c 100644
--- a/src/main/java/org/rometools/propono/atom/common/Workspace.java
+++ b/src/main/java/org/rometools/propono/atom/common/Workspace.java
@@ -21,7 +21,7 @@ import org.rometools.propono.utils.ProponoException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 
 /**
diff --git a/src/main/java/org/rometools/propono/atom/common/rome/AppModuleGenerator.java b/src/main/java/org/rometools/propono/atom/common/rome/AppModuleGenerator.java
index 98613ea..39b4f8f 100644
--- a/src/main/java/org/rometools/propono/atom/common/rome/AppModuleGenerator.java
+++ b/src/main/java/org/rometools/propono/atom/common/rome/AppModuleGenerator.java
@@ -24,8 +24,8 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.io.ModuleGenerator;
diff --git a/src/main/java/org/rometools/propono/atom/common/rome/AppModuleParser.java b/src/main/java/org/rometools/propono/atom/common/rome/AppModuleParser.java
index b71f925..b8e2f79 100644
--- a/src/main/java/org/rometools/propono/atom/common/rome/AppModuleParser.java
+++ b/src/main/java/org/rometools/propono/atom/common/rome/AppModuleParser.java
@@ -20,8 +20,8 @@
 package org.rometools.propono.atom.common.rome;
 
 import com.sun.syndication.io.impl.DateParser;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.io.ModuleParser;
diff --git a/src/main/java/org/rometools/propono/atom/server/AtomServlet.java b/src/main/java/org/rometools/propono/atom/server/AtomServlet.java
index 51c4d2e..707a4f6 100644
--- a/src/main/java/org/rometools/propono/atom/server/AtomServlet.java
+++ b/src/main/java/org/rometools/propono/atom/server/AtomServlet.java
@@ -29,9 +29,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jdom.Document;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
 import com.sun.syndication.feed.atom.Entry;
 import com.sun.syndication.feed.atom.Feed;
 import com.sun.syndication.feed.atom.Link;
diff --git a/src/main/java/org/rometools/propono/atom/server/impl/FileBasedCollection.java b/src/main/java/org/rometools/propono/atom/server/impl/FileBasedCollection.java
index 9101e25..0152943 100644
--- a/src/main/java/org/rometools/propono/atom/server/impl/FileBasedCollection.java
+++ b/src/main/java/org/rometools/propono/atom/server/impl/FileBasedCollection.java
@@ -16,8 +16,8 @@
 package org.rometools.propono.atom.server.impl;
 
 import java.util.Iterator;
-import org.jdom.Document;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.output.XMLOutputter;
 
 
 import com.sun.syndication.feed.WireFeed;
diff --git a/src/main/java/org/rometools/propono/blogclient/atomprotocol/AtomConnection.java b/src/main/java/org/rometools/propono/blogclient/atomprotocol/AtomConnection.java
index 3545a67..37deabc 100644
--- a/src/main/java/org/rometools/propono/blogclient/atomprotocol/AtomConnection.java
+++ b/src/main/java/org/rometools/propono/blogclient/atomprotocol/AtomConnection.java
@@ -28,7 +28,7 @@ import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.jdom.Document;
+import org.jdom2.Document;
 
 import org.rometools.propono.blogclient.BlogConnection;
 import org.rometools.propono.blogclient.Blog;
diff --git a/src/main/java/org/rometools/propono/utils/Utilities.java b/src/main/java/org/rometools/propono/utils/Utilities.java
index 67bcf89..8e8daf9 100644
--- a/src/main/java/org/rometools/propono/utils/Utilities.java
+++ b/src/main/java/org/rometools/propono/utils/Utilities.java
@@ -27,10 +27,10 @@ import java.io.OutputStream;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 import java.util.regex.Pattern;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.Parent;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.Parent;
 
 /**
  * Utilities for file I/O and string manipulation.
diff --git a/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java b/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java
index 49afc72..62fd60d 100644
--- a/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java
+++ b/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java
@@ -23,9 +23,9 @@ import com.sun.syndication.feed.atom.Category;
 import java.io.FileInputStream;
 import java.util.Iterator;
 import junit.framework.*;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
 
 /**
  * Tests reading and writing of service document, no server needed.