Team, I merged virtually all the updates made that didn't carry over
during the two months while Dave was designing the simpler Maven
project. For the three files listed in the patch below, however, I'm
not sure which are authoritative.
The second file ("+++") refers to the file that was on trunk just
*before* Dave merged his branch and the +/- patch flags would indicate
what would happen to the code if we were to revert to that version. The
first file ("---") refers to present Roller trunk.
Do we need to apply these changes to present Roller trunk? I can see in
the first file that "getweblogger()" is improperly named so should
probably be removed (replaced?) but am unsure if the other two changes
should be applied as well.
Thanks,
Glen
diff -u
/media/work1/opensource/roller-trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerFactory.java
/media/work1/opensource/roller-old/planet/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WebloggerFactory.java
---
/media/work1/opensource/roller-trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerFactory.java
2013-06-09 11:38:57.046845392 -0400
+++
/media/work1/opensource/roller-old/planet/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WebloggerFactory.java
2013-07-13 10:40:17.681805113 -0400
@@ -33,10 +33,6 @@
// our configured weblogger provider
private static WebloggerProvider webloggerProvider = null;
-
- public static Object {
- throw new UnsupportedOperationException("Not supported yet.");
//To change body of generated methods, choose Tools | Templates.
- }
// non-instantiable
diff -u
/media/work1/opensource/roller-trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
/media/work1/opensource/roller-old/planet/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
---
/media/work1/opensource/roller-trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
2013-06-09 11:38:57.046845392 -0400
+++
/media/work1/opensource/roller-old/planet/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
2013-07-13 10:40:17.681805113 -0400
@@ -23,8 +23,6 @@
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;
@@ -66,12 +64,9 @@
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;
@@ -98,9 +93,6 @@
WeblogManager weblogManager,
WeblogEntryManager weblogEntryManager,
OAuthManager oauthManager,
- FeedFetcher feedFetcher,
- PlanetManager planetManager,
- org.apache.roller.planet.business.PlanetURLStrategy
planetUrlStrategy,
URLStrategy urlStrategy) throws WebloggerException {
this.autoPingManager = autoPingManager;
@@ -121,10 +113,7 @@
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"));
@@ -313,19 +302,8 @@
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
*/
diff -u
/media/work1/opensource/roller-trunk/app/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
/media/work1/opensource/roller-old/planet/weblogger-business/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
---
/media/work1/opensource/roller-trunk/app/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
2013-06-09 11:38:57.046845392 -0400
+++
/media/work1/opensource/roller-old/planet/weblogger-business/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
2013-07-13 10:40:17.685805206 -0400
@@ -18,8 +18,6 @@
package org.apache.roller.weblogger.business;
-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.jpa.JPAOAuthManagerImpl;
import org.apache.roller.weblogger.business.plugins.PluginManager;
@@ -192,10 +190,5 @@
* Get username that built Weblogger
*/
public String getBuildUser();
-
- public FeedFetcher getFeedFetcher();
-
- public PlanetManager getPlanetManager();
-
- public org.apache.roller.planet.business.PlanetURLStrategy
getPlanetURLStrategy();
+
}
/**
