Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Spring's ROME support requires ROME 1.5 (com.rometools.rome) now

Browse Source 
Issue: SPR-11893
This commit is contained in:
Juergen Hoeller
2014-07-02 15:04:41 +02:00
parent 32b87079cb
commit 367b0394a2
16 changed files with 110 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
View File

@@ -146,7 +146,7 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
"javax.validation.Validator", AnnotationDrivenBeanDefinitionParser.class.getClassLoader());
private static boolean romePresent =
ClassUtils.isPresent("com.sun.syndication.feed.WireFeed", AnnotationDrivenBeanDefinitionParser.class.getClassLoader());
ClassUtils.isPresent("com.rometools.rome.feed.WireFeed", AnnotationDrivenBeanDefinitionParser.class.getClassLoader());
private static final boolean jaxb2Present =
ClassUtils.isPresent("javax.xml.bind.Binder", AnnotationDrivenBeanDefinitionParser.class.getClassLoader());

2
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
View File

@@ -161,7 +161,7 @@ import org.springframework.web.util.UrlPathHelper;
public class WebMvcConfigurationSupport implements ApplicationContextAware, ServletContextAware {
private static boolean romePresent =
ClassUtils.isPresent("com.sun.syndication.feed.WireFeed", WebMvcConfigurationSupport.class.getClassLoader());
ClassUtils.isPresent("com.rometools.rome.feed.WireFeed", WebMvcConfigurationSupport.class.getClassLoader());
private static final boolean jaxb2Present =
ClassUtils.isPresent("javax.xml.bind.Binder", WebMvcConfigurationSupport.class.getClassLoader());

24
spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,27 +21,27 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.sun.syndication.feed.WireFeed;
import com.sun.syndication.feed.atom.Entry;
import com.sun.syndication.feed.atom.Feed;
import com.rometools.rome.feed.atom.Entry;
import com.rometools.rome.feed.atom.Feed;
/**
* Abstract superclass for Atom Feed views, using java.net's
* <a href="https://rome.dev.java.net/">ROME</a> package.
* Abstract superclass for Atom Feed views, using the
* <a href="https://github.com/rometools/rome">ROME</a> package.
*
* <p>><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
* variant of ROME, version 1.5. Please upgrade your build dependency.</b>
*
* <p>Application-specific view classes will extend this class.
* The view will be held in the subclass itself, not in a template.
*
* <p>Main entry points are the {@link #buildFeedMetadata(Map, WireFeed, HttpServletRequest)} and
* {@link #buildFeedEntries(Map, HttpServletRequest, HttpServletResponse)}.
* Main entry points are the {@link #buildFeedMetadata} and {@link #buildFeedEntries}.
*
* <p>Thanks to Jettro Coenradie and Sergio Bossa for the original feed view prototype!
*
* @author Arjen Poutsma
* @author Juergen Hoeller
* @since 3.0
* @see #buildFeedMetadata(Map, WireFeed, HttpServletRequest)
* @see #buildFeedEntries(Map, HttpServletRequest, HttpServletResponse)
* @see #buildFeedMetadata
* @see #buildFeedEntries
* @see <a href="http://www.atomenabled.org/developers/syndication/">Atom Syndication Format</a>
*/
public abstract class AbstractAtomFeedView extends AbstractFeedView<Feed> {
@@ -56,7 +56,7 @@ public abstract class AbstractAtomFeedView extends AbstractFeedView<Feed> {
}
/**
* Sets the Rome feed type to use.
* Set the Rome feed type to use.
* <p>Defaults to Atom 1.0.
* @see Feed#setFeedType(String)
* @see #DEFAULT_FEED_TYPE

13
spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,15 +22,18 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.sun.syndication.feed.WireFeed;
import com.sun.syndication.io.WireFeedOutput;
import com.rometools.rome.feed.WireFeed;
import com.rometools.rome.io.WireFeedOutput;
import org.springframework.util.StringUtils;
import org.springframework.web.servlet.view.AbstractView;
/**
* Abstract base class for Atom and RSS Feed views, using java.net's
* <a href="https://rome.dev.java.net/">ROME</a> package.
* Abstract base class for Atom and RSS Feed views, using the
* <a href="https://github.com/rometools/rome">ROME</a> package.
*
* <p>><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
* variant of ROME, version 1.5. Please upgrade your build dependency.</b>
*
* <p>Application-specific view classes will typically extend from either
* {@link AbstractRssFeedView} or {@link AbstractAtomFeedView} instead of from this class.

22
spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,27 +21,27 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.sun.syndication.feed.WireFeed;
import com.sun.syndication.feed.rss.Channel;
import com.sun.syndication.feed.rss.Item;
import com.rometools.rome.feed.rss.Channel;
import com.rometools.rome.feed.rss.Item;
/**
* Abstract superclass for RSS Feed views, using java.net's
* <a href="https://rome.dev.java.net/">ROME</a> package.
* Abstract superclass for RSS Feed views, using the
* <a href="https://github.com/rometools/rome">ROME</a> package.
*
* <p>><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
* variant of ROME, version 1.5. Please upgrade your build dependency.</b>
*
* <p>Application-specific view classes will extend this class.
* The view will be held in the subclass itself, not in a template.
*
* <p>Main entry points are the {@link #buildFeedMetadata(Map, WireFeed , HttpServletRequest)}
* and {@link #buildFeedItems(Map, HttpServletRequest, HttpServletResponse)}.
* Main entry points are the {@link #buildFeedMetadata} and {@link #buildFeedItems}.
*
* <p>Thanks to Jettro Coenradie and Sergio Bossa for the original feed view prototype!
*
* @author Arjen Poutsma
* @author Juergen Hoeller
* @since 3.0
* @see #buildFeedMetadata(Map, WireFeed , HttpServletRequest)
* @see #buildFeedItems(Map, HttpServletRequest, HttpServletResponse)
* @see #buildFeedMetadata
* @see #buildFeedItems
*/
public abstract class AbstractRssFeedView extends AbstractFeedView<Channel> {

4
spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/package-info.java
View File

@@ -1,8 +1,8 @@
/**
*
* Support classes for feed generation, providing View implementations for Atom and RSS
* Support classes for feed generation, providing View implementations for Atom and RSS.
* Based on the <a href="https://github.com/rometools/rome">ROME tools</a> project.
*
*/
package org.springframework.web.servlet.view.feed;