Author: snoopdave
Date: Sat Jun 14 17:57:30 2014
New Revision: 1602608
URL: http://svn.apache.org/r1602608
Log:
Move to ROME 1.5, ROME Fetcher and ROME Propono; also includes upgrade to JDOM2.
Modified:
roller/trunk/ (props changed)
roller/trunk/app/pom.xml
roller/trunk/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModule.java
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/FileContent.java
(props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
(props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java
(props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
(props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java
(props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java
(props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java
(props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java
(props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/ (props
changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/
(props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandlerFactory.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
roller/trunk/app/src/main/resources/rome.properties
roller/trunk/app/src/main/webapp/WEB-INF/web.xml
roller/trunk/pom.xml
Propchange: roller/trunk/
------------------------------------------------------------------------------
Merged /roller/branches/rome2:r1529475-1602604
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Sat Jun 14 17:57:30 2014
@@ -11,7 +11,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <name>Roller Webapp</name>
+ <name>Roller webapp</name>
<artifactId>roller-webapp</artifactId>
<packaging>war</packaging>
@@ -164,31 +164,23 @@
</dependency>
<dependency>
- <groupId>net.java.dev.rome</groupId>
+ <groupId>com.rometools</groupId>
<artifactId>rome</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>net.java.dev.rome</groupId>
+ <groupId>com.rometools</groupId>
<artifactId>rome-fetcher</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0</version>
<scope>compile</scope>
- <exclusions>
- <!-- Version it would bring in, 2.4.0, is too old,
- breaks OpenID functionality -->
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>net.java.dev.rome</groupId>
+ <groupId>com.rometools</groupId>
<artifactId>rome-propono</artifactId>
- <version>1.0.0</version>
+ <version>1.5.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -210,6 +202,13 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.7</version>
+ <scope>runtime</scope>
+ </dependency>
+
<!-- spring deps -->
<dependency>
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
Sat Jun 14 17:57:30 2014
@@ -18,16 +18,16 @@
package org.apache.roller.planet.business.fetcher;
-import com.sun.syndication.feed.module.DCModule;
-import com.sun.syndication.feed.synd.SyndCategory;
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.fetcher.FeedFetcher;
-import com.sun.syndication.fetcher.impl.FeedFetcherCache;
-import com.sun.syndication.fetcher.impl.HttpURLFeedFetcher;
-import com.sun.syndication.fetcher.impl.SyndFeedInfo;
-import com.sun.syndication.fetcher.impl.DiskFeedInfoCache;
+import com.rometools.rome.feed.module.DCModule;
+import com.rometools.rome.feed.synd.SyndCategory;
+import com.rometools.rome.feed.synd.SyndContent;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.fetcher.FeedFetcher;
+import com.rometools.fetcher.impl.FeedFetcherCache;
+import com.rometools.fetcher.impl.HttpURLFeedFetcher;
+import com.rometools.fetcher.impl.SyndFeedInfo;
+import com.rometools.fetcher.impl.DiskFeedInfoCache;
import java.io.File;
import java.net.MalformedURLException;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
Sat Jun 14 17:57:30 2014
@@ -219,8 +219,8 @@ public class SingleThreadedFeedUpdater i
// upate proxy settings for jvm based on planet configuration
private void updateProxySettings() {
- String proxyHost =
WebloggerRuntimeConfig.getProperty("site.proxyhost");
- int proxyPort =
WebloggerRuntimeConfig.getIntProperty("site.proxyport");
+ String proxyHost =
WebloggerRuntimeConfig.getProperty("planet.site.proxyhost");
+ int proxyPort =
WebloggerRuntimeConfig.getIntProperty("planet.site.proxyport");
if (proxyHost != null && proxyPort > 0) {
System.setProperty("proxySet", "true");
System.setProperty("http.proxyHost", proxyHost);
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModule.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModule.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModule.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModule.java
Sat Jun 14 17:57:30 2014
@@ -16,7 +16,7 @@
*/
package org.apache.roller.planet.util.rome;
-import com.sun.syndication.feed.module.Module;
+import com.rometools.rome.feed.module.Module;
public interface ContentModule extends Module {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java
Sat Jun 14 17:57:30 2014
@@ -20,11 +20,11 @@ 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;
+import com.rometools.rome.feed.module.Module;
+import com.rometools.rome.io.ModuleGenerator;
public class ContentModuleGenerator implements ModuleGenerator {
private static final Namespace CONTENT_NS =
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleParser.java
Sat Jun 14 17:57:30 2014
@@ -16,11 +16,12 @@
*/
package org.apache.roller.planet.util.rome;
-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;
+import com.rometools.rome.feed.module.Module;
+import com.rometools.rome.io.ModuleParser;
+import java.util.Locale;
public class ContentModuleParser implements ModuleParser {
@@ -31,11 +32,11 @@ public class ContentModuleParser impleme
public Namespace getContentNamespace() {
return Namespace.getNamespace(ContentModule.URI);
}
- public Module parse(Element dcRoot) {
+ public Module parse(Element element, Locale locale) {
boolean foundSomething = false;
ContentModule fm = new ContentModuleImpl();
- Element e = dcRoot.getChild("encoded", getContentNamespace());
+ Element e = element.getChild("encoded", getContentNamespace());
if (e != null) {
foundSomething = true;
fm.setEncoded(e.getText());
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091U.java
Sat Jun 14 17:57:30 2014
@@ -16,9 +16,9 @@
*/
package org.apache.roller.planet.util.rome;
-import com.sun.syndication.feed.rss.Item;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.impl.ConverterForRSS091Userland;
+import com.rometools.rome.feed.rss.Item;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.impl.ConverterForRSS091Userland;
/**
*/
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS20.java
Sat Jun 14 17:57:30 2014
@@ -16,13 +16,12 @@
*/
package org.apache.roller.planet.util.rome;
+import com.rometools.rome.feed.module.DCModule;
+import com.rometools.rome.feed.rss.Item;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.impl.ConverterForRSS20;
import java.util.Date;
-import com.sun.syndication.feed.module.DCModule;
-import com.sun.syndication.feed.rss.Item;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.impl.ConverterForRSS20;
-
/**
* Workaround Rome bug.
*/
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091UParser.java
Sat Jun 14 17:57:30 2014
@@ -16,11 +16,12 @@
*/
package org.apache.roller.planet.util.rome;
-import org.jdom.Element;
+import com.rometools.rome.feed.rss.Item;
+import com.rometools.rome.io.impl.DateParser;
+import com.rometools.rome.io.impl.RSS091UserlandParser;
+import org.jdom2.Element;
-import com.sun.syndication.feed.rss.Item;
-import com.sun.syndication.io.impl.DateParser;
-import com.sun.syndication.io.impl.RSS091UserlandParser;
+import java.util.Locale;
/**
*/
@@ -34,11 +35,12 @@ public class PlanetRSS091UParser extends
super(type);
}
- protected Item parseItem(Element rssRoot,Element eItem) {
- Item item = super.parseItem(rssRoot, eItem);
+ @Override
+ protected Item parseItem(Element rssRoot,Element eItem, Locale locale) {
+ Item item = super.parseItem(rssRoot, eItem, locale);
Element e = eItem.getChild("pubDate",getRSSNamespace());
if (e!=null) {
- item.setPubDate(DateParser.parseRFC822(e.getText()));
+ item.setPubDate(DateParser.parseRFC822(e.getText(), locale));
}
return item;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
Sat Jun 14 17:57:30 2014
@@ -32,9 +32,9 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.Weblog;
-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;
/*
* JPABookmarkManagerImpl.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
Sat Jun 14 17:57:30 2014
@@ -20,10 +20,10 @@ package org.apache.roller.weblogger.busi
import org.apache.commons.lang3.StringUtils;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
-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;
import java.io.IOException;
import java.io.InputStream;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java
Sat Jun 14 17:57:30 2014
@@ -26,10 +26,10 @@ package org.apache.roller.weblogger.conf
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-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;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
Sat Jun 14 17:57:30 2014
@@ -24,10 +24,12 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
+import org.apache.roller.planet.config.PlanetRuntimeConfig;
import org.apache.roller.weblogger.business.PropertiesManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.config.runtime.ConfigDef;
+import org.apache.roller.weblogger.config.runtime.DisplayGroup;
+import org.apache.roller.weblogger.config.runtime.PropertyDef;
import org.apache.roller.weblogger.config.runtime.RuntimeConfigDefs;
import org.apache.roller.weblogger.pojos.GlobalPermission;
import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
@@ -77,12 +79,14 @@ public class PlanetConfig extends Planet
// just grab our properties map
PropertiesManager pMgr =
WebloggerFactory.getWeblogger().getPropertiesManager();
setProperties(pMgr.getProperties());
+
} catch (RollerException ex) {
log.error("Error loading planet properties");
}
// set config def used to draw the view
- RuntimeConfigDefs defs = WebloggerRuntimeConfig.getRuntimeConfigDefs();
+ RuntimeConfigDefs defs = PlanetRuntimeConfig.getRuntimeConfigDefs();
+
List<ConfigDef> configDefs = defs.getConfigDefs();
for (ConfigDef configDef : configDefs) {
if("global-properties".equals(configDef.getName())) {
@@ -100,38 +104,56 @@ public class PlanetConfig extends Planet
public String save() {
try {
- // only set values for properties that are already defined
- RuntimeConfigProperty updProp;
String incomingProp = null;
- for (String propName : getProperties().keySet()) {
- log.debug("Checking property ["+propName+"]");
-
- updProp = getProperties().get(propName);
- String[] propValues = (String[])
getParameters().get(updProp.getName());
- if(propValues != null && propValues.length > 0) {
- // we don't deal with multi-valued props
- incomingProp = propValues[0];
- }
-
- // some special treatment for booleans
- // this is a bit hacky since we are assuming that any prop
- // with a value of "true" or "false" is meant to be a boolean
- // it may not always be the case, but we should be okay for now
- // below null check needed w/Oracle
- if( updProp.getValue() != null
- && (updProp.getValue().equals("true") ||
updProp.getValue().equals("false"))) {
-
- incomingProp = (incomingProp == null ||
!incomingProp.equals("on")) ? "false" : "true";
- }
-
- // only work on props that were submitted with the request
- if(incomingProp != null) {
- log.debug("Setting new value for ["+propName+"]");
-
- updProp.setValue(incomingProp.trim());
+
+
+ // only set values for properties that are already defined
+ RuntimeConfigDefs defs =
PlanetRuntimeConfig.getRuntimeConfigDefs();
+ for ( ConfigDef configDef : defs.getConfigDefs()) {
+ for ( DisplayGroup displayGroup :
configDef.getDisplayGroups() ) {
+ for ( PropertyDef propertyDef :
displayGroup.getPropertyDefs() ) {
+
+ String propName = propertyDef.getName();
+
+ log.debug("Checking property [" + propName + "]");
+
+ RuntimeConfigProperty updProp =
getProperties().get(propName);
+
+ if ( updProp == null ) {
+ updProp = new RuntimeConfigProperty(propName, "");
+ getProperties().put( propName, updProp);
+ }
+
+ String[] propValues = (String[])
getParameters().get(updProp.getName());
+ if (propValues != null && propValues.length > 0) {
+ // we don't deal with multi-valued props
+ incomingProp = propValues[0];
+ }
+
+ // some special treatment for booleans
+ // this is a bit hacky since we are assuming that any
prop
+ // with a value of "true" or "false" is meant to be a
boolean
+ // it may not always be the case, but we should be
okay for now
+ // below null check needed against Oracle DB
+
+ if (updProp.getValue() != null &&
(updProp.getValue().equals("true")
+ || updProp.getValue().equals("false"))) {
+
+ incomingProp = (incomingProp == null
+ || !incomingProp.equals("on")) ? "false" :
"true";
+ }
+
+ // only work on props that were submitted with the
request
+ if (incomingProp != null) {
+ log.debug("Setting new value for [" + propName +
"]");
+
+ updProp.setValue(incomingProp.trim());
+ }
+
+ }
}
}
-
+
// save it
PropertiesManager pMgr =
WebloggerFactory.getWeblogger().getPropertiesManager();
pMgr.saveProperties(this.properties);
Propchange:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/FileContent.java
------------------------------------------------------------------------------
Reverse-merged
/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/FileContent.java:r739576-782269
Merged
/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/FileContent.java:r1529475-1602604
Propchange:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
------------------------------------------------------------------------------
Reverse-merged
/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFile.java:r739576-782269
Merged
/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java:r1529475-1602604
Propchange:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java
------------------------------------------------------------------------------
Reverse-merged
/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java:r749634-782269
Merged
/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java:r1529475-1602604
Propchange:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
------------------------------------------------------------------------------
Reverse-merged
/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java:r739576-782269
Merged
/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java:r1529475-1602604
Propchange:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java
------------------------------------------------------------------------------
Reverse-merged
/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java:r749634-782269
Merged
/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java:r1529475-1602604
Propchange:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java
------------------------------------------------------------------------------
Reverse-merged
/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java:r749634-782269
Merged
/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java:r1529475-1602604
Propchange:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java
------------------------------------------------------------------------------
Reverse-merged
/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileTag.java:r739576-782269
Merged
/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java:r1529475-1602604
Propchange:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java
------------------------------------------------------------------------------
Reverse-merged
/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileType.java:r749634-782269
Merged
/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/
------------------------------------------------------------------------------
Reverse-merged
/roller/branches/roller_mavenized/weblogger-web/src/main/java/org/apache/roller/weblogger/ui:r894711-895418
Reverse-merged
/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui:r1465426-1491055
Merged
/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui:r1529475-1602604
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
Sat Jun 14 17:57:30 2014
@@ -38,10 +38,10 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.util.Utilities;
-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;
/**
* A helper class for dealing with UI menus.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
Sat Jun 14 17:57:30 2014
@@ -34,6 +34,7 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.planet.business.PlanetManager;
+import org.apache.roller.planet.config.PlanetRuntimeConfig;
import org.apache.roller.planet.pojos.Planet;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.StaticTemplate;
@@ -128,6 +129,7 @@ public class PlanetFeedServlet extends H
// looks like we need to render content
HashMap<String, Object> model = new HashMap<String, Object>();
try {
+
// populate the rendering model
if (request.getParameter("group") != null) {
Planet planetObject = planet.getWeblogger("default");
@@ -136,29 +138,34 @@ public class PlanetFeedServlet extends H
planet.getGroup(planetObject,
request.getParameter("group")));
}
+
model.put("planet", planet);
model.put("date", new Date());
model.put("utils", new UtilitiesModel());
+ model.put("lastModified", lastModified);
+
model.put("siteName",
- WebloggerRuntimeConfig.getProperty("site.name"));
+ PlanetRuntimeConfig.getProperty("planet.site.name"));
+
model.put("siteDescription",
- WebloggerRuntimeConfig.getProperty("site.description"));
- model.put("lastModified", lastModified);
+
PlanetRuntimeConfig.getProperty("planet.site.description"));
+
+
if (StringUtils.isNotEmpty(WebloggerRuntimeConfig
- .getProperty("site.absoluteurl"))) {
+ .getProperty("planet.site.absoluteurl"))) {
model.put("absoluteSite",
-
WebloggerRuntimeConfig.getProperty("site.absoluteurl"));
+
PlanetRuntimeConfig.getProperty("planet.site.absoluteurl"));
} else {
model.put("absoluteSite",
WebloggerRuntimeConfig.getAbsoluteContextURL());
}
- model.put(
- "feedStyle",
- WebloggerRuntimeConfig
- .getBooleanProperty("site.newsfeeds.styledFeeds"));
+
+ model.put("feedStyle", WebloggerRuntimeConfig
+ .getBooleanProperty("site.newsfeeds.styledFeeds"));
int numEntries = WebloggerRuntimeConfig
.getIntProperty("site.newsfeeds.defaultEntries");
+
int entryCount = numEntries;
String sCount = request.getParameter("count");
if (sCount != null) {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
Sat Jun 14 17:57:30 2014
@@ -38,10 +38,10 @@ import org.apache.roller.util.RollerCons
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.WeblogEntry;
-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;
/**
Propchange:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/
------------------------------------------------------------------------------
Reverse-merged
/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/webservices:r1465426-1491055
Reverse-merged
/roller/branches/roller_mavenized/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices:r894711-895418
Merged
/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices:r1529475-1602604
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java
Sat Jun 14 17:57:30 2014
@@ -17,10 +17,10 @@
package org.apache.roller.weblogger.webservices.atomprotocol;
-import com.sun.syndication.feed.atom.Entry;
-import com.sun.syndication.feed.atom.Feed;
-import com.sun.syndication.propono.atom.server.AtomException;
-import com.sun.syndication.propono.atom.server.AtomRequest;
+import com.rometools.propono.atom.server.AtomException;
+import com.rometools.propono.atom.server.AtomRequest;
+import com.rometools.rome.feed.atom.Feed;
+import java.util.Map.Entry;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
Sat Jun 14 17:57:30 2014
@@ -17,18 +17,21 @@
package org.apache.roller.weblogger.webservices.atomprotocol;
-import com.sun.syndication.feed.atom.Category;
-import com.sun.syndication.feed.atom.Content;
-import com.sun.syndication.feed.atom.Entry;
-import com.sun.syndication.feed.atom.Feed;
-import com.sun.syndication.feed.atom.Link;
-import com.sun.syndication.feed.atom.Person;
-import com.sun.syndication.propono.atom.common.rome.AppModule;
-import com.sun.syndication.propono.atom.common.rome.AppModuleImpl;
-import com.sun.syndication.propono.atom.server.AtomException;
-import com.sun.syndication.propono.atom.server.AtomNotAuthorizedException;
-import com.sun.syndication.propono.atom.server.AtomNotFoundException;
-import com.sun.syndication.propono.atom.server.AtomRequest;
+
+import com.rometools.propono.atom.common.rome.AppModule;
+import com.rometools.propono.atom.common.rome.AppModuleImpl;
+import com.rometools.propono.atom.server.AtomException;
+import com.rometools.propono.atom.server.AtomNotAuthorizedException;
+import com.rometools.propono.atom.server.AtomNotFoundException;
+import com.rometools.propono.atom.server.AtomRequest;
+import com.rometools.rome.feed.atom.Category;
+import com.rometools.rome.feed.atom.Content;
+import com.rometools.rome.feed.atom.Entry;
+import com.rometools.rome.feed.atom.Feed;
+import com.rometools.rome.feed.atom.Link;
+import com.rometools.rome.feed.atom.Person;
+import com.rometools.rome.feed.module.Module;
+import com.rometools.rome.feed.synd.SyndPerson;
import java.sql.Timestamp;
import java.util.ArrayList;
@@ -332,10 +335,10 @@ public class EntryCollection {
}
User creator = entry.getCreator();
- Person author = new Person();
+ SyndPerson author = new Person();
author.setName( creator.getUserName());
author.setEmail( creator.getEmailAddress());
- atomEntry.setAuthors( Collections.singletonList(author));
+ atomEntry.setAuthors(
(List<SyndPerson>)Collections.singletonList(author));
// Add Atom category for Weblogger category, using category scheme
List<Category> categories = new ArrayList<Category>();
@@ -370,7 +373,7 @@ public class EntryCollection {
otherlinks.add(editlink);
atomEntry.setOtherLinks(otherlinks);
- List<AppModule> modules = new ArrayList<AppModule>();
+ List<Module> modules = new ArrayList<Module>();
AppModule app = new AppModuleImpl();
app.setDraft(!WeblogEntry.PUBLISHED.equals(entry.getStatus()));
app.setEdited(entry.getUpdateTime());
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
Sat Jun 14 17:57:30 2014
@@ -17,17 +17,17 @@
package org.apache.roller.weblogger.webservices.atomprotocol;
-import com.sun.syndication.feed.atom.Content;
-import com.sun.syndication.feed.atom.Entry;
-import com.sun.syndication.feed.atom.Feed;
-import com.sun.syndication.feed.atom.Link;
-import com.sun.syndication.propono.atom.common.rome.AppModule;
-import com.sun.syndication.propono.atom.common.rome.AppModuleImpl;
-import com.sun.syndication.propono.atom.server.AtomException;
-import com.sun.syndication.propono.atom.server.AtomMediaResource;
-import com.sun.syndication.propono.atom.server.AtomNotAuthorizedException;
-import com.sun.syndication.propono.atom.server.AtomNotFoundException;
-import com.sun.syndication.propono.atom.server.AtomRequest;
+import com.rometools.propono.atom.common.rome.AppModule;
+import com.rometools.propono.atom.common.rome.AppModuleImpl;
+import com.rometools.propono.atom.server.AtomException;
+import com.rometools.propono.atom.server.AtomMediaResource;
+import com.rometools.propono.atom.server.AtomNotAuthorizedException;
+import com.rometools.propono.atom.server.AtomNotFoundException;
+import com.rometools.propono.atom.server.AtomRequest;
+import com.rometools.rome.feed.atom.Content;
+import com.rometools.rome.feed.atom.Entry;
+import com.rometools.rome.feed.atom.Feed;
+import com.rometools.rome.feed.atom.Link;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
Sat Jun 14 17:57:30 2014
@@ -16,8 +16,8 @@
* directory of this distribution.
*/
package org.apache.roller.weblogger.webservices.atomprotocol;
-import com.sun.syndication.propono.atom.common.Categories;
-import com.sun.syndication.propono.atom.server.AtomRequest;
+import com.rometools.propono.atom.common.Categories;
+import com.rometools.propono.atom.server.AtomRequest;
import java.util.StringTokenizer;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.codec.binary.Base64;
@@ -31,13 +31,13 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.util.Utilities;
import org.apache.roller.weblogger.util.WSSEUtilities;
-import com.sun.syndication.feed.atom.Entry;
-import com.sun.syndication.feed.atom.Feed;
-import com.sun.syndication.propono.atom.common.AtomService;
-import com.sun.syndication.propono.atom.server.AtomException;
-import com.sun.syndication.propono.atom.server.AtomHandler;
-import com.sun.syndication.propono.atom.server.AtomMediaResource;
-import com.sun.syndication.propono.atom.server.AtomNotFoundException;
+import com.rometools.propono.atom.common.AtomService;
+import com.rometools.propono.atom.server.AtomException;
+import com.rometools.propono.atom.server.AtomHandler;
+import com.rometools.propono.atom.server.AtomMediaResource;
+import com.rometools.propono.atom.server.AtomNotFoundException;
+import com.rometools.rome.feed.atom.Entry;
+import com.rometools.rome.feed.atom.Feed;
import javax.servlet.http.HttpServletResponse;
import net.oauth.OAuthAccessor;
import net.oauth.OAuthMessage;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandlerFactory.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandlerFactory.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandlerFactory.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandlerFactory.java
Sat Jun 14 17:57:30 2014
@@ -18,14 +18,14 @@
package org.apache.roller.weblogger.webservices.atomprotocol;
-import com.sun.syndication.propono.atom.server.AtomHandlerFactory;
-import com.sun.syndication.propono.atom.server.AtomHandler;
+import com.rometools.propono.atom.server.AtomHandlerFactory;
+import com.rometools.propono.atom.server.AtomHandler;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
- * Extends {@link com.sun.syndication.propono.atom.server.AtomHandlerFactory}
to create and return
- * {@link com.sun.syndication.propono.atom.server.impl.FileBasedAtomHandler}.
+ * Extends {@link com.rometools.propono.atom.server.AtomHandlerFactory} to
create and return
+ * {@link com.rometools.propono.atom.server.impl.FileBasedAtomHandler}.
*/
public class RollerAtomHandlerFactory extends AtomHandlerFactory {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
Sat Jun 14 17:57:30 2014
@@ -36,12 +36,12 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.util.Utilities;
-import com.sun.syndication.feed.atom.Category;
-import com.sun.syndication.propono.atom.common.AtomService;
-import com.sun.syndication.propono.atom.common.Categories;
-import com.sun.syndication.propono.atom.common.Collection;
-import com.sun.syndication.propono.atom.common.Workspace;
-import com.sun.syndication.propono.atom.server.AtomException;
+import com.rometools.propono.atom.common.AtomService;
+import com.rometools.propono.atom.common.Categories;
+import com.rometools.propono.atom.common.Collection;
+import com.rometools.propono.atom.common.Workspace;
+import com.rometools.propono.atom.server.AtomException;
+import com.rometools.rome.feed.atom.Category;
/**
@@ -100,8 +100,7 @@ public class RollerAtomService extends A
}
entryCol.addCategories(cats);
- // Add tags as free-form categories using scheme that
points
- // to site because tags can be considered site-wide
+ // Indicte that free form categories are allowed
Categories tags = new Categories();
tags.setFixed(false);
entryCol.addCategories(tags);
Modified: roller/trunk/app/src/main/resources/rome.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/rome.properties?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/rome.properties (original)
+++ roller/trunk/app/src/main/resources/rome.properties Sat Jun 14 17:57:30 2014
@@ -26,29 +26,29 @@ Converter.classes =org.apache.roller
# Handle funky RSS (RSS 2.0 with <dc:date> and/or <content:encoded>)
-rss_2.0.feed.ModuleGenerator.classes
=com.sun.syndication.io.impl.DCModuleGenerator \
+rss_2.0.feed.ModuleGenerator.classes
=com.rometools.rome.io.impl.DCModuleGenerator \
org.apache.roller.planet.util.rome.ContentModuleGenerator
-rss_2.0.item.ModuleGenerator.classes
=com.sun.syndication.io.impl.DCModuleGenerator \
+rss_2.0.item.ModuleGenerator.classes
=com.rometools.rome.io.impl.DCModuleGenerator \
org.apache.roller.planet.util.rome.ContentModuleGenerator
-rss_2.0.feed.ModuleParser.classes
=com.sun.syndication.io.impl.DCModuleParser \
+rss_2.0.feed.ModuleParser.classes
=com.rometools.rome.io.impl.DCModuleParser \
org.apache.roller.planet.util.rome.ContentModuleParser
-rss_2.0.item.ModuleParser.classes
=com.sun.syndication.io.impl.DCModuleParser \
+rss_2.0.item.ModuleParser.classes
=com.rometools.rome.io.impl.DCModuleParser \
org.apache.roller.planet.util.rome.ContentModuleParser
# Handle <content:encoded> in RSS 1.0
-rss_1.0.feed.ModuleParser.classes
=com.sun.syndication.io.impl.DCModuleParser \
+rss_1.0.feed.ModuleParser.classes
=com.rometools.rome.io.impl.DCModuleParser \
org.apache.roller.planet.util.rome.ContentModuleParser
-rss_1.0.item.ModuleParser.classes
=com.sun.syndication.io.impl.DCModuleParser \
+rss_1.0.item.ModuleParser.classes
=com.rometools.rome.io.impl.DCModuleParser \
org.apache.roller.planet.util.rome.ContentModuleParser
-rss_1.0.feed.ModuleGenerator.classes
=com.sun.syndication.io.impl.DCModuleGenerator \
+rss_1.0.feed.ModuleGenerator.classes
=com.rometools.rome.io.impl.DCModuleGenerator \
org.apache.roller.planet.util.rome.ContentModuleGenerator
-rss_1.0.item.ModuleGenerator.classes
=com.sun.syndication.io.impl.DCModuleGenerator \
+rss_1.0.item.ModuleGenerator.classes
=com.rometools.rome.io.impl.DCModuleGenerator \
org.apache.roller.planet.util.rome.ContentModuleGenerator
\ No newline at end of file
Modified: roller/trunk/app/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/web.xml?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/web.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/web.xml Sat Jun 14 17:57:30 2014
@@ -263,7 +263,7 @@
<servlet>
<servlet-name>AtomServlet</servlet-name>
-
<servlet-class>com.sun.syndication.propono.atom.server.AtomServlet</servlet-class>
+
<servlet-class>com.rometools.propono.atom.server.AtomServlet</servlet-class>
</servlet>
<servlet>
Modified: roller/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1602608&r1=1602607&r2=1602608&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Sat Jun 14 17:57:30 2014
@@ -15,7 +15,7 @@
<name>Roller</name>
<description>
Roller is an open source blog server built with open source Java
- libraries including Spring, Struts2, Velocity and Commons.
+ libraries including Struts2, Velocity, ROME and Guice.
</description>
<url>http://roller.apache.org</url>
<inceptionYear>2002</inceptionYear>
