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 2013/04/14 22:32:27 UTC
svn commit: r1467825 [2/2] - in
/roller/branches/fewer_modules/weblogger-webapp: ./
src/main/java/org/apache/roller/planet/
src/main/java/org/apache/roller/planet/business/
src/main/java/org/apache/roller/planet/business/fetcher/
src/main/java/org/apac...
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java Sun Apr 14 20:32:25 2013
@@ -25,13 +25,13 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.planet.business.PlanetFactory;
-import org.apache.roller.planet.business.PropertiesManager;
-import org.apache.roller.planet.config.PlanetRuntimeConfig;
-import org.apache.roller.planet.config.runtime.ConfigDef;
-import org.apache.roller.planet.config.runtime.RuntimeConfigDefs;
-import org.apache.roller.planet.pojos.RuntimeConfigProperty;
+import org.apache.roller.weblogger.business.PropertiesManager;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
+import org.apache.roller.weblogger.config.runtime.ConfigDef;
+import org.apache.roller.weblogger.config.runtime.RuntimeConfigDefs;
import org.apache.roller.weblogger.pojos.GlobalPermission;
+import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
import org.apache.struts2.interceptor.ParameterAware;
@@ -76,14 +76,14 @@ public class PlanetConfig extends Planet
public void myPrepare() {
try {
// just grab our properties map
- PropertiesManager pMgr = PlanetFactory.getPlanet().getPropertiesManager();
+ PropertiesManager pMgr = WebloggerFactory.getWeblogger().getPropertiesManager();
setProperties(pMgr.getProperties());
} catch (RollerException ex) {
log.error("Error loading planet properties");
}
// set config def used to draw the view
- RuntimeConfigDefs defs = PlanetRuntimeConfig.getRuntimeConfigDefs();
+ RuntimeConfigDefs defs = WebloggerRuntimeConfig.getRuntimeConfigDefs();
List<ConfigDef> configDefs = defs.getConfigDefs();
for(ConfigDef configDef : configDefs) {
if("global-properties".equals(configDef.getName())) {
@@ -140,9 +140,9 @@ public class PlanetConfig extends Planet
}
// save it
- PropertiesManager pMgr = PlanetFactory.getPlanet().getPropertiesManager();
+ PropertiesManager pMgr = WebloggerFactory.getWeblogger().getPropertiesManager();
pMgr.saveProperties(this.properties);
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
addMessage("ConfigForm.message.saveSucceeded");
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -23,9 +23,9 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.PlanetGroup;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -64,8 +64,8 @@ public class PlanetGroups extends Planet
@Override
public void myPrepare() {
- if(getPlanet() != null && getBean().getId() != null) try {
- PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
+ if(getWeblogger() != null && getBean().getId() != null) try {
+ PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
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(getPlanet());
+ group.setPlanet(getWeblogger());
} else {
log.debug("Updating Existing Group");
}
@@ -109,9 +109,9 @@ public class PlanetGroups extends Planet
getBean().copyTo(group);
// save and flush
- PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
pmgr.saveGroup(group);
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
addMessage("planetGroups.success.saved");
@@ -132,9 +132,9 @@ public class PlanetGroups extends Planet
if(getGroup() != null) {
try {
- PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
pmgr.deleteGroup(getGroup());
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
addMessage("planetSubscription.success.deleted");
} catch(Exception ex) {
@@ -173,7 +173,7 @@ public class PlanetGroups extends Planet
List<PlanetGroup> displayGroups = new ArrayList();
- Iterator allgroups = getPlanet().getGroups().iterator();
+ Iterator allgroups = getWeblogger().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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -24,11 +24,11 @@ import org.apache.commons.lang.StringUti
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.business.fetcher.FeedFetcher;
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.GlobalPermission;
@@ -70,7 +70,7 @@ public class PlanetSubscriptions extends
@Override
public void myPrepare() {
- PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
// 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(getPlanet(), getGroupHandle()));
+ setGroup(pmgr.getGroup(getWeblogger(), 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 = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
// check if this subscription already exists before adding it
Subscription sub = pmgr.getSubscription(getSubUrl());
@@ -109,7 +109,7 @@ public class PlanetSubscriptions extends
log.debug("Adding New Subscription - "+getSubUrl());
// sub doesn't exist yet, so we need to fetch it
- FeedFetcher fetcher = PlanetFactory.getPlanet().getFeedFetcher();
+ FeedFetcher fetcher = WebloggerFactory.getWeblogger().getFeedFetcher();
sub = fetcher.fetchSubscription(getSubUrl());
// save new sub
@@ -127,7 +127,7 @@ public class PlanetSubscriptions extends
pmgr.saveGroup(group);
// flush changes
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
// clear field after success
setSubUrl(null);
@@ -150,14 +150,14 @@ public class PlanetSubscriptions extends
if(getSubUrl() != null) try {
- PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
// remove subscription
Subscription sub = pmgr.getSubscription(getSubUrl());
getGroup().getSubscriptions().remove(sub);
sub.getGroups().remove(getGroup());
pmgr.saveGroup(getGroup());
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
// clear field after success
setSubUrl(null);
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -18,9 +18,9 @@ package org.apache.roller.weblogger.plan
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.Planet;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -37,11 +37,11 @@ public abstract class PlanetUIAction ext
private Planet planet = null;
- public Planet getPlanet() {
+ public Planet getWeblogger() {
if(planet == null) {
try {
- PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
- planet = pmgr.getPlanet(DEFAULT_PLANET_HANDLE);
+ PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ 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/core/RollerContext.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java Sun Apr 14 20:32:25 2013
@@ -36,15 +36,12 @@ import org.springframework.security.prov
import org.springframework.security.ui.webapp.AuthenticationProcessingFilterEntryPoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.business.GuicePlanetProvider;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.BootstrapException;
import org.apache.roller.weblogger.business.startup.StartupException;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetProvider;
-import org.apache.roller.planet.business.startup.PlanetStartup;
import org.apache.roller.weblogger.business.startup.WebloggerStartup;
import org.apache.roller.weblogger.ui.core.plugins.UIPluginManager;
import org.apache.roller.weblogger.ui.core.plugins.UIPluginManagerImpl;
@@ -165,37 +162,8 @@ public class RollerContext extends Conte
} catch (WebloggerException ex) {
log.fatal("Roller Weblogger initialization failed", ex);
}
+ }
- // Initialize Planet if necessary
- if (WebloggerFactory.isBootstrapped()) {
- if (WebloggerConfig.getBooleanProperty("planet.aggregator.enabled")) {
-
- // Now prepare the core services of planet so we can bootstrap it
- try {
- PlanetStartup.prepare();
- } catch (Throwable ex) {
- log.fatal("Roller Planet startup failed during app preparation", ex);
- return;
- }
-
- try {
- // trigger planet bootstrapping process
- // we need to use our own planet provider for integration
- String guiceModule = WebloggerConfig.getProperty("planet.aggregator.guice.module");
- PlanetProvider provider = new GuicePlanetProvider(guiceModule);
- PlanetFactory.bootstrap(provider);
-
- // and now initialize planet
- PlanetFactory.getPlanet().initialize();
-
- } catch (Throwable t) {
- log.fatal("Roller Planet initialization failed", t);
- }
- }
- }
- }
-
-
// do a small amount of work to initialize the web tier
try {
// Initialize Acegi based on Roller configuration
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java Sun Apr 14 20:32:25 2013
@@ -31,7 +31,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.planet.business.PlanetFactory;
/**
@@ -65,8 +64,8 @@ public class PersistenceSessionFilter im
// if planet is enabled then release planet backend as well
if (WebloggerConfig.getBooleanProperty("planet.aggregator.enabled")) {
- if (PlanetFactory.isBootstrapped()) {
- PlanetFactory.getPlanet().release();
+ if (WebloggerFactory.isBootstrapped()) {
+ WebloggerFactory.getWeblogger().release();
}
}
}
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -26,7 +26,6 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.Planet;
import org.apache.roller.planet.pojos.PlanetGroup;
@@ -85,7 +84,7 @@ public class PlanetModel implements Mode
urlStrategy = WebloggerFactory.getWeblogger().getUrlStrategy();
}
- planetUrlStrategy = PlanetFactory.getPlanet().getURLStrategy();
+ planetUrlStrategy = WebloggerFactory.getWeblogger().getURLStrategy();
// extract weblog object
weblog = weblogRequest.getWeblog();
@@ -185,8 +184,8 @@ public class PlanetModel implements Mode
public List getRankedSubscriptions(String groupHandle, int sinceDays, int length) {
List list = new ArrayList();
try {
- PlanetManager planetManager = PlanetFactory.getPlanet().getPlanetManager();
- Planet defaultPlanet = planetManager.getPlanet(DEFAULT_PLANET_HANDLE);
+ PlanetManager planetManager = WebloggerFactory.getWeblogger().getWebloggerManager();
+ Planet defaultPlanet = planetManager.getWeblogger(DEFAULT_PLANET_HANDLE);
PlanetGroup planetGroup = planetManager.getGroup(defaultPlanet, groupHandle);
List subs = planetManager.getTopSubscriptions(planetGroup, 0, length);
for (Iterator it = subs.iterator(); it.hasNext();) {
@@ -208,8 +207,8 @@ public class PlanetModel implements Mode
public List<PlanetGroup> getGroups() {
List list = new ArrayList<PlanetGroup>();
try {
- PlanetManager planetManager = PlanetFactory.getPlanet().getPlanetManager();
- Planet defaultPlanet = planetManager.getPlanet(DEFAULT_PLANET_HANDLE);
+ PlanetManager planetManager = WebloggerFactory.getWeblogger().getWebloggerManager();
+ Planet defaultPlanet = planetManager.getWeblogger(DEFAULT_PLANET_HANDLE);
Set<PlanetGroup> groups = (Set<PlanetGroup>)defaultPlanet.getGroups();
for (PlanetGroup group : groups) {
// TODO needs pojo wrapping from planet
@@ -230,8 +229,8 @@ public class PlanetModel implements Mode
public PlanetGroup getGroup(String groupHandle) {
PlanetGroup group = null;
try {
- PlanetManager planetManager = PlanetFactory.getPlanet().getPlanetManager();
- Planet defaultPlanet = planetManager.getPlanet(DEFAULT_PLANET_HANDLE);
+ PlanetManager planetManager = WebloggerFactory.getWeblogger().getWebloggerManager();
+ Planet defaultPlanet = planetManager.getWeblogger(DEFAULT_PLANET_HANDLE);
// TODO needs pojo wrapping from planet
group = planetManager.getGroup(defaultPlanet, groupHandle);
} catch (Exception e) {
@@ -241,17 +240,17 @@ public class PlanetModel implements Mode
}
- public String getPlanetURL() {
+ public String getWebloggerURL() {
return planetUrlStrategy.getPlanetURL("ignored");
}
- public String getPlanetGroupURL(String group, int pageNum) {
+ public String getWebloggerGroupURL(String group, int pageNum) {
return planetUrlStrategy.getPlanetGroupURL("ignored", group, pageNum);
}
- public String getPlanetFeedURL(String group, String format) {
+ public String getWebloggerFeedURL(String group, String format) {
return planetUrlStrategy.getPlanetGroupFeedURL("ignored", group, format);
}
}
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -25,13 +25,13 @@ import java.util.Iterator;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.Planet;
import org.apache.roller.planet.pojos.SubscriptionEntry;
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
import org.apache.roller.weblogger.business.URLStrategy;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -93,8 +93,8 @@ public class PlanetEntriesPager extends
List results = new ArrayList();
try {
- PlanetManager planetManager = PlanetFactory.getPlanet().getPlanetManager();
- Planet planet = planetManager.getPlanet("default");
+ PlanetManager planetManager = WebloggerFactory.getWeblogger().getWebloggerManager();
+ Planet planet = planetManager.getWeblogger("default");
List entries = null;
if (feedURL != null) {
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java Sun Apr 14 20:32:25 2013
@@ -30,10 +30,9 @@ import org.apache.commons.lang.StringUti
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
-import org.apache.roller.planet.config.PlanetRuntimeConfig;
import org.apache.roller.planet.pojos.Planet;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.StaticTemplate;
import org.apache.roller.weblogger.pojos.Template;
import org.apache.roller.weblogger.ui.rendering.Renderer;
@@ -76,7 +75,7 @@ public class PlanetFeedServlet extends H
log.debug("Entering");
- PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager planet = WebloggerFactory.getWeblogger().getPlanetManager();
PlanetRequest planetRequest = null;
try {
@@ -127,17 +126,17 @@ public class PlanetFeedServlet extends H
try {
// populate the rendering model
if (request.getParameter("group") != null) {
- Planet planetObject = planet.getPlanet("default");
+ Planet planetObject = planet.getWeblogger("default");
model.put("group", planet.getGroup(planetObject, request.getParameter("group")));
}
model.put("planet", planet);
model.put("date", new Date());
model.put("utils", new UtilitiesModel());
- model.put("siteName", PlanetRuntimeConfig.getProperty("site.name"));
- model.put("siteDescription", PlanetRuntimeConfig.getProperty("site.description"));
+ model.put("siteName", WebloggerRuntimeConfig.getProperty("site.name"));
+ model.put("siteDescription", WebloggerRuntimeConfig.getProperty("site.description"));
model.put("lastModified", lastModified);
- if (StringUtils.isNotEmpty(PlanetRuntimeConfig.getProperty("site.absoluteurl"))) {
- model.put("absoluteSite", PlanetRuntimeConfig.getProperty("site.absoluteurl"));
+ if (StringUtils.isNotEmpty(WebloggerRuntimeConfig.getProperty("site.absoluteurl"))) {
+ model.put("absoluteSite", WebloggerRuntimeConfig.getProperty("site.absoluteurl"));
} else {
model.put("absoluteSite", WebloggerRuntimeConfig.getAbsoluteContextURL());
}
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java Sun Apr 14 20:32:25 2013
@@ -157,7 +157,7 @@ public class PlanetCache {
if(lastModified == null) {
// TODO: ROLLER40 last updated for planet
- lastModified = null; // PlanetFactory.getPlanet().getPlanetManager().getLastUpdated();
+ lastModified = null; // WebloggerFactory.getWeblogger().getWebloggerManager().getLastUpdated();
if (lastModified == null) {
lastModified = new Date();
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java Sun Apr 14 20:32:25 2013
@@ -24,10 +24,7 @@ import java.sql.Connection;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.business.GuicePlanetProvider;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetProvider;
-import org.apache.roller.planet.business.startup.PlanetStartup;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.startup.StartupException;
@@ -163,24 +160,10 @@ public class Install extends UIAction {
// Now prepare the core services of planet so we can bootstrap it
try {
- PlanetStartup.prepare();
+ WebloggerStartup.prepare();
} catch (Throwable ex) {
log.fatal("Roller Planet startup failed during app preparation", ex);
}
-
- try {
- // trigger planet bootstrapping process
- // we planet to use our own planet provider for integration
- String guiceModule = WebloggerConfig.getProperty("planet.aggregator.guice.module");
- PlanetProvider provider = new GuicePlanetProvider(guiceModule);
- PlanetFactory.bootstrap(provider);
-
- // and now initialize planet
- PlanetFactory.getPlanet().initialize();
-
- } catch (Throwable t) {
- log.fatal("Roller Planet bootstrapping failed", t);
- }
}
log.info("EXITING - Bootstrap sucessful, forwarding to Roller");
return SUCCESS;
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/velocity/templates/planet/planetrss.vm
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/velocity/templates/planet/planetrss.vm?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/velocity/templates/planet/planetrss.vm (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/velocity/templates/planet/planetrss.vm Sun Apr 14 20:32:25 2013
@@ -31,7 +31,7 @@
#if($group)
#set($entries = $planet.getEntries($group, 0, $entryCount))
#else
- #set($all = $planet.getGroup($planet.getPlanet("default"), "all"))
+ #set($all = $planet.getGroup($planet.getWeblogger("default"), "all"))
#set($entries = $planet.getEntries($all, 0, $entryCount))
#end
#foreach( $entry in $entries )
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -18,13 +18,14 @@
package org.apache.roller.planet;
-import org.apache.roller.planet.business.PlanetFactory;
+import org.apache.roller.RollerException;
import org.apache.roller.planet.business.PlanetManager;
-import org.apache.roller.planet.business.startup.PlanetStartup;
import org.apache.roller.planet.pojos.Planet;
import org.apache.roller.planet.pojos.SubscriptionEntry;
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
+import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -35,17 +36,14 @@ public final class TestUtils {
public static void setupPlanet() throws Exception {
- if(!PlanetFactory.isBootstrapped()) {
-
- // do core services preparation
- PlanetStartup.prepare();
+ if(!WebloggerFactory.isBootstrapped()) {
// do application bootstrapping and init
- PlanetFactory.bootstrap();
+ WebloggerFactory.bootstrap();
// always initialize the properties manager and flush
- PlanetFactory.getPlanet().getPropertiesManager().initialize();
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().getPropertiesManager().initialize();
+ WebloggerFactory.getWeblogger().flush();
}
}
@@ -53,7 +51,7 @@ public final class TestUtils {
public static void shutdownPlanet() throws Exception {
// trigger shutdown
- PlanetFactory.getPlanet().shutdown();
+ WebloggerFactory.getWeblogger().shutdown();
}
@@ -68,10 +66,10 @@ public final class TestUtils {
public static void endSession(boolean flush) throws Exception {
if(flush) {
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
}
- PlanetFactory.getPlanet().release();
+ WebloggerFactory.getWeblogger().release();
}
@@ -83,17 +81,17 @@ public final class TestUtils {
Planet testPlanet = new Planet(handle, handle, handle);
// store
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
mgr.savePlanet(testPlanet);
// flush
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
// query to make sure we return the persisted object
- Planet planet = mgr.getPlanet(handle);
+ Planet planet = mgr.getWeblogger(handle);
if(planet == null)
- throw new PlanetException("error inserting new planet");
+ throw new WebloggerException("error inserting new planet");
return planet;
}
@@ -105,14 +103,14 @@ public final class TestUtils {
public static void teardownPlanet(String id) throws Exception {
// lookup
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
- Planet planet = mgr.getPlanetById(id);
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ Planet planet = mgr.getWebloggerById(id);
// remove
mgr.deletePlanet(planet);
// flush
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
}
@@ -122,10 +120,10 @@ public final class TestUtils {
public static PlanetGroup setupGroup(Planet planet, String handle)
throws Exception {
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
// make sure we are using a persistent object
- Planet testPlanet = mgr.getPlanetById(planet.getId());
+ Planet testPlanet = mgr.getWebloggerById(planet.getId());
// store
PlanetGroup testGroup = new PlanetGroup(testPlanet, handle, handle, handle);
@@ -133,13 +131,13 @@ public final class TestUtils {
mgr.saveGroup(testGroup);
// flush
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
// query to make sure we return the persisted object
PlanetGroup group = mgr.getGroupById(testGroup.getId());
if(group == null)
- throw new PlanetException("error inserting new group");
+ throw new WebloggerException("error inserting new group");
return group;
}
@@ -151,15 +149,15 @@ public final class TestUtils {
public static void teardownGroup(String id) throws Exception {
// lookup
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
PlanetGroup group = mgr.getGroupById(id);
// remove
mgr.deleteGroup(group);
- group.getPlanet().getGroups().remove(group);
+ group.getWeblogger().getGroups().remove(group);
// flush
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
}
@@ -169,7 +167,7 @@ public final class TestUtils {
public static Subscription setupSubscription(String feedUrl)
throws Exception {
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
// store
Subscription testSub = new Subscription();
@@ -178,13 +176,13 @@ public final class TestUtils {
mgr.saveSubscription(testSub);
// flush
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
// query to make sure we return the persisted object
Subscription sub = mgr.getSubscriptionById(testSub.getId());
if(sub == null)
- throw new PlanetException("error inserting new subscription");
+ throw new WebloggerException("error inserting new subscription");
return sub;
}
@@ -196,14 +194,14 @@ public final class TestUtils {
public static void teardownSubscription(String id) throws Exception {
// lookup
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
Subscription sub = mgr.getSubscriptionById(id);
// remove
mgr.deleteSubscription(sub);
// flush
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
}
@@ -213,7 +211,7 @@ public final class TestUtils {
public static SubscriptionEntry setupEntry(Subscription sub, String title)
throws Exception {
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
// make sure we are using a persistent object
Subscription testSub = mgr.getSubscriptionById(sub.getId());
@@ -228,13 +226,13 @@ public final class TestUtils {
mgr.saveEntry(testEntry);
// flush
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
// query to make sure we return the persisted object
SubscriptionEntry entry = mgr.getEntryById(testEntry.getId());
if(entry == null)
- throw new PlanetException("error inserting new entry");
+ throw new WebloggerException("error inserting new entry");
return entry;
}
@@ -246,7 +244,7 @@ public final class TestUtils {
public static void teardownEntry(String id) throws Exception {
// lookup
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
SubscriptionEntry entry = mgr.getEntryById(id);
// remove
@@ -254,7 +252,7 @@ public final class TestUtils {
entry.getSubscription().getEntries().remove(entry);
// flush
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
}
public void testNothing() {
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -16,11 +16,11 @@
package org.apache.roller.planet.business;
-import java.util.Date;
import junit.framework.TestCase;
import org.apache.roller.planet.TestUtils;
import org.apache.roller.planet.pojos.SubscriptionEntry;
import org.apache.roller.planet.pojos.Subscription;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -46,7 +46,7 @@ public class EntryBasicTests extends Tes
public void testEntryCRUD() throws Exception {
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -25,6 +25,7 @@ import org.apache.roller.planet.pojos.Pl
import org.apache.roller.planet.pojos.SubscriptionEntry;
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -64,8 +65,8 @@ public class EntryFunctionalTests extend
testGroup1.getSubscriptions().add(testSub2);
testSub2.getGroups().add(testGroup1);
- PlanetFactory.getPlanet().getPlanetManager().saveGroup(testGroup1);
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().getWebloggerManager().saveGroup(testGroup1);
+ WebloggerFactory.getWeblogger().flush();
log.info("EXITED");
}
@@ -85,7 +86,7 @@ public class EntryFunctionalTests extend
public void testEntryLookups() throws Exception {
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
// by id
SubscriptionEntry entry = mgr.getEntryById(testEntry1.getId());
@@ -110,7 +111,7 @@ public class EntryFunctionalTests extend
public void testDeleteEntries() throws Exception {
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -16,11 +16,11 @@
package org.apache.roller.planet.business;
-import java.util.List;
import junit.framework.TestCase;
import org.apache.roller.planet.TestUtils;
import org.apache.roller.planet.pojos.Planet;
import org.apache.roller.planet.pojos.PlanetGroup;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -46,7 +46,7 @@ public class GroupBasicTests extends Tes
public void testGroupCRUD() throws Exception {
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
PlanetGroup testGroup = new PlanetGroup();
testGroup.setDescription("test_group_desc");
@@ -67,7 +67,7 @@ public class GroupBasicTests extends Tes
group = mgr.getGroupById(testGroup.getId());
assertNotNull(group);
assertEquals("test_handle", group.getHandle());
- assertEquals(testPlanet.getId(), group.getPlanet().getId());
+ assertEquals(testPlanet.getId(), group.getWeblogger().getId());
// modify
group.setTitle("foo");
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -21,6 +21,7 @@ import junit.framework.TestCase;
import org.apache.roller.planet.TestUtils;
import org.apache.roller.planet.pojos.Planet;
import org.apache.roller.planet.pojos.PlanetGroup;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -52,7 +53,7 @@ public class GroupFunctionalTests extend
public void testGroupLookups() throws Exception {
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
// lookup group by id
PlanetGroup group = mgr.getGroupById(testGroup1.getId());
@@ -66,7 +67,7 @@ public class GroupFunctionalTests extend
assertEquals("groupFuncTest1", group.getHandle());
// lookup all groups in planet
- Planet planet = mgr.getPlanetById(testPlanet.getId());
+ Planet planet = mgr.getWebloggerById(testPlanet.getId());
Set groups = planet.getGroups();
assertNotNull(groups);
assertEquals(2, groups.size());
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -16,12 +16,12 @@
package org.apache.roller.planet.business;
-import java.util.List;
import junit.framework.TestCase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.planet.TestUtils;
import org.apache.roller.planet.pojos.Planet;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -37,12 +37,12 @@ public class PlanetBasicTests extends Te
// setup planet
TestUtils.setupPlanet();
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
Planet testPlanet = new Planet("testPlanet", "testPlanet", "testPlanet");
Planet planet = null;
- planet = mgr.getPlanet("testPlanet");
+ planet = mgr.getWeblogger("testPlanet");
assertNull(planet);
// add
@@ -51,7 +51,7 @@ public class PlanetBasicTests extends Te
// verify
planet = null;
- planet = mgr.getPlanetById(testPlanet.getId());
+ planet = mgr.getWebloggerById(testPlanet.getId());
assertNotNull(planet);
assertEquals("testPlanet", planet.getHandle());
@@ -62,7 +62,7 @@ public class PlanetBasicTests extends Te
// verify
planet = null;
- planet = mgr.getPlanetById(testPlanet.getId());
+ planet = mgr.getWebloggerById(testPlanet.getId());
assertNotNull(planet);
assertEquals("foo", planet.getTitle());
@@ -72,7 +72,7 @@ public class PlanetBasicTests extends Te
// verify
planet = null;
- planet = mgr.getPlanet(testPlanet.getId());
+ planet = mgr.getWeblogger(testPlanet.getId());
assertNull(planet);
}
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -22,6 +22,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.planet.TestUtils;
import org.apache.roller.planet.pojos.Planet;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -52,23 +53,23 @@ public class PlanetFunctionalTests exten
*/
public void testPlanetLookups() throws Exception {
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
Planet planet = null;
// by id
- planet = mgr.getPlanetById(testPlanet.getId());
+ planet = mgr.getWebloggerById(testPlanet.getId());
assertNotNull(planet);
assertEquals("planetFuncTest", planet.getHandle());
// by handle
planet = null;
- planet = mgr.getPlanet("planetFuncTest");
+ planet = mgr.getWeblogger("planetFuncTest");
assertNotNull(planet);
assertEquals("planetFuncTest", planet.getHandle());
// all planets
- List planets = mgr.getPlanets();
+ List planets = mgr.getWebloggers();
assertNotNull(planets);
assertEquals(1, planets.size());
}
Modified: roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PropertiesTest.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PropertiesTest.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PropertiesTest.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/PropertiesTest.java Sun Apr 14 20:32:25 2013
@@ -19,13 +19,13 @@
package org.apache.roller.planet.business;
import java.util.Map;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.planet.TestUtils;
-import org.apache.roller.planet.pojos.RuntimeConfigProperty;
+import org.apache.roller.weblogger.business.PropertiesManager;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
/**
@@ -48,7 +48,7 @@ public class PropertiesTest extends Test
public void testProperiesCRUD() throws Exception {
// remember, the properties table is initialized during Roller startup
- PropertiesManager mgr = PlanetFactory.getPlanet().getPropertiesManager();
+ PropertiesManager mgr = WebloggerFactory.getWeblogger().getPropertiesManager();
TestUtils.endSession(true);
RuntimeConfigProperty prop = null;
Modified: roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java Sun Apr 14 20:32:25 2013
@@ -22,6 +22,7 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.planet.TestUtils;
import org.apache.roller.planet.business.fetcher.FeedFetcher;
import org.apache.roller.planet.pojos.Subscription;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -46,7 +47,7 @@ public class RomeFeedFetcherTest extends
public void testFetchFeed() throws Exception {
- FeedFetcher feedFetcher = PlanetFactory.getPlanet().getFeedFetcher();
+ FeedFetcher feedFetcher = WebloggerFactory.getWeblogger().getFeedFetcher();
// fetch feed
Subscription sub = feedFetcher.fetchSubscription(feed_url);
@@ -61,7 +62,7 @@ public class RomeFeedFetcherTest extends
public void testFetchFeedConditionally() throws Exception {
- FeedFetcher feedFetcher = PlanetFactory.getPlanet().getFeedFetcher();
+ FeedFetcher feedFetcher = WebloggerFactory.getWeblogger().getFeedFetcher();
// fetch feed
Subscription sub = feedFetcher.fetchSubscription(feed_url);
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -20,10 +20,10 @@ import junit.framework.TestCase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.planet.TestUtils;
-import org.apache.roller.planet.business.fetcher.FeedFetcher;
import org.apache.roller.planet.business.updater.FeedUpdater;
import org.apache.roller.planet.business.updater.SingleThreadedFeedUpdater;
import org.apache.roller.planet.pojos.Subscription;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -43,12 +43,12 @@ public class SingleThreadedFeedUpdaterTe
TestUtils.setupPlanet();
// add test subscription
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
testSub = new Subscription();
testSub.setTitle(feed_url);
testSub.setFeedURL(feed_url);
mgr.saveSubscription(testSub);
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
}
@@ -59,7 +59,7 @@ public class SingleThreadedFeedUpdaterTe
public void testUpdateSubscription() throws Exception {
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -19,6 +19,7 @@ package org.apache.roller.planet.busines
import junit.framework.TestCase;
import org.apache.roller.planet.TestUtils;
import org.apache.roller.planet.pojos.Subscription;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -32,7 +33,7 @@ public class SubscriptionBasicTests exte
// setup planet
TestUtils.setupPlanet();
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -16,12 +16,12 @@
package org.apache.roller.planet.business;
-import java.util.Set;
import junit.framework.TestCase;
import org.apache.roller.planet.TestUtils;
import org.apache.roller.planet.pojos.Planet;
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -59,7 +59,7 @@ public class SubscriptionFunctionalTests
public void testSubscriptionLookups() throws Exception {
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
// by id
Subscription sub = mgr.getSubscriptionById(testSub1.getId());
@@ -79,7 +79,7 @@ public class SubscriptionFunctionalTests
public void testSubscriptionGroupCRUD() throws Exception {
- PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager planet = WebloggerFactory.getWeblogger().getWebloggerManager();
// 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/planet/util/rome/DiskFeedInfoCacheTest.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/util/rome/DiskFeedInfoCacheTest.java Sun Apr 14 20:32:25 2013
@@ -23,7 +23,8 @@ import junit.framework.TestCase;
import junit.framework.TestSuite;
import com.sun.syndication.fetcher.impl.SyndFeedInfo;
import com.sun.syndication.fetcher.impl.DiskFeedInfoCache;
-import org.apache.roller.planet.config.PlanetConfig;
+import org.apache.roller.weblogger.config.WebloggerConfig;
+import org.apache.roller.weblogger.planet.ui.PlanetConfig;
/**
@@ -40,7 +41,7 @@ public class DiskFeedInfoCacheTest exten
SyndFeedInfo info = new SyndFeedInfo();
info.setUrl(url);
- String testPlanetCache = PlanetConfig.getProperty("cache.dir");
+ String testPlanetCache = WebloggerConfig.getProperty("cache.dir");
assertNotNull("testPlanetCache not null", testPlanetCache);
assertTrue("testPlanetCache not zero length", testPlanetCache.trim().length() > 0);
@@ -48,7 +49,7 @@ public class DiskFeedInfoCacheTest exten
if (!cacheDir.exists()) cacheDir.mkdirs();
DiskFeedInfoCache cache =
- new DiskFeedInfoCache(PlanetConfig.getProperty("cache.dir"));
+ new DiskFeedInfoCache(WebloggerConfig.getProperty("cache.dir"));
cache.setFeedInfo(info.getUrl(), info);
SyndFeedInfo info2 = cache.getFeedInfo(url);
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -24,7 +24,6 @@ import junit.framework.TestSuite;
import junit.textui.TestRunner;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.Planet;
import org.apache.roller.planet.pojos.PlanetGroup;
@@ -58,7 +57,6 @@ public class PlanetManagerLocalTest exte
try {
TestUtils.setupWeblogger();
- TestUtils.setupPlanet();
testUser = TestUtils.setupUser("entryTestUser");
testWeblog = TestUtils.setupWeblog("entryTestWeblog", testUser);
@@ -128,14 +126,14 @@ public class PlanetManagerLocalTest exte
public void testRefreshEntries() {
try {
- PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager planet = WebloggerFactory.getWeblogger().getWebloggerManager();
// run sync task to fill aggregator with websites created by super
SyncWebsitesTask syncTask = new SyncWebsitesTask();
syncTask.init();
syncTask.runTask();
- Planet planetObject = planet.getPlanetById("zzz_default_planet_zzz");
+ Planet planetObject = planet.getWebloggerById("zzz_default_planet_zzz");
assertNotNull(planetObject);
PlanetGroup group = planet.getGroup(planetObject, "all");
assertEquals(1, group.getSubscriptions().size());
@@ -143,7 +141,7 @@ public class PlanetManagerLocalTest exte
RefreshRollerPlanetTask refreshTask = new RefreshRollerPlanetTask();
refreshTask.runTask();
- planetObject = planet.getPlanet("default");
+ planetObject = planet.getWeblogger("default");
group = planet.getGroup(planetObject, "all");
List agg = planet.getEntries(group, 0, -1);
assertEquals(3, agg.size());
Modified: roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java Sun Apr 14 20:32:25 2013
@@ -21,12 +21,10 @@ package org.apache.roller.weblogger.plan
import junit.framework.TestCase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.fetcher.FeedFetcher;
import org.apache.roller.planet.pojos.Subscription;
import org.apache.roller.weblogger.TestUtils;
-import org.apache.roller.weblogger.pojos.User;
-import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -49,7 +47,6 @@ public class WebloggerRomeFeedFetcherTes
// setup weblogger
TestUtils.setupWeblogger();
- TestUtils.setupPlanet();
try {
//testUser = TestUtils.setupUser("webloggerFetcherTestUser");
@@ -78,7 +75,7 @@ public class WebloggerRomeFeedFetcherTes
public void testFetchSubscription() throws Exception {
try {
- FeedFetcher feedFetcher = PlanetFactory.getPlanet().getFeedFetcher();
+ FeedFetcher feedFetcher = WebloggerFactory.getWeblogger().getFeedFetcher();
// first fetch non-conditionally so we know we should get a Sub
Subscription sub = feedFetcher.fetchSubscription(feed_url);