Renamed and harmonized packages
This commit is contained in:
parent
c83d2b9ec1
commit
c70578ff7c
24 changed files with 102 additions and 96 deletions
|
@ -15,12 +15,12 @@
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.feed.opml;
|
package com.rometools.opml.feed.opml;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
import com.sun.syndication.feed.impl.EqualsBean;
|
import com.rometools.rome.feed.impl.EqualsBean;
|
||||||
import com.sun.syndication.feed.impl.ToStringBean;
|
import com.rometools.rome.feed.impl.ToStringBean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is a simple name-value pair attribute for outlines.
|
* This is a simple name-value pair attribute for outlines.
|
|
@ -15,13 +15,13 @@
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.feed.opml;
|
package com.rometools.opml.feed.opml;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.rometools.rome.feed.WireFeed;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class represents the root of an OPML 1/2 feed and contains the elements that may appear in
|
* This class represents the root of an OPML 1/2 feed and contains the elements that may appear in
|
|
@ -15,7 +15,7 @@
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.feed.opml;
|
package com.rometools.opml.feed.opml;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
@ -24,9 +24,9 @@ import java.util.Collections;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.sun.syndication.feed.impl.EqualsBean;
|
import com.rometools.rome.feed.impl.EqualsBean;
|
||||||
import com.sun.syndication.feed.impl.ToStringBean;
|
import com.rometools.rome.feed.impl.ToStringBean;
|
||||||
import com.sun.syndication.feed.module.Module;
|
import com.rometools.rome.feed.module.Module;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class represents an OPML outline element.
|
* This class represents an OPML outline element.
|
|
@ -15,7 +15,7 @@
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.feed.synd.impl;
|
package com.rometools.opml.feed.synd.impl;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
@ -26,22 +26,22 @@ import java.util.Stack;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.rometools.opml.feed.opml.Attribute;
|
||||||
import com.sun.syndication.feed.opml.Attribute;
|
import com.rometools.opml.feed.opml.Opml;
|
||||||
import com.sun.syndication.feed.opml.Opml;
|
import com.rometools.opml.feed.opml.Outline;
|
||||||
import com.sun.syndication.feed.opml.Outline;
|
import com.rometools.rome.feed.WireFeed;
|
||||||
import com.sun.syndication.feed.synd.Converter;
|
import com.rometools.rome.feed.synd.Converter;
|
||||||
import com.sun.syndication.feed.synd.SyndCategory;
|
import com.rometools.rome.feed.synd.SyndCategory;
|
||||||
import com.sun.syndication.feed.synd.SyndCategoryImpl;
|
import com.rometools.rome.feed.synd.SyndCategoryImpl;
|
||||||
import com.sun.syndication.feed.synd.SyndContent;
|
import com.rometools.rome.feed.synd.SyndContent;
|
||||||
import com.sun.syndication.feed.synd.SyndContentImpl;
|
import com.rometools.rome.feed.synd.SyndContentImpl;
|
||||||
import com.sun.syndication.feed.synd.SyndEntry;
|
import com.rometools.rome.feed.synd.SyndEntry;
|
||||||
import com.sun.syndication.feed.synd.SyndEntryImpl;
|
import com.rometools.rome.feed.synd.SyndEntryImpl;
|
||||||
import com.sun.syndication.feed.synd.SyndFeed;
|
import com.rometools.rome.feed.synd.SyndFeed;
|
||||||
import com.sun.syndication.feed.synd.SyndLink;
|
import com.rometools.rome.feed.synd.SyndLink;
|
||||||
import com.sun.syndication.feed.synd.SyndLinkImpl;
|
import com.rometools.rome.feed.synd.SyndLinkImpl;
|
||||||
import com.sun.syndication.feed.synd.SyndPerson;
|
import com.rometools.rome.feed.synd.SyndPerson;
|
||||||
import com.sun.syndication.feed.synd.SyndPersonImpl;
|
import com.rometools.rome.feed.synd.SyndPersonImpl;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
|
@ -6,10 +6,10 @@
|
||||||
* To change this template, choose Tools | Template Manager
|
* To change this template, choose Tools | Template Manager
|
||||||
* and open the template in the editor.
|
* and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.feed.synd.impl;
|
package com.rometools.opml.feed.synd.impl;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.rometools.rome.feed.WireFeed;
|
||||||
import com.sun.syndication.feed.synd.SyndFeed;
|
import com.rometools.rome.feed.synd.SyndFeed;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
|
@ -7,10 +7,10 @@
|
||||||
* and open the template in the editor.
|
* and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.sun.syndication.feed.synd.impl;
|
package com.rometools.opml.feed.synd.impl;
|
||||||
|
|
||||||
import com.sun.syndication.feed.synd.SyndCategory;
|
import com.rometools.rome.feed.synd.SyndCategory;
|
||||||
import com.sun.syndication.feed.synd.SyndCategoryImpl;
|
import com.rometools.rome.feed.synd.SyndCategoryImpl;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
|
@ -15,7 +15,7 @@
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.io.impl;
|
package com.rometools.opml.io.impl;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
@ -25,12 +25,14 @@ import java.util.Locale;
|
||||||
import org.jdom2.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom2.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.rometools.opml.feed.opml.Attribute;
|
||||||
import com.sun.syndication.feed.opml.Attribute;
|
import com.rometools.opml.feed.opml.Opml;
|
||||||
import com.sun.syndication.feed.opml.Opml;
|
import com.rometools.opml.feed.opml.Outline;
|
||||||
import com.sun.syndication.feed.opml.Outline;
|
import com.rometools.rome.feed.WireFeed;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.rometools.rome.io.FeedException;
|
||||||
import com.sun.syndication.io.WireFeedGenerator;
|
import com.rometools.rome.io.WireFeedGenerator;
|
||||||
|
import com.rometools.rome.io.impl.BaseWireFeedGenerator;
|
||||||
|
import com.rometools.rome.io.impl.DateParser;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
|
@ -15,7 +15,7 @@
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.io.impl;
|
package com.rometools.opml.io.impl;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -27,12 +27,14 @@ import org.jdom2.Element;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.rometools.opml.feed.opml.Attribute;
|
||||||
import com.sun.syndication.feed.opml.Attribute;
|
import com.rometools.opml.feed.opml.Opml;
|
||||||
import com.sun.syndication.feed.opml.Opml;
|
import com.rometools.opml.feed.opml.Outline;
|
||||||
import com.sun.syndication.feed.opml.Outline;
|
import com.rometools.rome.feed.WireFeed;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.rometools.rome.io.FeedException;
|
||||||
import com.sun.syndication.io.WireFeedParser;
|
import com.rometools.rome.io.WireFeedParser;
|
||||||
|
import com.rometools.rome.io.impl.BaseWireFeedParser;
|
||||||
|
import com.rometools.rome.io.impl.DateParser;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
|
@ -6,17 +6,18 @@
|
||||||
* To change this template, choose Tools | Template Manager
|
* To change this template, choose Tools | Template Manager
|
||||||
* and open the template in the editor.
|
* and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.io.impl;
|
package com.rometools.opml.io.impl;
|
||||||
|
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
import org.jdom2.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom2.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.rometools.opml.feed.opml.Opml;
|
||||||
import com.sun.syndication.feed.opml.Opml;
|
import com.rometools.opml.feed.opml.Outline;
|
||||||
import com.sun.syndication.feed.opml.Outline;
|
import com.rometools.rome.feed.WireFeed;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.rometools.rome.io.FeedException;
|
||||||
|
import com.rometools.rome.io.impl.DateParser;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
|
@ -15,7 +15,7 @@
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication.io.impl;
|
package com.rometools.opml.io.impl;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
@ -23,11 +23,12 @@ import java.util.Locale;
|
||||||
import org.jdom2.Document;
|
import org.jdom2.Document;
|
||||||
import org.jdom2.Element;
|
import org.jdom2.Element;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.rometools.opml.feed.opml.Attribute;
|
||||||
import com.sun.syndication.feed.opml.Attribute;
|
import com.rometools.opml.feed.opml.Opml;
|
||||||
import com.sun.syndication.feed.opml.Opml;
|
import com.rometools.opml.feed.opml.Outline;
|
||||||
import com.sun.syndication.feed.opml.Outline;
|
import com.rometools.rome.feed.WireFeed;
|
||||||
import com.sun.syndication.io.FeedException;
|
import com.rometools.rome.io.FeedException;
|
||||||
|
import com.rometools.rome.io.impl.DateParser;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
|
@ -12,11 +12,11 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
WireFeedGenerator.classes=com.sun.syndication.io.impl.OPML10Generator \
|
WireFeedGenerator.classes=com.rometools.rome.io.impl.OPML10Generator \
|
||||||
com.sun.syndication.io.impl.OPML20Generator
|
com.rometools.rome.io.impl.OPML20Generator
|
||||||
|
|
||||||
WireFeedParser.classes=com.sun.syndication.io.impl.OPML10Parser \
|
WireFeedParser.classes=com.rometools.rome.io.impl.OPML10Parser \
|
||||||
com.sun.syndication.io.impl.OPML20Parser
|
com.rometools.rome.io.impl.OPML20Parser
|
||||||
|
|
||||||
Converter.classes=com.sun.syndication.feed.synd.impl.ConverterForOPML10 \
|
Converter.classes=com.rometools.rome.feed.synd.impl.ConverterForOPML10 \
|
||||||
com.sun.syndication.feed.synd.impl.ConverterForOPML20
|
com.rometools.rome.feed.synd.impl.ConverterForOPML20
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.sun.syndication;
|
package com.rometools.opml;
|
||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
|
@ -6,9 +6,9 @@ import java.io.File;
|
||||||
import java.io.ObjectInputStream;
|
import java.io.ObjectInputStream;
|
||||||
import java.io.ObjectOutputStream;
|
import java.io.ObjectOutputStream;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.rometools.rome.feed.WireFeed;
|
||||||
import com.sun.syndication.feed.synd.SyndFeed;
|
import com.rometools.rome.feed.synd.SyndFeed;
|
||||||
import com.sun.syndication.feed.synd.SyndFeedImpl;
|
import com.rometools.rome.feed.synd.SyndFeedImpl;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
|
@ -1,4 +1,4 @@
|
||||||
package com.sun.syndication;
|
package com.rometools.opml;
|
||||||
|
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
|
@ -10,10 +10,10 @@ import org.jdom2.Document;
|
||||||
import org.jdom2.input.SAXBuilder;
|
import org.jdom2.input.SAXBuilder;
|
||||||
import org.jdom2.input.sax.XMLReaders;
|
import org.jdom2.input.sax.XMLReaders;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.rometools.rome.feed.WireFeed;
|
||||||
import com.sun.syndication.feed.synd.SyndFeed;
|
import com.rometools.rome.feed.synd.SyndFeed;
|
||||||
import com.sun.syndication.io.SyndFeedInput;
|
import com.rometools.rome.io.SyndFeedInput;
|
||||||
import com.sun.syndication.io.WireFeedInput;
|
import com.rometools.rome.io.WireFeedInput;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author pat, tucu
|
* @author pat, tucu
|
|
@ -1,4 +1,4 @@
|
||||||
package com.sun.syndication;
|
package com.rometools.opml;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author pat
|
* @author pat
|
|
@ -7,14 +7,14 @@
|
||||||
* and open the template in the editor.
|
* and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.sun.syndication;
|
package com.rometools.opml;
|
||||||
|
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.rometools.rome.feed.WireFeed;
|
||||||
import com.sun.syndication.feed.synd.SyndFeed;
|
import com.rometools.rome.feed.synd.SyndFeed;
|
||||||
import com.sun.syndication.feed.synd.SyndFeedImpl;
|
import com.rometools.rome.feed.synd.SyndFeedImpl;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
|
@ -7,18 +7,18 @@
|
||||||
* and open the template in the editor.
|
* and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.sun.syndication;
|
package com.rometools.opml;
|
||||||
|
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.rometools.opml.test.NullWriter;
|
||||||
import com.sun.syndication.feed.synd.SyndFeed;
|
import com.rometools.opml.test.TestUtil;
|
||||||
import com.sun.syndication.feed.synd.SyndFeedImpl;
|
import com.rometools.rome.feed.WireFeed;
|
||||||
import com.sun.syndication.io.WireFeedInput;
|
import com.rometools.rome.feed.synd.SyndFeed;
|
||||||
import com.sun.syndication.io.WireFeedOutput;
|
import com.rometools.rome.feed.synd.SyndFeedImpl;
|
||||||
import com.sun.syndication.test.NullWriter;
|
import com.rometools.rome.io.WireFeedInput;
|
||||||
import com.sun.syndication.test.TestUtil;
|
import com.rometools.rome.io.WireFeedOutput;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
|
@ -7,14 +7,14 @@
|
||||||
* and open the template in the editor.
|
* and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.sun.syndication;
|
package com.rometools.opml;
|
||||||
|
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
|
|
||||||
import com.sun.syndication.feed.WireFeed;
|
import com.rometools.rome.feed.WireFeed;
|
||||||
import com.sun.syndication.feed.synd.SyndFeed;
|
import com.rometools.rome.feed.synd.SyndFeed;
|
||||||
import com.sun.syndication.feed.synd.SyndFeedImpl;
|
import com.rometools.rome.feed.synd.SyndFeedImpl;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
|
@ -14,7 +14,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication;
|
package com.rometools.opml;
|
||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
|
@ -28,8 +28,8 @@ import junit.framework.TestCase;
|
||||||
|
|
||||||
import org.jdom2.input.SAXBuilder;
|
import org.jdom2.input.SAXBuilder;
|
||||||
|
|
||||||
import com.sun.syndication.io.XmlReader;
|
import com.rometools.rome.io.XmlReader;
|
||||||
import com.sun.syndication.io.impl.XmlFixerReader;
|
import com.rometools.rome.io.impl.XmlFixerReader;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author pat, tucu
|
* @author pat, tucu
|
|
@ -14,7 +14,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
package com.sun.syndication;
|
package com.rometools.opml;
|
||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
|
@ -28,7 +28,7 @@ import java.util.Map;
|
||||||
|
|
||||||
import junit.framework.TestCase;
|
import junit.framework.TestCase;
|
||||||
|
|
||||||
import com.sun.syndication.io.XmlReader;
|
import com.rometools.rome.io.XmlReader;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author pat, tucu
|
* @author pat, tucu
|
|
@ -1,4 +1,4 @@
|
||||||
package com.sun.syndication.test;
|
package com.rometools.opml.test;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.Writer;
|
import java.io.Writer;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.sun.syndication.test;
|
package com.rometools.opml.test;
|
||||||
|
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
Loading…
Reference in a new issue