You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2014/06/15 19:12:45 UTC
svn commit: r1602735 - in /roller/trunk:
app/src/main/java/org/apache/roller/planet/util/rome/
app/src/main/java/org/apache/roller/weblogger/
app/src/main/java/org/apache/roller/weblogger/business/jpa/
app/src/main/java/org/apache/roller/weblogger/plan...
Author: snoopdave
Date: Sun Jun 15 17:12:43 2014
New Revision: 1602735
URL: http://svn.apache.org/r1602735
Log:
Move to ROME 1.5, ROME Fetcher and ROME Propono; also includes upgrade to JDOM2.
Removed:
roller/trunk/docs/testing/roller-junit.properties
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java
roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/WebloggerException.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Resource.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStat.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Template.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java (props changed)
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java
roller/trunk/app/src/main/resources/org/apache/roller/planet/config/planet.properties (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml (contents, props changed)
roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/jpa/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/pings/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/plugins/comment/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/plugins/entry/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/plugins/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/referrers/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/runnable/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/search/operations/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/search/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/startup/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/themes/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties (contents, props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/planet/business/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml (props changed)
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/package.html (props changed)
roller/trunk/app/src/main/resources/propono.properties
roller/trunk/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
roller/trunk/app/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java (props changed)
roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui/ (props changed)
roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
roller/trunk/app/src/test/resources/roller-custom.properties
roller/trunk/app/src/test/resources/uploadsdir/testblog1/sub1/hawk.jpg (props changed)
roller/trunk/app/src/test/resources/uploadsdir/testblog1/sub1/sub2/nasa.jpg (props changed)
roller/trunk/docs/ (props changed)
Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java?rev=1602735&r1=1602734&r2=1602735&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java Sun Jun 15 17:12:43 2014
@@ -16,7 +16,8 @@
*/
package org.apache.roller.planet.util.rome;
-import com.sun.syndication.feed.module.ModuleImpl;
+import com.rometools.rome.feed.CopyFrom;
+import com.rometools.rome.feed.module.ModuleImpl;
public class ContentModuleImpl extends ModuleImpl implements ContentModule {
private String encoded;
@@ -24,18 +25,22 @@ public class ContentModuleImpl extends M
public ContentModuleImpl() {
super(ContentModule.class,ContentModule.URI);
}
+ @Override
public String getEncoded() {
return encoded;
}
+ @Override
public void setEncoded(String encoded) {
this.encoded = encoded;
}
+ @Override
public Class getInterface() {
return ContentModule.class;
}
- public void copyFrom(Object obj) {
+
+ @Override
+ public void copyFrom(CopyFrom obj) {
ContentModule sm = (ContentModule) obj;
setEncoded(sm.getEncoded());
- }
-
+ }
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java?rev=1602735&r1=1602734&r2=1602735&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetConverterForRSS091N.java Sun Jun 15 17:12:43 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/PlanetRSS091NParser.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java?rev=1602735&r1=1602734&r2=1602735&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/planet/util/rome/PlanetRSS091NParser.java Sun Jun 15 17:12:43 2014
@@ -16,11 +16,12 @@
*/
package org.apache.roller.planet.util.rome;
-import org.jdom.Element;
+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 com.rometools.rome.feed.rss.Item;
+import com.rometools.rome.io.impl.DateParser;
+import com.rometools.rome.io.impl.RSS091UserlandParser;
+import java.util.Locale;
/**
*/
@@ -34,11 +35,12 @@ public class PlanetRSS091NParser 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;
}
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/TestUtils.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/WebloggerException.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/WebloggerException.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Resource.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Resource.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStat.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TagStat.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Template.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Template.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/User.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java:r1529475-1602604
Propchange: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java:r1529475-1602604
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java?rev=1602735&r1=1602734&r2=1602735&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java Sun Jun 15 17:12:43 2014
@@ -17,6 +17,10 @@
*/
package org.apache.roller.weblogger.util;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.SyndFeedInput;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -37,10 +41,6 @@ import javax.swing.text.html.HTMLEditorK
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedInput;
/**
* Parses HTML file for referring linkback title and excerpt.
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/planet/config/planet.properties
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/config/planet.properties:r1529475-1602604
Modified: roller/trunk/app/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml?rev=1602735&r1=1602734&r2=1602735&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml Sun Jun 15 17:12:43 2014
@@ -48,31 +48,31 @@
<!-- Site Settings Group -->
<display-group name="siteSettings" key="ConfigForm.siteSettings" >
- <property-def name="site.name" key="ConfigForm.title">
+ <property-def name="planet.site.name" key="ConfigForm.title">
<type>string</type>
<default-value>Roller Planet</default-value>
</property-def>
- <property-def name="site.description" key="ConfigForm.description">
+ <property-def name="planet.site.description" key="ConfigForm.description">
<type>string</type>
<default-value>A default install of the Roller Planet open source aggregation server</default-value>
</property-def>
- <property-def name="site.adminname" key="ConfigForm.adminName">
+ <property-def name="planet.site.adminname" key="ConfigForm.adminName">
<type>string</type>
<default-value></default-value>
</property-def>
- <property-def name="site.adminemail" key="ConfigForm.adminEmail">
+ <property-def name="planet.site.adminemail" key="ConfigForm.adminEmail">
<type>string</type>
<default-value></default-value>
</property-def>
- <property-def name="site.absoluteurl" key="ConfigForm.absoluteUrl">
+ <property-def name="planet.site.absoluteurl" key="ConfigForm.absoluteUrl">
<type>string</type>
<default-value></default-value>
</property-def>
- <property-def name="site.proxyhost" key="ConfigForm.proxyHost">
+ <property-def name="planet.site.proxyhost" key="ConfigForm.proxyHost">
<type>string</type>
<default-value></default-value>
</property-def>
- <property-def name="site.proxyport" key="ConfigForm.proxyPort">
+ <property-def name="planet.site.proxyport" key="ConfigForm.proxyPort">
<type>string</type>
<default-value>0</default-value>
</property-def>
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/jpa/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/jpa/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/pings/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/pings/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/plugins/comment/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/plugins/comment/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/plugins/entry/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/plugins/entry/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/plugins/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/plugins/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/referrers/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/referrers/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/runnable/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/runnable/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/search/operations/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/search/operations/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/search/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/search/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/startup/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/startup/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/themes/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/themes/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/package.html:r1529475-1602604
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1602735&r1=1602734&r2=1602735&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties Sun Jun 15 17:12:43 2014
@@ -427,9 +427,9 @@ rendering.userRequestMappers=
# Url path elements which can NEVER be considered a weblog url
# each represents a url at the application root, i.e. /<elem>/*
rendering.weblogMapper.rollerProtectedUrls=\
-roller-ui,images,theme,themes,CommentAuthenticatorServlet,\
+roller-ui,roller-services,images,theme,themes,CommentAuthenticatorServlet,\
index.jsp,favicon.ico,robots.txt,\
-page,flavor,rss,atom,language,search,comments,rsd,resource,xmlrpc,planetrss
+page,flavor,rss,atom,language,search,comments,rsd,resource,planetrss
# Set of user defined protected urls. These are added to the set above.
rendering.weblogMapper.userProtectedUrls=
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/planet/business/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/business/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
------------------------------------------------------------------------------
Reverse-merged /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFile.orm.xml:r739576-782269
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml
------------------------------------------------------------------------------
Reverse-merged /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml:r739576-782269
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml
------------------------------------------------------------------------------
Reverse-merged /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml:r739576-782269
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml:r1529475-1602604
Propchange: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/package.html
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/package.html:r1529475-1602604
Modified: roller/trunk/app/src/main/resources/propono.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/propono.properties?rev=1602735&r1=1602734&r2=1602735&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/propono.properties (original)
+++ roller/trunk/app/src/main/resources/propono.properties Sun Jun 15 17:12:43 2014
@@ -1,2 +1,2 @@
-com.sun.syndication.propono.atom.server.AtomHandlerFactory=\
+com.rometools.propono.atom.server.AtomHandlerFactory=\
org.apache.roller.weblogger.webservices.atomprotocol.RollerAtomHandlerFactory
Modified: roller/trunk/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java?rev=1602735&r1=1602734&r2=1602735&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java Sun Jun 15 17:12:43 2014
@@ -16,11 +16,14 @@
package org.apache.roller.planet.business;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import junit.framework.TestCase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.TestUtils;
import org.apache.roller.planet.business.fetcher.FeedFetcher;
+import org.apache.roller.planet.business.fetcher.FetcherException;
import org.apache.roller.planet.pojos.Subscription;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -45,37 +48,47 @@ public class RomeFeedFetcherTest extends
}
- public void testFetchFeed() throws Exception {
-
- FeedFetcher feedFetcher = WebloggerFactory.getWeblogger().getFeedFetcher();
-
- // fetch feed
- Subscription sub = feedFetcher.fetchSubscription(feed_url);
- assertNotNull(sub);
- assertEquals(feed_url, sub.getFeedURL());
- assertEquals("http://rollerweblogger.org/roller/", sub.getSiteURL());
- assertEquals("Blogging Roller", sub.getTitle());
- assertNotNull(sub.getLastUpdated());
- assertTrue(sub.getEntries().size() > 0);
+ public void testFetchFeed() throws FetcherException {
+ try {
+ FeedFetcher feedFetcher = WebloggerFactory.getWeblogger().getFeedFetcher();
+
+ // fetch feed
+ Subscription sub = feedFetcher.fetchSubscription(feed_url);
+ assertNotNull(sub);
+ assertEquals(feed_url, sub.getFeedURL());
+ assertEquals("http://rollerweblogger.org/roller/", sub.getSiteURL());
+ assertEquals("Blogging Roller", sub.getTitle());
+ assertNotNull(sub.getLastUpdated());
+ assertTrue(sub.getEntries().size() > 0);
+
+ } catch (FetcherException ex) {
+ log.error("Error fetching feed", ex);
+ throw ex;
+ }
}
- public void testFetchFeedConditionally() throws Exception {
-
- FeedFetcher feedFetcher = WebloggerFactory.getWeblogger().getFeedFetcher();
-
- // fetch feed
- Subscription sub = feedFetcher.fetchSubscription(feed_url);
- assertNotNull(sub);
- assertEquals(feed_url, sub.getFeedURL());
- assertEquals("http://rollerweblogger.org/roller/", sub.getSiteURL());
- assertEquals("Blogging Roller", sub.getTitle());
- assertNotNull(sub.getLastUpdated());
- assertTrue(sub.getEntries().size() > 0);
-
- // now do a conditional fetch and we should get back null
- Subscription updatedSub = feedFetcher.fetchSubscription(feed_url, sub.getLastUpdated());
- assertNull(updatedSub);
+ public void testFetchFeedConditionally() throws FetcherException {
+ try {
+ FeedFetcher feedFetcher = WebloggerFactory.getWeblogger().getFeedFetcher();
+
+ // fetch feed
+ Subscription sub = feedFetcher.fetchSubscription(feed_url);
+ assertNotNull(sub);
+ assertEquals(feed_url, sub.getFeedURL());
+ assertEquals("http://rollerweblogger.org/roller/", sub.getSiteURL());
+ assertEquals("Blogging Roller", sub.getTitle());
+ assertNotNull(sub.getLastUpdated());
+ assertTrue(sub.getEntries().size() > 0);
+
+ // now do a conditional fetch and we should get back null
+ Subscription updatedSub = feedFetcher.fetchSubscription(feed_url, sub.getLastUpdated());
+ assertNull(updatedSub);
+
+ } catch (FetcherException ex) {
+ log.error("Error fetching feed", ex);
+ throw ex;
+ }
}
}
Modified: roller/trunk/app/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java?rev=1602735&r1=1602734&r2=1602735&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java Sun Jun 15 17:12:43 2014
@@ -21,8 +21,8 @@ import java.net.URL;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import com.sun.syndication.fetcher.impl.SyndFeedInfo;
-import com.sun.syndication.fetcher.impl.DiskFeedInfoCache;
+import com.rometools.fetcher.impl.SyndFeedInfo;
+import com.rometools.fetcher.impl.DiskFeedInfoCache;
import org.apache.roller.weblogger.config.WebloggerConfig;
Propchange: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
('svn:mergeinfo' removed)
Propchange: roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui/
------------------------------------------------------------------------------
Reverse-merged /roller/branches/roller_mavenized/weblogger-web/src/test/java/org/apache/roller/weblogger/ui:r894711-895418
Reverse-merged /roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/ui:r1465426-1491055
Merged /roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui:r1529475-1602604
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java?rev=1602735&r1=1602734&r2=1602735&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java Sun Jun 15 17:12:43 2014
@@ -68,6 +68,7 @@ public class LinkbackExtractorTest exten
LinkbackExtractor le = new LinkbackExtractor(testrefs[0][0],testrefs[0][1]);
assertEquals("The Apache Cassandra Project", le.getTitle());
+
le = new LinkbackExtractor(testrefs[1][0],testrefs[1][1]);
assertEquals("Apache Roller Mobile Platform", le.getTitle());
Modified: roller/trunk/app/src/test/resources/roller-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/roller-custom.properties?rev=1602735&r1=1602734&r2=1602735&view=diff
==============================================================================
--- roller/trunk/app/src/test/resources/roller-custom.properties (original)
+++ roller/trunk/app/src/test/resources/roller-custom.properties Sun Jun 15 17:12:43 2014
@@ -30,7 +30,7 @@ themes.dir=${testThemesDir}
search.index.dir=${testIndexDir}
uploads.dir=${testUploadsDir}
mediafiles.storage.dir=${testMediaDir}
-cache.dir=${testPlanetCache}
+cache.dir=${project.build.directory}/planet-cache
# don't auto migrate during tests
uploads.migrate.auto=false
Propchange: roller/trunk/app/src/test/resources/uploadsdir/testblog1/sub1/hawk.jpg
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/test/resources/uploadsdir/testblog1/sub1/hawk.jpg:r1529475-1602604
Propchange: roller/trunk/app/src/test/resources/uploadsdir/testblog1/sub1/sub2/nasa.jpg
------------------------------------------------------------------------------
Merged /roller/branches/rome2/app/src/test/resources/uploadsdir/testblog1/sub1/sub2/nasa.jpg:r1529475-1602604
Propchange: roller/trunk/docs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jun 15 17:12:43 2014
@@ -1 +1,2 @@
.~lock.roller-install-guide.odt#
+.~lock.roller-template-guide.odt#