From 7cd1761fbdaabf296050e88e9124be6096ef49a3 Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Thu, 3 Oct 2013 14:36:21 +0200 Subject: [PATCH] Updated to latest JDOM which supports generics --- pom.xml | 2 +- .../sun/syndication/io/ModuleGenerator.java | 2 +- .../com/sun/syndication/io/ModuleParser.java | 2 +- .../syndication/io/ParsingFeedException.java | 2 +- .../com/sun/syndication/io/SAXBuilder.java | 4 ++-- .../com/sun/syndication/io/SyndFeedInput.java | 2 +- .../sun/syndication/io/SyndFeedOutput.java | 2 +- .../sun/syndication/io/WireFeedGenerator.java | 2 +- .../com/sun/syndication/io/WireFeedInput.java | 20 +++++++++---------- .../sun/syndication/io/WireFeedOutput.java | 10 +++++----- .../sun/syndication/io/WireFeedParser.java | 2 +- .../syndication/io/impl/Atom03Generator.java | 10 +++++----- .../sun/syndication/io/impl/Atom03Parser.java | 10 +++++----- .../syndication/io/impl/Atom10Generator.java | 12 +++++------ .../sun/syndication/io/impl/Atom10Parser.java | 18 ++++++++--------- .../io/impl/BaseWireFeedGenerator.java | 6 +++--- .../io/impl/BaseWireFeedParser.java | 6 +++--- .../io/impl/DCModuleGenerator.java | 6 +++--- .../syndication/io/impl/DCModuleParser.java | 6 +++--- .../sun/syndication/io/impl/FeedParsers.java | 2 +- .../syndication/io/impl/ModuleGenerators.java | 2 +- .../syndication/io/impl/ModuleParsers.java | 4 ++-- .../syndication/io/impl/RSS090Generator.java | 6 +++--- .../sun/syndication/io/impl/RSS090Parser.java | 6 +++--- .../io/impl/RSS091NetscapeGenerator.java | 6 +++--- .../io/impl/RSS091NetscapeParser.java | 2 +- .../io/impl/RSS091UserlandGenerator.java | 8 ++++---- .../io/impl/RSS091UserlandParser.java | 8 ++++---- .../syndication/io/impl/RSS092Generator.java | 4 ++-- .../sun/syndication/io/impl/RSS092Parser.java | 2 +- .../syndication/io/impl/RSS093Generator.java | 2 +- .../sun/syndication/io/impl/RSS093Parser.java | 2 +- .../syndication/io/impl/RSS094Generator.java | 4 ++-- .../sun/syndication/io/impl/RSS094Parser.java | 2 +- .../syndication/io/impl/RSS10Generator.java | 4 ++-- .../sun/syndication/io/impl/RSS10Parser.java | 6 +++--- .../syndication/io/impl/RSS20Generator.java | 2 +- .../sun/syndication/io/impl/RSS20Parser.java | 6 +++--- .../syndication/io/impl/RSS20wNSParser.java | 6 +++--- .../io/impl/SyModuleGenerator.java | 4 ++-- .../syndication/io/impl/SyModuleParser.java | 4 ++-- .../sun/syndication/unittest/FeedTest.java | 4 ++-- .../unittest/TestXmlFixerReader.java | 2 +- .../unittest/issues/Issue1Test.java | 2 +- 44 files changed, 112 insertions(+), 112 deletions(-) diff --git a/pom.xml b/pom.xml index c63a7db..984dbf3 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ org.jdom jdom - 1.1.3 + 2.0.2 junit diff --git a/src/main/java/com/sun/syndication/io/ModuleGenerator.java b/src/main/java/com/sun/syndication/io/ModuleGenerator.java index 2390d1e..a268560 100644 --- a/src/main/java/com/sun/syndication/io/ModuleGenerator.java +++ b/src/main/java/com/sun/syndication/io/ModuleGenerator.java @@ -18,7 +18,7 @@ package com.sun.syndication.io; import com.sun.syndication.feed.module.Module; import com.sun.syndication.feed.WireFeed; -import org.jdom.Element; +import org.jdom2.Element; import java.util.Set; diff --git a/src/main/java/com/sun/syndication/io/ModuleParser.java b/src/main/java/com/sun/syndication/io/ModuleParser.java index c083000..0f52c59 100644 --- a/src/main/java/com/sun/syndication/io/ModuleParser.java +++ b/src/main/java/com/sun/syndication/io/ModuleParser.java @@ -17,7 +17,7 @@ package com.sun.syndication.io; import com.sun.syndication.feed.module.Module; -import org.jdom.Element; +import org.jdom2.Element; /** * Parses module metadata from a XML node (JDOM element). diff --git a/src/main/java/com/sun/syndication/io/ParsingFeedException.java b/src/main/java/com/sun/syndication/io/ParsingFeedException.java index 24e6d6c..f9caf08 100644 --- a/src/main/java/com/sun/syndication/io/ParsingFeedException.java +++ b/src/main/java/com/sun/syndication/io/ParsingFeedException.java @@ -16,7 +16,7 @@ */ package com.sun.syndication.io; -import org.jdom.input.JDOMParseException; +import org.jdom2.input.JDOMParseException; /** * Exception thrown by WireFeedInput instance if it can not parse a feed. diff --git a/src/main/java/com/sun/syndication/io/SAXBuilder.java b/src/main/java/com/sun/syndication/io/SAXBuilder.java index 974c0a7..5f1194c 100644 --- a/src/main/java/com/sun/syndication/io/SAXBuilder.java +++ b/src/main/java/com/sun/syndication/io/SAXBuilder.java @@ -1,6 +1,6 @@ package com.sun.syndication.io; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import org.xml.sax.XMLReader; /* @@ -14,7 +14,7 @@ import org.xml.sax.XMLReader; * Crimson is one parser which is known not to support these features. * */ -public class SAXBuilder extends org.jdom.input.SAXBuilder { +public class SAXBuilder extends org.jdom2.input.SAXBuilder { public SAXBuilder(boolean _validate) { super(_validate); diff --git a/src/main/java/com/sun/syndication/io/SyndFeedInput.java b/src/main/java/com/sun/syndication/io/SyndFeedInput.java index 2353bb9..27c324e 100644 --- a/src/main/java/com/sun/syndication/io/SyndFeedInput.java +++ b/src/main/java/com/sun/syndication/io/SyndFeedInput.java @@ -18,7 +18,7 @@ package com.sun.syndication.io; import com.sun.syndication.feed.synd.SyndFeed; import com.sun.syndication.feed.synd.SyndFeedImpl; -import org.jdom.Document; +import org.jdom2.Document; import org.xml.sax.InputSource; import java.io.File; diff --git a/src/main/java/com/sun/syndication/io/SyndFeedOutput.java b/src/main/java/com/sun/syndication/io/SyndFeedOutput.java index 9d3b107..27c48b8 100644 --- a/src/main/java/com/sun/syndication/io/SyndFeedOutput.java +++ b/src/main/java/com/sun/syndication/io/SyndFeedOutput.java @@ -17,7 +17,7 @@ package com.sun.syndication.io; import com.sun.syndication.feed.synd.SyndFeed; -import org.jdom.Document; +import org.jdom2.Document; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/sun/syndication/io/WireFeedGenerator.java b/src/main/java/com/sun/syndication/io/WireFeedGenerator.java index d1dabbb..960b486 100644 --- a/src/main/java/com/sun/syndication/io/WireFeedGenerator.java +++ b/src/main/java/com/sun/syndication/io/WireFeedGenerator.java @@ -18,7 +18,7 @@ package com.sun.syndication.io; import com.sun.syndication.feed.WireFeed; import com.sun.syndication.io.FeedException; -import org.jdom.Document; +import org.jdom2.Document; /** * Generates an XML document (JDOM) out of a feed for a specific real feed type. diff --git a/src/main/java/com/sun/syndication/io/WireFeedInput.java b/src/main/java/com/sun/syndication/io/WireFeedInput.java index 3d01c0b..58e6791 100644 --- a/src/main/java/com/sun/syndication/io/WireFeedInput.java +++ b/src/main/java/com/sun/syndication/io/WireFeedInput.java @@ -26,10 +26,10 @@ import java.util.List; import java.util.Map; import java.util.WeakHashMap; -import org.jdom.Document; -import org.jdom.JDOMException; -import org.jdom.input.DOMBuilder; -import org.jdom.input.JDOMParseException; +import org.jdom2.Document; +import org.jdom2.JDOMException; +import org.jdom2.input.DOMBuilder; +import org.jdom2.input.JDOMParseException; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXNotRecognizedException; @@ -153,7 +153,7 @@ public class WireFeedInput { /** * Builds an WireFeed (RSS or Atom) from a file. *

- * NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom.Document)'. + * NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom2.Document)'. *

* @param file file to read to create the WireFeed. * @return the WireFeed read from the file. @@ -177,7 +177,7 @@ public class WireFeedInput { /** * Builds an WireFeed (RSS or Atom) from an Reader. *

- * NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom.Document)'. + * NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom2.Document)'. *

* @param reader Reader to read to create the WireFeed. * @return the WireFeed read from the Reader. @@ -208,7 +208,7 @@ public class WireFeedInput { /** * Builds an WireFeed (RSS or Atom) from an W3C SAX InputSource. *

- * NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom.Document)'. + * NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom2.Document)'. *

* @param is W3C SAX InputSource to read to create the WireFeed. * @return the WireFeed read from the W3C SAX InputSource. @@ -236,7 +236,7 @@ public class WireFeedInput { /** * Builds an WireFeed (RSS or Atom) from an W3C DOM document. *

- * NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom.Document)'. + * NOTE: This method delages to the 'AsbtractFeed WireFeedInput#build(org.jdom2.Document)'. *

* @param document W3C DOM document to read to create the WireFeed. * @return the WireFeed read from the W3C DOM document. @@ -278,9 +278,9 @@ public class WireFeedInput { } /** - * Creates and sets up a org.jdom.input.SAXBuilder for parsing. + * Creates and sets up a org.jdom2.input.SAXBuilder for parsing. * - * @return a new org.jdom.input.SAXBuilder object + * @return a new org.jdom2.input.SAXBuilder object */ protected SAXBuilder createSAXBuilder() { SAXBuilder saxBuilder = new SAXBuilder(_validate); diff --git a/src/main/java/com/sun/syndication/io/WireFeedOutput.java b/src/main/java/com/sun/syndication/io/WireFeedOutput.java index e5872d9..736aa82 100644 --- a/src/main/java/com/sun/syndication/io/WireFeedOutput.java +++ b/src/main/java/com/sun/syndication/io/WireFeedOutput.java @@ -18,11 +18,11 @@ package com.sun.syndication.io; import com.sun.syndication.feed.WireFeed; import com.sun.syndication.io.impl.FeedGenerators; -import org.jdom.Document; -import org.jdom.JDOMException; -import org.jdom.output.DOMOutputter; -import org.jdom.output.Format; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.JDOMException; +import org.jdom2.output.DOMOutputter; +import org.jdom2.output.Format; +import org.jdom2.output.XMLOutputter; import java.io.IOException; import java.io.Writer; diff --git a/src/main/java/com/sun/syndication/io/WireFeedParser.java b/src/main/java/com/sun/syndication/io/WireFeedParser.java index e5e9af3..486ecff 100644 --- a/src/main/java/com/sun/syndication/io/WireFeedParser.java +++ b/src/main/java/com/sun/syndication/io/WireFeedParser.java @@ -18,7 +18,7 @@ package com.sun.syndication.io; import com.sun.syndication.feed.WireFeed; import com.sun.syndication.io.FeedException; -import org.jdom.Document; +import org.jdom2.Document; /** * Parses an XML document (JDOM) into a feed bean. diff --git a/src/main/java/com/sun/syndication/io/impl/Atom03Generator.java b/src/main/java/com/sun/syndication/io/impl/Atom03Generator.java index 744e334..2c6a4b0 100644 --- a/src/main/java/com/sun/syndication/io/impl/Atom03Generator.java +++ b/src/main/java/com/sun/syndication/io/impl/Atom03Generator.java @@ -19,11 +19,11 @@ package com.sun.syndication.io.impl; import com.sun.syndication.feed.WireFeed; import com.sun.syndication.feed.atom.*; import com.sun.syndication.io.FeedException; -import org.jdom.Attribute; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.Namespace; -import org.jdom.input.SAXBuilder; +import org.jdom2.Attribute; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.Namespace; +import org.jdom2.input.SAXBuilder; import java.io.StringReader; import java.util.List; diff --git a/src/main/java/com/sun/syndication/io/impl/Atom03Parser.java b/src/main/java/com/sun/syndication/io/impl/Atom03Parser.java index 6a3770d..a6aab55 100644 --- a/src/main/java/com/sun/syndication/io/impl/Atom03Parser.java +++ b/src/main/java/com/sun/syndication/io/impl/Atom03Parser.java @@ -19,10 +19,10 @@ package com.sun.syndication.io.impl; import com.sun.syndication.feed.WireFeed; import com.sun.syndication.feed.atom.*; import com.sun.syndication.io.FeedException; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.Namespace; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.Namespace; +import org.jdom2.output.XMLOutputter; import java.util.*; @@ -242,7 +242,7 @@ public class Atom03Parser extends BaseWireFeedParser { List eContent = e.getContent(); Iterator i = eContent.iterator(); while (i.hasNext()) { - org.jdom.Content c = (org.jdom.Content) i.next(); + org.jdom2.Content c = (org.jdom2.Content) i.next(); if (c instanceof Element) { Element eC = (Element) c; if (eC.getNamespace().equals(getAtomNamespace())) { diff --git a/src/main/java/com/sun/syndication/io/impl/Atom10Generator.java b/src/main/java/com/sun/syndication/io/impl/Atom10Generator.java index f074f67..6228b21 100644 --- a/src/main/java/com/sun/syndication/io/impl/Atom10Generator.java +++ b/src/main/java/com/sun/syndication/io/impl/Atom10Generator.java @@ -20,11 +20,11 @@ import java.io.StringReader; import java.util.Iterator; import java.util.List; -import org.jdom.Attribute; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.Namespace; -import org.jdom.input.SAXBuilder; +import org.jdom2.Attribute; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.Namespace; +import org.jdom2.input.SAXBuilder; import com.sun.syndication.feed.WireFeed; import com.sun.syndication.feed.atom.Category; @@ -39,7 +39,7 @@ import com.sun.syndication.io.WireFeedOutput; import java.io.IOException; import java.io.Writer; import java.util.ArrayList; -import org.jdom.output.XMLOutputter; +import org.jdom2.output.XMLOutputter; /** * Feed Generator for Atom diff --git a/src/main/java/com/sun/syndication/io/impl/Atom10Parser.java b/src/main/java/com/sun/syndication/io/impl/Atom10Parser.java index 1468c0e..ccfc237 100644 --- a/src/main/java/com/sun/syndication/io/impl/Atom10Parser.java +++ b/src/main/java/com/sun/syndication/io/impl/Atom10Parser.java @@ -20,10 +20,10 @@ 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.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.Namespace; +import org.jdom2.output.XMLOutputter; import com.sun.syndication.feed.WireFeed; import com.sun.syndication.feed.atom.Category; @@ -40,10 +40,10 @@ import java.io.IOException; import java.io.Reader; import java.net.MalformedURLException; import java.util.regex.Pattern; -import org.jdom.Attribute; -import org.jdom.JDOMException; -import org.jdom.Parent; -import org.jdom.input.SAXBuilder; +import org.jdom2.Attribute; +import org.jdom2.JDOMException; +import org.jdom2.Parent; +import org.jdom2.input.SAXBuilder; /** * Parser for Atom 1.0 @@ -323,7 +323,7 @@ public class Atom10Parser extends BaseWireFeedParser { List eContent = e.getContent(); Iterator i = eContent.iterator(); while (i.hasNext()) { - org.jdom.Content c = (org.jdom.Content) i.next(); + org.jdom2.Content c = (org.jdom2.Content) i.next(); if (c instanceof Element) { Element eC = (Element) c; if (eC.getNamespace().equals(getAtomNamespace())) { diff --git a/src/main/java/com/sun/syndication/io/impl/BaseWireFeedGenerator.java b/src/main/java/com/sun/syndication/io/impl/BaseWireFeedGenerator.java index ae2b96d..72a2b70 100644 --- a/src/main/java/com/sun/syndication/io/impl/BaseWireFeedGenerator.java +++ b/src/main/java/com/sun/syndication/io/impl/BaseWireFeedGenerator.java @@ -1,9 +1,9 @@ package com.sun.syndication.io.impl; import com.sun.syndication.io.WireFeedGenerator; -import org.jdom.Element; -import org.jdom.Namespace; -import org.jdom.Parent; +import org.jdom2.Element; +import org.jdom2.Namespace; +import org.jdom2.Parent; import java.util.HashSet; import java.util.Iterator; diff --git a/src/main/java/com/sun/syndication/io/impl/BaseWireFeedParser.java b/src/main/java/com/sun/syndication/io/impl/BaseWireFeedParser.java index b9f9d86..ba48cef 100644 --- a/src/main/java/com/sun/syndication/io/impl/BaseWireFeedParser.java +++ b/src/main/java/com/sun/syndication/io/impl/BaseWireFeedParser.java @@ -5,11 +5,11 @@ import com.sun.syndication.feed.module.Extendable; import com.sun.syndication.io.WireFeedParser; import java.util.ArrayList; import java.util.Iterator; -import org.jdom.Element; +import org.jdom2.Element; import java.util.List; -import org.jdom.Namespace; -import org.jdom.Attribute; +import org.jdom2.Namespace; +import org.jdom2.Attribute; /** * @author Alejandro Abdelnur diff --git a/src/main/java/com/sun/syndication/io/impl/DCModuleGenerator.java b/src/main/java/com/sun/syndication/io/impl/DCModuleGenerator.java index 2ff8901..a7cdee3 100644 --- a/src/main/java/com/sun/syndication/io/impl/DCModuleGenerator.java +++ b/src/main/java/com/sun/syndication/io/impl/DCModuleGenerator.java @@ -20,9 +20,9 @@ import com.sun.syndication.feed.module.Module; import com.sun.syndication.feed.module.DCModule; import com.sun.syndication.feed.module.DCSubject; import com.sun.syndication.io.ModuleGenerator; -import org.jdom.Attribute; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Attribute; +import org.jdom2.Element; +import org.jdom2.Namespace; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/com/sun/syndication/io/impl/DCModuleParser.java b/src/main/java/com/sun/syndication/io/impl/DCModuleParser.java index 54f16af..10173d5 100644 --- a/src/main/java/com/sun/syndication/io/impl/DCModuleParser.java +++ b/src/main/java/com/sun/syndication/io/impl/DCModuleParser.java @@ -23,9 +23,9 @@ import com.sun.syndication.feed.module.DCModule; import com.sun.syndication.feed.module.DCSubject; import com.sun.syndication.io.ModuleParser; import com.sun.syndication.io.WireFeedParser; -import org.jdom.Attribute; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Attribute; +import org.jdom2.Element; +import org.jdom2.Namespace; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/com/sun/syndication/io/impl/FeedParsers.java b/src/main/java/com/sun/syndication/io/impl/FeedParsers.java index 86351c2..2aaa1fe 100644 --- a/src/main/java/com/sun/syndication/io/impl/FeedParsers.java +++ b/src/main/java/com/sun/syndication/io/impl/FeedParsers.java @@ -17,7 +17,7 @@ package com.sun.syndication.io.impl; import com.sun.syndication.io.WireFeedParser; -import org.jdom.Document; +import org.jdom2.Document; import java.util.List; /** diff --git a/src/main/java/com/sun/syndication/io/impl/ModuleGenerators.java b/src/main/java/com/sun/syndication/io/impl/ModuleGenerators.java index 695223e..9c493f9 100644 --- a/src/main/java/com/sun/syndication/io/impl/ModuleGenerators.java +++ b/src/main/java/com/sun/syndication/io/impl/ModuleGenerators.java @@ -18,7 +18,7 @@ package com.sun.syndication.io.impl; import com.sun.syndication.feed.module.Module; import com.sun.syndication.io.ModuleGenerator; -import org.jdom.Element; +import org.jdom2.Element; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/com/sun/syndication/io/impl/ModuleParsers.java b/src/main/java/com/sun/syndication/io/impl/ModuleParsers.java index 7534720..ac895fb 100644 --- a/src/main/java/com/sun/syndication/io/impl/ModuleParsers.java +++ b/src/main/java/com/sun/syndication/io/impl/ModuleParsers.java @@ -19,8 +19,8 @@ package com.sun.syndication.io.impl; import com.sun.syndication.feed.module.Module; import com.sun.syndication.io.ModuleParser; import com.sun.syndication.io.WireFeedParser; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Element; +import org.jdom2.Namespace; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/sun/syndication/io/impl/RSS090Generator.java b/src/main/java/com/sun/syndication/io/impl/RSS090Generator.java index f2724b8..81c014c 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS090Generator.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS090Generator.java @@ -19,9 +19,9 @@ package com.sun.syndication.io.impl; import com.sun.syndication.feed.WireFeed; import com.sun.syndication.feed.rss.*; import com.sun.syndication.io.FeedException; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.Namespace; import java.util.List; diff --git a/src/main/java/com/sun/syndication/io/impl/RSS090Parser.java b/src/main/java/com/sun/syndication/io/impl/RSS090Parser.java index 7b636a1..94a85f1 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS090Parser.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS090Parser.java @@ -22,9 +22,9 @@ import com.sun.syndication.feed.rss.Image; import com.sun.syndication.feed.rss.Item; import com.sun.syndication.feed.rss.TextInput; import com.sun.syndication.io.FeedException; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.Namespace; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/com/sun/syndication/io/impl/RSS091NetscapeGenerator.java b/src/main/java/com/sun/syndication/io/impl/RSS091NetscapeGenerator.java index 37950f3..e86cd2c 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS091NetscapeGenerator.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS091NetscapeGenerator.java @@ -16,9 +16,9 @@ */ package com.sun.syndication.io.impl; -import org.jdom.DocType; -import org.jdom.Document; -import org.jdom.Element; +import org.jdom2.DocType; +import org.jdom2.Document; +import org.jdom2.Element; /** * Feed Generator for RSS 0.91 diff --git a/src/main/java/com/sun/syndication/io/impl/RSS091NetscapeParser.java b/src/main/java/com/sun/syndication/io/impl/RSS091NetscapeParser.java index aaf979b..5de4b7f 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS091NetscapeParser.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS091NetscapeParser.java @@ -16,7 +16,7 @@ */ package com.sun.syndication.io.impl; -import org.jdom.*; +import org.jdom2.*; /** */ diff --git a/src/main/java/com/sun/syndication/io/impl/RSS091UserlandGenerator.java b/src/main/java/com/sun/syndication/io/impl/RSS091UserlandGenerator.java index ad7c3b1..d83cb05 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS091UserlandGenerator.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS091UserlandGenerator.java @@ -22,10 +22,10 @@ import com.sun.syndication.feed.rss.Image; import com.sun.syndication.feed.rss.Item; import com.sun.syndication.io.FeedException; -import org.jdom.Attribute; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Attribute; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.Namespace; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/sun/syndication/io/impl/RSS091UserlandParser.java b/src/main/java/com/sun/syndication/io/impl/RSS091UserlandParser.java index ab07bdb..86a0157 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS091UserlandParser.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS091UserlandParser.java @@ -22,10 +22,10 @@ import com.sun.syndication.feed.rss.Content; import com.sun.syndication.feed.rss.Description; import com.sun.syndication.feed.rss.Image; import com.sun.syndication.feed.rss.Item; -import org.jdom.Attribute; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Attribute; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.Namespace; import java.util.*; diff --git a/src/main/java/com/sun/syndication/io/impl/RSS092Generator.java b/src/main/java/com/sun/syndication/io/impl/RSS092Generator.java index e665c88..12a03d5 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS092Generator.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS092Generator.java @@ -18,8 +18,8 @@ package com.sun.syndication.io.impl; import com.sun.syndication.feed.rss.*; import com.sun.syndication.io.FeedException; -import org.jdom.Attribute; -import org.jdom.Element; +import org.jdom2.Attribute; +import org.jdom2.Element; import java.util.List; diff --git a/src/main/java/com/sun/syndication/io/impl/RSS092Parser.java b/src/main/java/com/sun/syndication/io/impl/RSS092Parser.java index ea930cd..9eacee7 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS092Parser.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS092Parser.java @@ -24,7 +24,7 @@ import com.sun.syndication.feed.rss.Description; import com.sun.syndication.feed.rss.Enclosure; import com.sun.syndication.feed.rss.Item; import com.sun.syndication.feed.rss.Source; -import org.jdom.Element; +import org.jdom2.Element; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/sun/syndication/io/impl/RSS093Generator.java b/src/main/java/com/sun/syndication/io/impl/RSS093Generator.java index 3025c46..d0c5bee 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS093Generator.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS093Generator.java @@ -17,7 +17,7 @@ package com.sun.syndication.io.impl; import com.sun.syndication.feed.rss.Item; -import org.jdom.Element; +import org.jdom2.Element; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/sun/syndication/io/impl/RSS093Parser.java b/src/main/java/com/sun/syndication/io/impl/RSS093Parser.java index 61f6202..f5aaaee 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS093Parser.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS093Parser.java @@ -17,7 +17,7 @@ package com.sun.syndication.io.impl; import com.sun.syndication.feed.rss.Item; -import org.jdom.Element; +import org.jdom2.Element; /** */ diff --git a/src/main/java/com/sun/syndication/io/impl/RSS094Generator.java b/src/main/java/com/sun/syndication/io/impl/RSS094Generator.java index a0b3b1b..5009beb 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS094Generator.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS094Generator.java @@ -18,8 +18,8 @@ package com.sun.syndication.io.impl; import com.sun.syndication.feed.rss.Description; import com.sun.syndication.feed.rss.Item; -import org.jdom.Attribute; -import org.jdom.Element; +import org.jdom2.Attribute; +import org.jdom2.Element; /** * Feed Generator for RSS 0.94 diff --git a/src/main/java/com/sun/syndication/io/impl/RSS094Parser.java b/src/main/java/com/sun/syndication/io/impl/RSS094Parser.java index d2f84a6..61c5c86 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS094Parser.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS094Parser.java @@ -21,7 +21,7 @@ import com.sun.syndication.feed.rss.Channel; import com.sun.syndication.feed.rss.Description; import com.sun.syndication.feed.rss.Guid; import com.sun.syndication.feed.rss.Item; -import org.jdom.Element; +import org.jdom2.Element; import java.util.List; diff --git a/src/main/java/com/sun/syndication/io/impl/RSS10Generator.java b/src/main/java/com/sun/syndication/io/impl/RSS10Generator.java index 5be2728..9ffdc7d 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS10Generator.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS10Generator.java @@ -20,8 +20,8 @@ import com.sun.syndication.feed.rss.Description; import com.sun.syndication.feed.rss.Item; import com.sun.syndication.feed.rss.Channel; import com.sun.syndication.io.FeedException; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Element; +import org.jdom2.Namespace; import java.util.List; diff --git a/src/main/java/com/sun/syndication/io/impl/RSS10Parser.java b/src/main/java/com/sun/syndication/io/impl/RSS10Parser.java index 22965d2..0547211 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS10Parser.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS10Parser.java @@ -21,9 +21,9 @@ import com.sun.syndication.feed.rss.Channel; import com.sun.syndication.feed.rss.Content; import com.sun.syndication.feed.rss.Description; import com.sun.syndication.feed.rss.Item; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.Namespace; import java.util.List; diff --git a/src/main/java/com/sun/syndication/io/impl/RSS20Generator.java b/src/main/java/com/sun/syndication/io/impl/RSS20Generator.java index 4df28dc..14e23ab 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS20Generator.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS20Generator.java @@ -20,7 +20,7 @@ import com.sun.syndication.feed.rss.Category; import com.sun.syndication.feed.rss.Channel; import com.sun.syndication.feed.rss.Guid; import com.sun.syndication.feed.rss.Item; -import org.jdom.Element; +import org.jdom2.Element; import java.util.List; diff --git a/src/main/java/com/sun/syndication/io/impl/RSS20Parser.java b/src/main/java/com/sun/syndication/io/impl/RSS20Parser.java index d909fa1..e3e6e66 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS20Parser.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS20Parser.java @@ -17,9 +17,9 @@ package com.sun.syndication.io.impl; import com.sun.syndication.feed.rss.Description; -import org.jdom.Attribute; -import org.jdom.Document; -import org.jdom.Element; +import org.jdom2.Attribute; +import org.jdom2.Document; +import org.jdom2.Element; /** */ diff --git a/src/main/java/com/sun/syndication/io/impl/RSS20wNSParser.java b/src/main/java/com/sun/syndication/io/impl/RSS20wNSParser.java index 0292458..d981f0f 100644 --- a/src/main/java/com/sun/syndication/io/impl/RSS20wNSParser.java +++ b/src/main/java/com/sun/syndication/io/impl/RSS20wNSParser.java @@ -16,9 +16,9 @@ */ package com.sun.syndication.io.impl; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.Namespace; import com.sun.syndication.feed.WireFeed; diff --git a/src/main/java/com/sun/syndication/io/impl/SyModuleGenerator.java b/src/main/java/com/sun/syndication/io/impl/SyModuleGenerator.java index 7e717c6..e432e1a 100644 --- a/src/main/java/com/sun/syndication/io/impl/SyModuleGenerator.java +++ b/src/main/java/com/sun/syndication/io/impl/SyModuleGenerator.java @@ -19,8 +19,8 @@ package com.sun.syndication.io.impl; import com.sun.syndication.feed.module.Module; import com.sun.syndication.feed.module.SyModule; import com.sun.syndication.io.ModuleGenerator; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Element; +import org.jdom2.Namespace; import java.util.Set; import java.util.HashSet; diff --git a/src/main/java/com/sun/syndication/io/impl/SyModuleParser.java b/src/main/java/com/sun/syndication/io/impl/SyModuleParser.java index 3ec6adf..ac1961a 100644 --- a/src/main/java/com/sun/syndication/io/impl/SyModuleParser.java +++ b/src/main/java/com/sun/syndication/io/impl/SyModuleParser.java @@ -20,8 +20,8 @@ import com.sun.syndication.feed.module.Module; import com.sun.syndication.feed.module.SyModule; import com.sun.syndication.feed.module.SyModuleImpl; import com.sun.syndication.io.ModuleParser; -import org.jdom.Element; -import org.jdom.Namespace; +import org.jdom2.Element; +import org.jdom2.Namespace; /** */ diff --git a/src/test/java/com/sun/syndication/unittest/FeedTest.java b/src/test/java/com/sun/syndication/unittest/FeedTest.java index 2ce8b1b..8a4104e 100644 --- a/src/test/java/com/sun/syndication/unittest/FeedTest.java +++ b/src/test/java/com/sun/syndication/unittest/FeedTest.java @@ -11,8 +11,8 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.InputStream; -import org.jdom.Document; -import org.jdom.input.SAXBuilder; +import org.jdom2.Document; +import org.jdom2.input.SAXBuilder; /** * @author pat, tucu diff --git a/src/test/java/com/sun/syndication/unittest/TestXmlFixerReader.java b/src/test/java/com/sun/syndication/unittest/TestXmlFixerReader.java index a0b7ef7..443b520 100644 --- a/src/test/java/com/sun/syndication/unittest/TestXmlFixerReader.java +++ b/src/test/java/com/sun/syndication/unittest/TestXmlFixerReader.java @@ -19,7 +19,7 @@ package com.sun.syndication.unittest; import com.sun.syndication.io.XmlReader; import com.sun.syndication.io.impl.XmlFixerReader; import junit.framework.TestCase; -import org.jdom.input.SAXBuilder; +import org.jdom2.input.SAXBuilder; import java.io.*; diff --git a/src/test/java/com/sun/syndication/unittest/issues/Issue1Test.java b/src/test/java/com/sun/syndication/unittest/issues/Issue1Test.java index 0b65420..4868ee2 100644 --- a/src/test/java/com/sun/syndication/unittest/issues/Issue1Test.java +++ b/src/test/java/com/sun/syndication/unittest/issues/Issue1Test.java @@ -20,7 +20,7 @@ import com.sun.syndication.io.impl.XmlFixerReader; import com.sun.syndication.io.XmlReader; import com.sun.syndication.unittest.SyndFeedTest; -import org.jdom.input.SAXBuilder; +import org.jdom2.input.SAXBuilder; import java.io.BufferedReader; import java.io.ByteArrayInputStream;