Moving to ROME 2.0.0 snapshot and JDOM2

This commit is contained in:
Dave Johnson 2013-10-05 12:49:59 -04:00
parent b64d15257e
commit 7555644b3f
19 changed files with 38 additions and 37 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/target/

View file

@ -4,7 +4,7 @@
<groupId>org.rometools</groupId> <groupId>org.rometools</groupId>
<artifactId>rome-propono</artifactId> <artifactId>rome-propono</artifactId>
<name>rome-propono</name> <name>rome-propono</name>
<version>1.1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>The ROME Propono subproject is a Java class library that <description>The ROME Propono subproject is a Java class library that
supports publishing protocols, specifically the Atom Publishing Protocol supports publishing protocols, specifically the Atom Publishing Protocol
@ -160,7 +160,7 @@
<dependency> <dependency>
<groupId>org.rometools</groupId> <groupId>org.rometools</groupId>
<artifactId>rome</artifactId> <artifactId>rome</artifactId>
<version>1.1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

View file

@ -28,9 +28,9 @@ import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.jdom.Document; import org.jdom2.Document;
import org.jdom.Element; import org.jdom2.Element;
import org.jdom.input.SAXBuilder; import org.jdom2.input.SAXBuilder;
/** /**

View file

@ -23,10 +23,10 @@ import org.rometools.propono.utils.ProponoException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.GetMethod;
import org.jdom.Document; import org.jdom2.Document;
import org.jdom.Element; import org.jdom2.Element;
import org.jdom.JDOMException; import org.jdom2.JDOMException;
import org.jdom.input.SAXBuilder; import org.jdom2.input.SAXBuilder;
/** /**

View file

@ -33,7 +33,7 @@ import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethodBase; import org.apache.commons.httpclient.HttpMethodBase;
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.commons.httpclient.methods.GetMethod; 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, * Models an Atom collection, extends Collection and adds methods for adding,

View file

@ -41,7 +41,7 @@ import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; 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 * Client implementation of Atom media-link entry, an Atom entry that provides

View file

@ -21,7 +21,7 @@ import org.rometools.propono.atom.common.Workspace;
import org.rometools.propono.utils.ProponoException; import org.rometools.propono.utils.ProponoException;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.jdom.Element; import org.jdom2.Element;
/** /**

View file

@ -26,8 +26,8 @@ import java.util.NoSuchElementException;
import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.jdom.Document; import org.jdom2.Document;
import org.jdom.input.SAXBuilder; import org.jdom2.input.SAXBuilder;
/** /**

View file

@ -23,9 +23,9 @@ import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.jdom.Document; import org.jdom2.Document;
import org.jdom.Element; import org.jdom2.Element;
import org.jdom.Namespace; import org.jdom2.Namespace;
/** /**
* Models an Atom Publishing Protocol Service Document. * Models an Atom Publishing Protocol Service Document.

View file

@ -22,7 +22,7 @@ import com.sun.syndication.io.impl.Atom10Parser;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.jdom.Element; import org.jdom2.Element;
/** /**

View file

@ -22,7 +22,7 @@ import org.rometools.propono.utils.ProponoException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.jdom.Element; import org.jdom2.Element;
/** /**

View file

@ -21,7 +21,7 @@ import org.rometools.propono.utils.ProponoException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.jdom.Element; import org.jdom2.Element;
/** /**

View file

@ -24,8 +24,8 @@ import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.jdom.Element; import org.jdom2.Element;
import org.jdom.Namespace; import org.jdom2.Namespace;
import com.sun.syndication.feed.module.Module; import com.sun.syndication.feed.module.Module;
import com.sun.syndication.io.ModuleGenerator; import com.sun.syndication.io.ModuleGenerator;

View file

@ -20,8 +20,8 @@
package org.rometools.propono.atom.common.rome; package org.rometools.propono.atom.common.rome;
import com.sun.syndication.io.impl.DateParser; import com.sun.syndication.io.impl.DateParser;
import org.jdom.Element; import org.jdom2.Element;
import org.jdom.Namespace; import org.jdom2.Namespace;
import com.sun.syndication.feed.module.Module; import com.sun.syndication.feed.module.Module;
import com.sun.syndication.io.ModuleParser; import com.sun.syndication.io.ModuleParser;

View file

@ -29,9 +29,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.jdom.Document; import org.jdom2.Document;
import org.jdom.output.Format; import org.jdom2.output.Format;
import org.jdom.output.XMLOutputter; import org.jdom2.output.XMLOutputter;
import com.sun.syndication.feed.atom.Entry; import com.sun.syndication.feed.atom.Entry;
import com.sun.syndication.feed.atom.Feed; import com.sun.syndication.feed.atom.Feed;
import com.sun.syndication.feed.atom.Link; import com.sun.syndication.feed.atom.Link;

View file

@ -16,8 +16,8 @@
package org.rometools.propono.atom.server.impl; package org.rometools.propono.atom.server.impl;
import java.util.Iterator; import java.util.Iterator;
import org.jdom.Document; import org.jdom2.Document;
import org.jdom.output.XMLOutputter; import org.jdom2.output.XMLOutputter;
import com.sun.syndication.feed.WireFeed; import com.sun.syndication.feed.WireFeed;

View file

@ -28,7 +28,7 @@ import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; 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.BlogConnection;
import org.rometools.propono.blogclient.Blog; import org.rometools.propono.blogclient.Blog;

View file

@ -27,10 +27,10 @@ import java.io.OutputStream;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.jdom.Document; import org.jdom2.Document;
import org.jdom.Element; import org.jdom2.Element;
import org.jdom.Namespace; import org.jdom2.Namespace;
import org.jdom.Parent; import org.jdom2.Parent;
/** /**
* Utilities for file I/O and string manipulation. * Utilities for file I/O and string manipulation.

View file

@ -23,9 +23,9 @@ import com.sun.syndication.feed.atom.Category;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.util.Iterator; import java.util.Iterator;
import junit.framework.*; import junit.framework.*;
import org.jdom.Document; import org.jdom2.Document;
import org.jdom.Element; import org.jdom2.Element;
import org.jdom.input.SAXBuilder; import org.jdom2.input.SAXBuilder;
/** /**
* Tests reading and writing of service document, no server needed. * Tests reading and writing of service document, no server needed.