Author: snoopdave
Date: Sun Jun 2 15:05:28 2013
New Revision: 1488728
URL: http://svn.apache.org/r1488728
Log:
More progress on merging Roller's many modules into 2.
Still have some work to do -> Tests run: 134, Failures: 35, Errors: 15,
Skipped: 0
Added:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java
- copied, changed from r1467824,
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/URLStrategy.java
Removed:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/URLStrategy.java
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Planet.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerModule.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetUIAction.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/TestUtils.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/EntryBasicTests.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/EntryFunctionalTests.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/GroupBasicTests.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/GroupFunctionalTests.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PlanetBasicTests.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PlanetFunctionalTests.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SubscriptionBasicTests.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java
Sun Jun 2 15:05:28 2013
@@ -29,7 +29,7 @@ import org.apache.roller.weblogger.confi
/**
*
*/
-public class MultiPlanetURLStrategy implements URLStrategy {
+public class MultiPlanetURLStrategy implements PlanetURLStrategy {
/**
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Planet.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Planet.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Planet.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Planet.java
Sun Jun 2 15:05:28 2013
@@ -43,7 +43,7 @@ public interface Planet {
/**
* Get the configured URLStrategy.
*/
- public URLStrategy getURLStrategy();
+ public PlanetURLStrategy getURLStrategy();
/**
Copied:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java
(from r1467824,
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/URLStrategy.java)
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java?p2=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java&p1=roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/URLStrategy.java&r1=1467824&r2=1488728&rev=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/URLStrategy.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java
Sun Jun 2 15:05:28 2013
@@ -27,7 +27,7 @@ import java.util.Map;
* Implementations of this interface provide methods which can be used to form
* all of the public urls used by Roller Planet.
*/
-public interface URLStrategy {
+public interface PlanetURLStrategy {
/**
* Get root url for a given planet.
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java
Sun Jun 2 15:05:28 2013
@@ -22,7 +22,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.planet.business.AbstractManagerImpl;
-import org.apache.roller.planet.business.URLStrategy;
+import org.apache.roller.planet.business.PlanetURLStrategy;
import org.apache.roller.planet.business.Planet;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.business.fetcher.FeedFetcher;
@@ -47,7 +47,7 @@ public class JPAPlanetImpl extends Abstr
private final PropertiesManager propertiesManager;
// url strategy
- private final URLStrategy urlStrategy;
+ private final PlanetURLStrategy urlStrategy;
// feed fetcher
private final FeedFetcher feedFetcher;
@@ -58,7 +58,7 @@ public class JPAPlanetImpl extends Abstr
JPAPersistenceStrategy strategy,
PlanetManager planetManager,
PropertiesManager propertiesManager,
- URLStrategy urlStrategy,
+ PlanetURLStrategy urlStrategy,
FeedFetcher feedFetcher) throws RollerException {
this.strategy = strategy;
@@ -122,7 +122,7 @@ public class JPAPlanetImpl extends Abstr
}
- public URLStrategy getURLStrategy() {
+ public PlanetURLStrategy getURLStrategy() {
return this.urlStrategy;
}
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
Sun Jun 2 15:05:28 2013
@@ -97,7 +97,7 @@ public class SingleThreadedFeedUpdater i
Set<SubscriptionEntry> newEntries = updatedSub.getEntries();
log.debug("newEntries.size() = " + newEntries.size());
if (newEntries.size() > 0) try {
- PlanetManager pmgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager pmgr =
WebloggerFactory.getWeblogger().getPlanetManager();
// clear out old entries
pmgr.deleteEntries(sub);
@@ -137,7 +137,7 @@ public class SingleThreadedFeedUpdater i
try {
// update all subscriptions in the system
- PlanetManager pmgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager pmgr =
WebloggerFactory.getWeblogger().getPlanetManager();
updateSubscriptions(pmgr.getSubscriptions());
} catch (RollerException ex) {
throw new UpdaterException("Error getting subscriptions list",
ex);
@@ -175,7 +175,7 @@ public class SingleThreadedFeedUpdater i
// convenience method which handles updating any arbitrary collection of
subs
private void updateSubscriptions(Collection<Subscription> subscriptions) {
- PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager pmgr =
WebloggerFactory.getWeblogger().getPlanetManager();
for (Subscription sub : subscriptions) {
try {
// reattach sub. sub gets detached as we
iterate
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
Sun Jun 2 15:05:28 2013
@@ -186,7 +186,7 @@ public class PlanetGroup implements Seri
* Return a list of the most recent 10 entries from this group.
*/
public List getRecentEntries() {
- PlanetManager mgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
try {
return mgr.getEntries(this, 0, 10);
} catch(Exception e) {
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
Sun Jun 2 15:05:28 2013
@@ -52,7 +52,7 @@ public class GeneratePlanetTask extends
public void run() {
try {
Weblogger weblogger = WebloggerFactory.getWeblogger();
- PlanetManager planetManager = weblogger.getWebloggerManager();
+ PlanetManager planetManager = weblogger.getPlanetManager();
// Ignore values from database
//String mainPage =
planetManager.getConfiguration().getMainPage();
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java
Sun Jun 2 15:05:28 2013
@@ -40,7 +40,7 @@ public class StaticPlanetModel {
public StaticPlanetModel() throws RollerException {
Weblogger planet = WebloggerFactory.getWeblogger();
- planetManager = planet.getWebloggerManager();
+ planetManager = planet.getPlanetManager();
}
// TODO: replace this with something equivalent
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/Weblogger.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
Sun Jun 2 15:05:28 2013
@@ -193,12 +193,9 @@ public interface Weblogger {
*/
public String getBuildUser();
- public PlanetManager getWebloggerManager();
-
public FeedFetcher getFeedFetcher();
public PlanetManager getPlanetManager();
- public org.apache.roller.planet.business.URLStrategy getURLStrategy();
-
+ public org.apache.roller.planet.business.PlanetURLStrategy
getPlanetURLStrategy();
}
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
Sun Jun 2 15:05:28 2013
@@ -23,6 +23,8 @@ import java.io.IOException;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.planet.business.PlanetManager;
+import org.apache.roller.planet.business.fetcher.FeedFetcher;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.pings.PingQueueManager;
@@ -64,9 +66,12 @@ public abstract class WebloggerImpl impl
private final WeblogManager weblogManager;
private final WeblogEntryManager weblogEntryManager;
private final OAuthManager oauthManager;
+ private final FeedFetcher feedFetcher;
+ private final PlanetManager planetManager;
// url strategy
private final URLStrategy urlStrategy;
+ private final org.apache.roller.planet.business.PlanetURLStrategy
planetUrlStrategy;
// some simple attributes
private final String version;
@@ -93,6 +98,9 @@ public abstract class WebloggerImpl impl
WeblogManager weblogManager,
WeblogEntryManager weblogEntryManager,
OAuthManager oauthManager,
+ FeedFetcher feedFetcher,
+ PlanetManager planetManager,
+ org.apache.roller.planet.business.PlanetURLStrategy planetUrlStrategy,
URLStrategy urlStrategy) throws WebloggerException {
this.autoPingManager = autoPingManager;
@@ -113,7 +121,10 @@ public abstract class WebloggerImpl impl
this.weblogEntryManager = weblogEntryManager;
this.oauthManager = oauthManager;
this.urlStrategy = urlStrategy;
-
+ this.feedFetcher = feedFetcher;
+ this.planetManager = planetManager;
+ this.planetUrlStrategy = planetUrlStrategy;
+
Properties props = new Properties();
try {
props.load(getClass().getResourceAsStream("/roller-version.properties"));
@@ -302,8 +313,19 @@ public abstract class WebloggerImpl impl
public URLStrategy getUrlStrategy() {
return urlStrategy;
}
-
-
+
+ public FeedFetcher getFeedFetcher() {
+ return feedFetcher;
+ }
+
+ public PlanetManager getPlanetManager() {
+ return planetManager;
+ }
+
+ public org.apache.roller.planet.business.PlanetURLStrategy
getPlanetURLStrategy() {
+ return planetUrlStrategy;
+ }
+
/**
* @inheritDoc
*/
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
Sun Jun 2 15:05:28 2013
@@ -19,6 +19,9 @@ package org.apache.roller.weblogger.busi
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.planet.business.PlanetManager;
+import org.apache.roller.planet.business.PlanetURLStrategy;
+import org.apache.roller.planet.business.fetcher.FeedFetcher;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.FileContentManager;
@@ -78,6 +81,9 @@ public class JPAWebloggerImpl extends We
WeblogManager weblogManager,
WeblogEntryManager weblogEntryManager,
OAuthManager oauthManager,
+ FeedFetcher feedFetcher,
+ PlanetManager planetManager,
+ PlanetURLStrategy planetUrlStrategy,
URLStrategy urlStrategy) throws WebloggerException {
super(
@@ -98,6 +104,9 @@ public class JPAWebloggerImpl extends We
weblogManager,
weblogEntryManager,
oauthManager,
+ feedFetcher,
+ planetManager,
+ planetUrlStrategy,
urlStrategy);
this.strategy = strategy;
@@ -123,4 +132,5 @@ public class JPAWebloggerImpl extends We
// then let parent do its thing
super.shutdown();
}
+
}
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerModule.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerModule.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerModule.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerModule.java
Sun Jun 2 15:05:28 2013
@@ -25,6 +25,7 @@ import net.oauth.SimpleOAuthValidator;
import org.apache.roller.planet.business.MultiPlanetURLStrategy;
import org.apache.roller.planet.business.Planet;
import org.apache.roller.planet.business.PlanetManager;
+import org.apache.roller.planet.business.PlanetURLStrategy;
import org.apache.roller.planet.business.fetcher.FeedFetcher;
import org.apache.roller.planet.business.fetcher.RomeFeedFetcher;
import org.apache.roller.planet.business.jpa.JPAPlanetImpl;
@@ -89,13 +90,10 @@ public class JPAWebloggerModule implemen
binder.bind(ThemeManager.class).to( ThemeManagerImpl.class);
binder.bind(URLStrategy.class).to( MultiWeblogURLStrategy.class);
-
- binder.bind(Planet.class).to(JPAPlanetImpl.class);
-
- binder.bind(PlanetManager.class).to( JPAPlanetManagerImpl.class);
- binder.bind(PropertiesManager.class).to(
JPAPropertiesManagerImpl.class);
- //binder.bind(URLStrategy.class).to(
MultiPlanetURLStrategy.class);
- binder.bind(FeedFetcher.class).to( RomeFeedFetcher.class);
+ binder.bind(PlanetURLStrategy.class).to(
MultiPlanetURLStrategy.class);
+ binder.bind(Planet.class).to( JPAPlanetImpl.class);
+ binder.bind(PlanetManager.class).to( JPAPlanetManagerImpl.class);
+ binder.bind(FeedFetcher.class).to( RomeFeedFetcher.class);
}
}
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
Sun Jun 2 15:05:28 2013
@@ -137,7 +137,7 @@ public class SyncWebsitesTask extends Ro
log.info("Syncing local weblogs with planet subscriptions list");
try {
- PlanetManager pmgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager pmgr =
WebloggerFactory.getWeblogger().getPlanetManager();
// first, make sure there is an "all" pmgr group
Planet planetObject =
pmgr.getWebloggerById("zzz_default_planet_zzz");
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
Sun Jun 2 15:05:28 2013
@@ -64,8 +64,8 @@ public class PlanetGroups extends Planet
@Override
public void myPrepare() {
- if(getWeblogger() != null && getBean().getId() != null) try {
- PlanetManager pmgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ if(getPlanet() != null && getBean().getId() != null) try {
+ PlanetManager pmgr =
WebloggerFactory.getWeblogger().getPlanetManager();
setGroup(pmgr.getGroupById(getBean().getId()));
} catch(Exception ex) {
log.error("Error looking up planet group - "+getBean().getId(),
ex);
@@ -100,7 +100,7 @@ public class PlanetGroups extends Planet
if(group == null) {
log.debug("Adding New Group");
group = new PlanetGroup();
- group.setPlanet(getWeblogger());
+ group.setPlanet(getPlanet());
} else {
log.debug("Updating Existing Group");
}
@@ -109,7 +109,7 @@ public class PlanetGroups extends Planet
getBean().copyTo(group);
// save and flush
- PlanetManager pmgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager pmgr =
WebloggerFactory.getWeblogger().getPlanetManager();
pmgr.saveGroup(group);
WebloggerFactory.getWeblogger().flush();
@@ -132,7 +132,7 @@ public class PlanetGroups extends Planet
if(getGroup() != null) {
try {
- PlanetManager pmgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager pmgr =
WebloggerFactory.getWeblogger().getPlanetManager();
pmgr.deleteGroup(getGroup());
WebloggerFactory.getWeblogger().flush();
@@ -173,7 +173,7 @@ public class PlanetGroups extends Planet
List<PlanetGroup> displayGroups = new ArrayList();
- Iterator allgroups = getWeblogger().getGroups().iterator();
+ Iterator allgroups = getPlanet().getGroups().iterator();
while (allgroups.hasNext()) {
PlanetGroup agroup = (PlanetGroup) allgroups.next();
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
Sun Jun 2 15:05:28 2013
@@ -70,7 +70,7 @@ public class PlanetSubscriptions extends
@Override
public void myPrepare() {
- PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager pmgr =
WebloggerFactory.getWeblogger().getPlanetManager();
// lookup group we are operating on, if none specified then use default
if (getGroupHandle() == null) {
@@ -78,7 +78,7 @@ public class PlanetSubscriptions extends
}
try {
- setGroup(pmgr.getGroup(getWeblogger(), getGroupHandle()));
+ setGroup(pmgr.getGroup(getPlanet(), getGroupHandle()));
} catch (RollerException ex) {
log.error("Error looking up planet group - "+getGroupHandle(),
ex);
}
@@ -101,7 +101,7 @@ public class PlanetSubscriptions extends
myValidate();
if(!hasActionErrors()) try {
- PlanetManager pmgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager pmgr =
WebloggerFactory.getWeblogger().getPlanetManager();
// check if this subscription already exists before adding it
Subscription sub = pmgr.getSubscription(getSubUrl());
@@ -150,7 +150,7 @@ public class PlanetSubscriptions extends
if(getSubUrl() != null) try {
- PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager pmgr =
WebloggerFactory.getWeblogger().getPlanetManager();
// remove subscription
Subscription sub = pmgr.getSubscription(getSubUrl());
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetUIAction.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetUIAction.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetUIAction.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetUIAction.java
Sun Jun 2 15:05:28 2013
@@ -37,10 +37,10 @@ public abstract class PlanetUIAction ext
private Planet planet = null;
- public Planet getWeblogger() {
+ public Planet getPlanet() {
if(planet == null) {
try {
- PlanetManager pmgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager pmgr =
WebloggerFactory.getWeblogger().getPlanetManager();
planet = pmgr.getWeblogger(DEFAULT_PLANET_HANDLE);
} catch(Exception ex) {
log.error("Error loading weblogger planet -
"+DEFAULT_PLANET_HANDLE, ex);
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
Sun Jun 2 15:05:28 2013
@@ -49,14 +49,14 @@ public class PlanetModel implements Mode
private static Log log = LogFactory.getLog(PlanetModel.class);
- private WeblogRequest weblogRequest = null;
+ private WeblogRequest weblogRequest = null;
private String pageLink = null;
private int pageNum = 0;
private Weblog weblog = null;
private URLStrategy urlStrategy = null;
- private org.apache.roller.planet.business.URLStrategy planetUrlStrategy =
null;
-
+ private org.apache.roller.planet.business.PlanetURLStrategy
planetUrlStrategy = null;
+
public String getModelName() {
return "planet";
@@ -84,7 +84,7 @@ public class PlanetModel implements Mode
urlStrategy = WebloggerFactory.getWeblogger().getUrlStrategy();
}
- planetUrlStrategy = WebloggerFactory.getWeblogger().getURLStrategy();
+ planetUrlStrategy =
WebloggerFactory.getWeblogger().getPlanetURLStrategy();
// extract weblog object
weblog = weblogRequest.getWeblog();
@@ -184,7 +184,7 @@ public class PlanetModel implements Mode
public List getRankedSubscriptions(String groupHandle, int sinceDays, int
length) {
List list = new ArrayList();
try {
- PlanetManager planetManager =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager planetManager =
WebloggerFactory.getWeblogger().getPlanetManager();
Planet defaultPlanet =
planetManager.getWeblogger(DEFAULT_PLANET_HANDLE);
PlanetGroup planetGroup = planetManager.getGroup(defaultPlanet,
groupHandle);
List subs = planetManager.getTopSubscriptions(planetGroup, 0,
length);
@@ -207,7 +207,7 @@ public class PlanetModel implements Mode
public List<PlanetGroup> getGroups() {
List list = new ArrayList<PlanetGroup>();
try {
- PlanetManager planetManager =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager planetManager =
WebloggerFactory.getWeblogger().getPlanetManager();
Planet defaultPlanet =
planetManager.getWeblogger(DEFAULT_PLANET_HANDLE);
Set<PlanetGroup> groups =
(Set<PlanetGroup>)defaultPlanet.getGroups();
for (PlanetGroup group : groups) {
@@ -229,7 +229,7 @@ public class PlanetModel implements Mode
public PlanetGroup getGroup(String groupHandle) {
PlanetGroup group = null;
try {
- PlanetManager planetManager =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager planetManager =
WebloggerFactory.getWeblogger().getPlanetManager();
Planet defaultPlanet =
planetManager.getWeblogger(DEFAULT_PLANET_HANDLE);
// TODO needs pojo wrapping from planet
group = planetManager.getGroup(defaultPlanet, groupHandle);
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
Sun Jun 2 15:05:28 2013
@@ -93,7 +93,7 @@ public class PlanetEntriesPager extends
List results = new ArrayList();
try {
- PlanetManager planetManager =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager planetManager =
WebloggerFactory.getWeblogger().getPlanetManager();
Planet planet = planetManager.getWeblogger("default");
List entries = null;
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/TestUtils.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/TestUtils.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/TestUtils.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/TestUtils.java
Sun Jun 2 15:05:28 2013
@@ -81,7 +81,7 @@ public final class TestUtils {
Planet testPlanet = new Planet(handle, handle, handle);
// store
- PlanetManager mgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
mgr.savePlanet(testPlanet);
// flush
@@ -103,7 +103,7 @@ public final class TestUtils {
public static void teardownPlanet(String id) throws Exception {
// lookup
- PlanetManager mgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
Planet planet = mgr.getWebloggerById(id);
// remove
@@ -120,7 +120,7 @@ public final class TestUtils {
public static PlanetGroup setupGroup(Planet planet, String handle)
throws Exception {
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
// make sure we are using a persistent object
Planet testPlanet = mgr.getWebloggerById(planet.getId());
@@ -149,7 +149,7 @@ public final class TestUtils {
public static void teardownGroup(String id) throws Exception {
// lookup
- PlanetManager mgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
PlanetGroup group = mgr.getGroupById(id);
// remove
@@ -167,7 +167,7 @@ public final class TestUtils {
public static Subscription setupSubscription(String feedUrl)
throws Exception {
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
// store
Subscription testSub = new Subscription();
@@ -194,7 +194,7 @@ public final class TestUtils {
public static void teardownSubscription(String id) throws Exception {
// lookup
- PlanetManager mgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
Subscription sub = mgr.getSubscriptionById(id);
// remove
@@ -211,7 +211,7 @@ public final class TestUtils {
public static SubscriptionEntry setupEntry(Subscription sub, String title)
throws Exception {
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
// make sure we are using a persistent object
Subscription testSub = mgr.getSubscriptionById(sub.getId());
@@ -244,7 +244,7 @@ public final class TestUtils {
public static void teardownEntry(String id) throws Exception {
// lookup
- PlanetManager mgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
SubscriptionEntry entry = mgr.getEntryById(id);
// remove
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/EntryBasicTests.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/EntryBasicTests.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/EntryBasicTests.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/EntryBasicTests.java
Sun Jun 2 15:05:28 2013
@@ -46,7 +46,7 @@ public class EntryBasicTests extends Tes
public void testEntryCRUD() throws Exception {
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
Subscription sub = mgr.getSubscriptionById(testSub.getId());
SubscriptionEntry testEntry = new SubscriptionEntry();
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/EntryFunctionalTests.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/EntryFunctionalTests.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/EntryFunctionalTests.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/EntryFunctionalTests.java
Sun Jun 2 15:05:28 2013
@@ -65,7 +65,7 @@ public class EntryFunctionalTests extend
testGroup1.getSubscriptions().add(testSub2);
testSub2.getGroups().add(testGroup1);
- WebloggerFactory.getWeblogger().getWebloggerManager().saveGroup(testGroup1);
+
WebloggerFactory.getWeblogger().getPlanetManager().saveGroup(testGroup1);
WebloggerFactory.getWeblogger().flush();
log.info("EXITED");
@@ -86,7 +86,7 @@ public class EntryFunctionalTests extend
public void testEntryLookups() throws Exception {
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
// by id
SubscriptionEntry entry = mgr.getEntryById(testEntry1.getId());
@@ -111,7 +111,7 @@ public class EntryFunctionalTests extend
public void testDeleteEntries() throws Exception {
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
Subscription sub = mgr.getSubscriptionById(testSub2.getId());
// make sure entries are there
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/GroupBasicTests.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/GroupBasicTests.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/GroupBasicTests.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/GroupBasicTests.java
Sun Jun 2 15:05:28 2013
@@ -46,7 +46,7 @@ public class GroupBasicTests extends Tes
public void testGroupCRUD() throws Exception {
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
PlanetGroup testGroup = new PlanetGroup();
testGroup.setDescription("test_group_desc");
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/GroupFunctionalTests.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/GroupFunctionalTests.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/GroupFunctionalTests.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/GroupFunctionalTests.java
Sun Jun 2 15:05:28 2013
@@ -53,7 +53,7 @@ public class GroupFunctionalTests extend
public void testGroupLookups() throws Exception {
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
// lookup group by id
PlanetGroup group = mgr.getGroupById(testGroup1.getId());
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PlanetBasicTests.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PlanetBasicTests.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PlanetBasicTests.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PlanetBasicTests.java
Sun Jun 2 15:05:28 2013
@@ -37,7 +37,7 @@ public class PlanetBasicTests extends Te
// setup planet
TestUtils.setupPlanet();
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
Planet testPlanet = new Planet("testPlanet", "testPlanet", "testPlanet");
Planet planet = null;
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PlanetFunctionalTests.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PlanetFunctionalTests.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PlanetFunctionalTests.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PlanetFunctionalTests.java
Sun Jun 2 15:05:28 2013
@@ -53,7 +53,7 @@ public class PlanetFunctionalTests exten
*/
public void testPlanetLookups() throws Exception {
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
Planet planet = null;
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
Sun Jun 2 15:05:28 2013
@@ -43,7 +43,7 @@ public class SingleThreadedFeedUpdaterTe
TestUtils.setupPlanet();
// add test subscription
- PlanetManager mgr =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
testSub = new Subscription();
testSub.setTitle(feed_url);
testSub.setFeedURL(feed_url);
@@ -59,7 +59,7 @@ public class SingleThreadedFeedUpdaterTe
public void testUpdateSubscription() throws Exception {
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
Subscription sub = mgr.getSubscriptionById(testSub.getId());
// update the subscription
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SubscriptionBasicTests.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SubscriptionBasicTests.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SubscriptionBasicTests.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SubscriptionBasicTests.java
Sun Jun 2 15:05:28 2013
@@ -33,7 +33,7 @@ public class SubscriptionBasicTests exte
// setup planet
TestUtils.setupPlanet();
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
Subscription testSub = new Subscription();
testSub.setFeedURL("test_title");
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java
Sun Jun 2 15:05:28 2013
@@ -59,7 +59,7 @@ public class SubscriptionFunctionalTests
public void testSubscriptionLookups() throws Exception {
- PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
// by id
Subscription sub = mgr.getSubscriptionById(testSub1.getId());
@@ -79,7 +79,7 @@ public class SubscriptionFunctionalTests
public void testSubscriptionGroupCRUD() throws Exception {
- PlanetManager planet = WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager planet =
WebloggerFactory.getWeblogger().getPlanetManager();
// retrieve subscriptions and add to group
Subscription sub1 = planet.getSubscriptionById(testSub1.getId());
Modified:
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java?rev=1488728&r1=1488727&r2=1488728&view=diff
==============================================================================
---
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
(original)
+++
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
Sun Jun 2 15:05:28 2013
@@ -126,7 +126,7 @@ public class PlanetManagerLocalTest exte
public void testRefreshEntries() {
try {
- PlanetManager planet =
WebloggerFactory.getWeblogger().getWebloggerManager();
+ PlanetManager planet =
WebloggerFactory.getWeblogger().getPlanetManager();
// run sync task to fill aggregator with websites created by super
SyncWebsitesTask syncTask = new SyncWebsitesTask();
