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 [1/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...
Author: snoopdave
Date: Sun Apr 14 20:32:25 2013
New Revision: 1467825
URL: http://svn.apache.org/r1467825
Log:
More progress on merging Roller's many modules into 2. Still have one compilation error that requires a little new code to fix.
Added:
roller/branches/fewer_modules/weblogger-webapp/src/main/resources/org/apache/roller/planet/
roller/branches/fewer_modules/weblogger-webapp/src/main/resources/org/apache/roller/planet/config/
roller/branches/fewer_modules/weblogger-webapp/src/main/resources/org/apache/roller/planet/config/planet.properties
- copied unchanged from r1465394, roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/config/planet.properties
roller/branches/fewer_modules/weblogger-webapp/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml
- copied unchanged from r1465394, roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml
roller/branches/fewer_modules/weblogger-webapp/src/main/resources/org/apache/roller/planet/pojos/
roller/branches/fewer_modules/weblogger-webapp/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml
- copied unchanged from r1465394, roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml
roller/branches/fewer_modules/weblogger-webapp/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml
- copied unchanged from r1465394, roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml
roller/branches/fewer_modules/weblogger-webapp/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml
- copied unchanged from r1465394, roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml
roller/branches/fewer_modules/weblogger-webapp/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
- copied unchanged from r1465394, roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
roller/branches/fewer_modules/weblogger-webapp/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml
- copied unchanged from r1465394, roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml
roller/branches/fewer_modules/weblogger-webapp/src/main/resources/sql/postgresql/
Removed:
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/PlanetException.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/DatabaseProvider.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/GuicePlanetProvider.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetFactory.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PropertiesManager.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/jpa/JPAPersistenceStrategy.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetModule.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/jpa/JPAPropertiesManagerImpl.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/startup/PlanetStartup.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/startup/StartupException.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/config/PlanetConfig.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/config/PlanetRuntimeConfig.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/config/runtime/ConfigDef.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/config/runtime/DisplayGroup.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/config/runtime/PropertyDef.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/config/runtime/RuntimeConfigDefs.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/config/runtime/RuntimeConfigDefsParser.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/util/Technorati.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/util/URLUtilities.java
roller/branches/fewer_modules/weblogger-webapp/src/test/resources/planet-custom_1.properties
Modified:
roller/branches/fewer_modules/weblogger-webapp/pom.xml
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/AbstractManagerImpl.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/BootstrapException.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/InitializationException.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Manager.java
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/PlanetManager.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetProvider.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/fetcher/FetcherException.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.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/jpa/JPAPlanetManagerImpl.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/FeedUpdater.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/business/updater/UpdaterException.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/PlanetTask.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/RefreshPlanetTask.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/TestUtils.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/WebloggerFactory.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/business/PlanetURLStrategy.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.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/PlanetConfig.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/core/RollerContext.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.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/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
roller/branches/fewer_modules/weblogger-webapp/src/main/webapp/WEB-INF/velocity/templates/planet/planetrss.vm
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/PropertiesTest.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.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/planet/util/rome/DiskFeedInfoCacheTest.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
roller/branches/fewer_modules/weblogger-webapp/src/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java
Modified: roller/branches/fewer_modules/weblogger-webapp/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/pom.xml?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/pom.xml (original)
+++ roller/branches/fewer_modules/weblogger-webapp/pom.xml Sun Apr 14 20:32:25 2013
@@ -696,23 +696,25 @@
</configuration>
</execution>
+
<execution>
- <id>copy-test-config</id>
- <phase>validate</phase>
+ <id>copy-dbscripts-resources</id>
+ <phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/</outputDirectory>
+ <includeEmptyDirs>true</includeEmptyDirs>
+ <outputDirectory>${basedir}/target/dbscripts</outputDirectory>
<resources>
<resource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
+ <directory>${basedir}/src/main/resources/sql</directory>
+ <filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
-
+
<execution>
<id>copy-resources</id>
<phase>process-resources</phase>
@@ -733,24 +735,6 @@
</configuration>
</execution>
- <execution>
- <id>copy-dbscripts-resources</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <includeEmptyDirs>true</includeEmptyDirs>
- <outputDirectory>${project.build.directory}/dbscripts</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources/sql</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
-
</executions>
<configuration>
@@ -759,57 +743,13 @@
</plugin>
- <!-- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
-
- <execution>
- <id>copy-test-properties</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/testsetup</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
-
- <execution>
- <id>copy-test-config</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
-
- </executions>
- <configuration>
- <includeEmptyDirs>true</includeEmptyDirs>
- </configuration>
- </plugin> -->
-
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Ensure tests will run even if 'openjpa' profile not active -->
<forkMode>once</forkMode>
- <argLine>-javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar"</argLine>
+ <argLine>-javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.2.1/openjpa-2.2.1.jar"</argLine>
<systemProperties>
<property>
@@ -822,7 +762,7 @@
</property>
<property>
<name>project.build.directory</name>
- <value>${project.build.directory}</value>
+ <value>${basedir}/target</value>
</property>
</systemProperties>
<excludes>
@@ -872,10 +812,10 @@
classpathref="maven.compile.classpath"/>
<texen
controlTemplate ="control.vm"
- contextProperties="${basedir}/target/dbscripts/dbscripts.properties"
- templatePath ="${basedir}/target/dbscripts"
+ contextProperties="${basedir}/src/main/resources/sql/dbscripts.properties"
+ templatePath ="${basedir}/src/main/resources/sql"
outputDirectory ="${basedir}/target/dbscripts"
- outputFile="README.txt"/>
+ outputFile ="README.txt"/>
</tasks>
</configuration>
</execution>
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/AbstractManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/AbstractManagerImpl.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/AbstractManagerImpl.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/AbstractManagerImpl.java Sun Apr 14 20:32:25 2013
@@ -25,7 +25,7 @@ package org.apache.roller.planet.busines
*/
public abstract class AbstractManagerImpl implements Manager {
- public void initialize() throws InitializationException {
+ public void initialize() throws Exception {
// no-op
}
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/BootstrapException.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/BootstrapException.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/BootstrapException.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/BootstrapException.java Sun Apr 14 20:32:25 2013
@@ -18,13 +18,13 @@
package org.apache.roller.planet.business;
-import org.apache.roller.planet.PlanetException;
+import org.apache.roller.RollerException;
/**
* Exception generated from Weblogger bootstrapping process.
*/
-public class BootstrapException extends PlanetException {
+public class BootstrapException extends RollerException {
public BootstrapException(String msg) {
super(msg);
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/InitializationException.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/InitializationException.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/InitializationException.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/InitializationException.java Sun Apr 14 20:32:25 2013
@@ -18,13 +18,13 @@
package org.apache.roller.planet.business;
-import org.apache.roller.planet.PlanetException;
+import org.apache.roller.RollerException;
/**
* Exception generated from Weblogger initialization process.
*/
-public class InitializationException extends PlanetException {
+public class InitializationException extends RollerException {
public InitializationException(String msg) {
super(msg);
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Manager.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Manager.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Manager.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/Manager.java Sun Apr 14 20:32:25 2013
@@ -29,7 +29,7 @@ public interface Manager {
/**
* Initialize the Manager. Called once after instantiation.
*/
- public void initialize() throws InitializationException;
+ public void initialize() throws Exception;
/**
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -22,10 +22,9 @@ import java.io.UnsupportedEncodingExcept
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
-import org.apache.roller.planet.config.PlanetRuntimeConfig;
-
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
/**
*
@@ -44,9 +43,9 @@ public class MultiPlanetURLStrategy impl
StringBuffer url = new StringBuffer();
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
- url.append(PlanetRuntimeConfig.getProperty("site.absoluteurl"));
+ url.append(WebloggerRuntimeConfig.getProperty("site.absoluteurl"));
url.append("/").append(planet).append("/");
return url.toString();
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -18,8 +18,9 @@
package org.apache.roller.planet.business;
-import org.apache.roller.planet.PlanetException;
+import org.apache.roller.RollerException;
import org.apache.roller.planet.business.fetcher.FeedFetcher;
+import org.apache.roller.weblogger.business.PropertiesManager;
/**
@@ -30,7 +31,7 @@ public interface Planet {
/**
* Get PlanetManager associated with this Roller instance.
*/
- public PlanetManager getPlanetManager();
+ public PlanetManager getWebloggerManager();
/**
@@ -54,13 +55,13 @@ public interface Planet {
/**
* Flush object states.
*/
- public void flush() throws PlanetException;
+ public void flush() throws RollerException;
/**
* Initialize any resources necessary for this instance of Roller.
*/
- public void initialize() throws InitializationException;
+ public void initialize() throws Exception;
/**
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetManager.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetManager.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetManager.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetManager.java Sun Apr 14 20:32:25 2013
@@ -18,11 +18,9 @@
package org.apache.roller.planet.business;
-import java.io.Serializable;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
-import org.apache.roller.planet.PlanetException;
+import org.apache.roller.RollerException;
import org.apache.roller.planet.pojos.Planet;
import org.apache.roller.planet.pojos.SubscriptionEntry;
import org.apache.roller.planet.pojos.PlanetGroup;
@@ -35,123 +33,123 @@ import org.apache.roller.planet.pojos.Su
public interface PlanetManager extends Manager {
- public void savePlanet(Planet planet) throws PlanetException;
+ public void savePlanet(Planet planet) throws RollerException;
- public void deletePlanet(Planet planet) throws PlanetException;
+ public void deletePlanet(Planet planet) throws RollerException;
- public Planet getPlanet(String handle) throws PlanetException;
+ public Planet getWeblogger(String handle) throws RollerException;
- public Planet getPlanetById(String id) throws PlanetException;
+ public Planet getWebloggerById(String id) throws RollerException;
- public List getPlanets() throws PlanetException;
+ public List getWebloggers() throws RollerException;
/**
* Save new or update existing a group
*/
- public void saveGroup(PlanetGroup sub) throws PlanetException;
+ public void saveGroup(PlanetGroup sub) throws RollerException;
/**
* Delete group and any subscriptions that are orphaned.
*/
- public void deleteGroup(PlanetGroup group) throws PlanetException;
+ public void deleteGroup(PlanetGroup group) throws RollerException;
- public PlanetGroup getGroup(Planet planet, String handle) throws PlanetException;
+ public PlanetGroup getGroup(Planet planet, String handle) throws RollerException;
/**
* Get group by ID rather than handle.
*/
- public PlanetGroup getGroupById(String id) throws PlanetException;
+ public PlanetGroup getGroupById(String id) throws RollerException;
/**
* Save or update a subscription
*/
- public void saveSubscription(Subscription sub) throws PlanetException;
+ public void saveSubscription(Subscription sub) throws RollerException;
/**
* Delete subscription, remove it from groups, cache, etc.
*/
- public void deleteSubscription(Subscription group) throws PlanetException;
+ public void deleteSubscription(Subscription group) throws RollerException;
/**
* Get subscription by feedUrl.
*/
- public Subscription getSubscription(String feedUrl) throws PlanetException;
+ public Subscription getSubscription(String feedUrl) throws RollerException;
/**
* Get subscription by ID rather than feedUrl.
*/
- public Subscription getSubscriptionById(String id) throws PlanetException;
+ public Subscription getSubscriptionById(String id) throws RollerException;
/**
* Get all subscriptions.
*/
- public List getSubscriptions() throws PlanetException;
+ public List getSubscriptions() throws RollerException;
/**
* Get total number of subscriptions.
*/
- public int getSubscriptionCount() throws PlanetException;
+ public int getSubscriptionCount() throws RollerException;
/**
* Get top X subscriptions.
*/
- public List getTopSubscriptions(int offset, int len) throws PlanetException;
+ public List getTopSubscriptions(int offset, int len) throws RollerException;
/**
* Get top X subscriptions, restricted by group.
*/
public List getTopSubscriptions(PlanetGroup group, int offset, int len)
- throws PlanetException;
+ throws RollerException;
/**
* Save new or update existing entry
*/
- public void saveEntry(SubscriptionEntry entry) throws PlanetException;
+ public void saveEntry(SubscriptionEntry entry) throws RollerException;
/**
* Delete entry.
*/
- public void deleteEntry(SubscriptionEntry entry) throws PlanetException;
+ public void deleteEntry(SubscriptionEntry entry) throws RollerException;
/**
* Delete all entries for a subscription.
*
* @param subscription The subscription to delete entries from.
- * @throws PlanetException If there is a problem doing the delete.
+ * @throws RollerException If there is a problem doing the delete.
*/
- public void deleteEntries(Subscription sub) throws PlanetException;
+ public void deleteEntries(Subscription sub) throws RollerException;
/**
* Lookup an entry by id.
*/
- public SubscriptionEntry getEntryById(String id) throws PlanetException;
+ public SubscriptionEntry getEntryById(String id) throws RollerException;
/**
* Get entries in a single feed as list of SubscriptionEntry objects.
*/
public List getEntries(Subscription sub, int offset, int len)
- throws PlanetException;
+ throws RollerException;
/**
@@ -162,7 +160,7 @@ public interface PlanetManager extends M
* @param len Maximum number of results to return (for paging)
*/
public List getEntries(PlanetGroup group, int offset, int len)
- throws PlanetException;
+ throws RollerException;
/**
@@ -179,6 +177,6 @@ public interface PlanetManager extends M
Date startDate,
Date endDate,
int offset,
- int len) throws PlanetException;
+ int len) throws RollerException;
}
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetProvider.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetProvider.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetProvider.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/PlanetProvider.java Sun Apr 14 20:32:25 2013
@@ -33,6 +33,6 @@ public interface PlanetProvider {
/**
* Get a Planet instance.
*/
- public Planet getPlanet();
+ public Planet getWeblogger();
}
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/fetcher/FetcherException.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/fetcher/FetcherException.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/fetcher/FetcherException.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/fetcher/FetcherException.java Sun Apr 14 20:32:25 2013
@@ -20,13 +20,13 @@ package org.apache.roller.planet.busines
import java.io.PrintStream;
import java.io.PrintWriter;
-import org.apache.roller.planet.PlanetException;
+import org.apache.roller.RollerException;
/**
* Exception generated from FeedFetcher.
*/
-public class FetcherException extends PlanetException {
+public class FetcherException extends RollerException {
public FetcherException(String msg) {
super(msg);
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java Sun Apr 14 20:32:25 2013
@@ -41,9 +41,9 @@ import java.util.List;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.config.PlanetConfig;
import org.apache.roller.planet.pojos.SubscriptionEntry;
import org.apache.roller.planet.pojos.Subscription;
+import org.apache.roller.weblogger.config.WebloggerConfig;
/**
@@ -242,7 +242,7 @@ public class RomeFeedFetcher implements
// get a feed fetcher cache, if possible
private FeedFetcherCache getRomeFetcherCache() {
- String cacheDirPath = PlanetConfig.getProperty("cache.dir");
+ String cacheDirPath = WebloggerConfig.getProperty("cache.dir");
// can't continue without cache dir
if (cacheDirPath == null) {
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -20,14 +20,15 @@ package org.apache.roller.planet.busines
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.PlanetException;
+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.Planet;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.business.fetcher.FeedFetcher;
-import org.apache.roller.planet.business.InitializationException;
-import org.apache.roller.planet.business.PropertiesManager;
+import org.apache.roller.weblogger.business.InitializationException;
+import org.apache.roller.weblogger.business.PropertiesManager;
+import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
/**
* Implements Planet, the entry point interface for the Roller-Planet business
@@ -58,7 +59,7 @@ public class JPAPlanetImpl extends Abstr
PlanetManager planetManager,
PropertiesManager propertiesManager,
URLStrategy urlStrategy,
- FeedFetcher feedFetcher) throws PlanetException {
+ FeedFetcher feedFetcher) throws RollerException {
this.strategy = strategy;
this.propertiesManager = propertiesManager;
@@ -69,18 +70,18 @@ public class JPAPlanetImpl extends Abstr
@Override
- public void initialize() throws InitializationException {
+ public void initialize() throws Exception {
log.info("Initializing Roller Planet business tier");
getPropertiesManager().initialize();
- getPlanetManager().initialize();
+ getWebloggerManager().initialize();
// we always need to do a flush after initialization because it's
// possible that some changes need to be persisted
try {
flush();
- } catch(PlanetException ex) {
+ } catch(RollerException ex) {
throw new InitializationException("Error flushing after initialization", ex);
}
@@ -88,8 +89,8 @@ public class JPAPlanetImpl extends Abstr
}
- public void flush() throws PlanetException {
- this.strategy.flush();
+ public void flush() throws RollerException {
+ this.strategy.flush();
}
@@ -108,7 +109,7 @@ public class JPAPlanetImpl extends Abstr
/**
* @see org.apache.roller.business.Roller#getBookmarkManager()
*/
- public PlanetManager getPlanetManager() {
+ public PlanetManager getWebloggerManager() {
return planetManager;
}
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java Sun Apr 14 20:32:25 2013
@@ -30,14 +30,16 @@ import javax.persistence.Query;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.RollerException;
-import org.apache.roller.planet.PlanetException;
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.planet.business.AbstractManagerImpl;
+import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
/**
* Manages Planet Roller objects and entry aggregations in a database.
@@ -64,39 +66,39 @@ public class JPAPlanetManagerImpl extend
}
- public void saveGroup(PlanetGroup group) throws PlanetException {
+ public void saveGroup(PlanetGroup group) throws RollerException {
strategy.store(group);
}
- public void saveEntry(SubscriptionEntry entry) throws PlanetException {
+ public void saveEntry(SubscriptionEntry entry) throws RollerException {
strategy.store(entry);
}
public void saveSubscription(Subscription sub)
- throws PlanetException {
+ throws RollerException {
Subscription existing = getSubscription(sub.getFeedURL());
if (existing == null || (existing.getId().equals(sub.getId()))) {
strategy.store(sub);
} else {
- throw new PlanetException("ERROR: duplicate feed URLs not allowed");
+ throw new WebloggerException("ERROR: duplicate feed URLs not allowed");
}
}
- public void deleteEntry(SubscriptionEntry entry) throws PlanetException {
+ public void deleteEntry(SubscriptionEntry entry) throws RollerException {
strategy.remove(entry);
}
- public void deleteGroup(PlanetGroup group) throws PlanetException {
+ public void deleteGroup(PlanetGroup group) throws RollerException {
strategy.remove(group);
}
public void deleteSubscription(Subscription sub)
- throws PlanetException {
+ throws RollerException {
strategy.remove(sub);
}
public Subscription getSubscription(String feedUrl)
- throws PlanetException {
+ throws RollerException {
Query q = strategy.getNamedQuery("Subscription.getByFeedURL");
q.setParameter(1, feedUrl);
try {
@@ -107,7 +109,7 @@ public class JPAPlanetManagerImpl extend
}
public Subscription getSubscriptionById(String id)
- throws PlanetException {
+ throws RollerException {
return (Subscription) strategy.load(
Subscription.class, id);
}
@@ -122,13 +124,13 @@ public class JPAPlanetManagerImpl extend
}
}
- public int getSubscriptionCount() throws PlanetException {
+ public int getSubscriptionCount() throws RollerException {
Query q = strategy.getNamedQuery("Subscription.getAll");
return q.getResultList().size();
}
public List getTopSubscriptions(int offset, int length)
- throws PlanetException {
+ throws RollerException {
return getTopSubscriptions(null, offset, length);
}
@@ -136,7 +138,7 @@ public class JPAPlanetManagerImpl extend
* Get top X subscriptions, restricted by group.
*/
public List getTopSubscriptions(
- PlanetGroup group, int offset, int len) throws PlanetException {
+ PlanetGroup group, int offset, int len) throws RollerException {
List result = null;
if (group != null) {
Query q = strategy.getNamedQuery(
@@ -155,7 +157,7 @@ public class JPAPlanetManagerImpl extend
return result;
}
- public PlanetGroup getGroup(String handle) throws PlanetException {
+ public PlanetGroup getGroup(String handle) throws RollerException {
Query q = strategy.getNamedQuery("PlanetGroup.getByHandle");
q.setParameter(1, handle);
try {
@@ -165,18 +167,18 @@ public class JPAPlanetManagerImpl extend
}
}
- public PlanetGroup getGroupById(String id) throws PlanetException {
+ public PlanetGroup getGroupById(String id) throws RollerException {
return (PlanetGroup) strategy.load(PlanetGroup.class, id);
}
public void release() {}
- public void savePlanet(Planet planet) throws PlanetException {
+ public void savePlanet(Planet planet) throws RollerException {
strategy.store(planet);
}
- public Planet getPlanet(String handle) throws PlanetException {
+ public Planet getWeblogger(String handle) throws RollerException {
Query q = strategy.getNamedQuery("Planet.getByHandle");
q.setParameter(1, handle);
try {
@@ -186,15 +188,15 @@ public class JPAPlanetManagerImpl extend
}
}
- public Planet getPlanetById(String id) throws PlanetException {
+ public Planet getWebloggerById(String id) throws RollerException {
return (Planet)strategy.load(Planet.class, id);
}
- public List getPlanets() throws PlanetException {
+ public List getWebloggers() throws RollerException {
return (List)strategy.getNamedQuery("Planet.getAll").getResultList();
}
- public List getGroupHandles(Planet planet) throws PlanetException {
+ public List getGroupHandles(Planet planet) throws RollerException {
List handles = new ArrayList();
Iterator list = getGroups(planet).iterator();
while (list.hasNext()) {
@@ -204,13 +206,13 @@ public class JPAPlanetManagerImpl extend
return handles;
}
- public List getGroups(Planet planet) throws PlanetException {
+ public List getGroups(Planet planet) throws RollerException {
Query q = strategy.getNamedQuery("PlanetGroup.getByPlanet");
q.setParameter(1, planet.getHandle());
return q.getResultList();
}
- public PlanetGroup getGroup(Planet planet, String handle) throws PlanetException {
+ public PlanetGroup getGroup(Planet planet, String handle) throws RollerException {
Query q = strategy.getNamedQuery("PlanetGroup.getByPlanetAndHandle");
q.setParameter(1, planet.getHandle());
q.setParameter(2, handle);
@@ -221,12 +223,12 @@ public class JPAPlanetManagerImpl extend
}
}
- public void deletePlanet(Planet planet) throws PlanetException {
+ public void deletePlanet(Planet planet) throws RollerException {
strategy.remove(planet);
}
public void deleteEntries(Subscription sub)
- throws PlanetException {
+ throws RollerException {
Iterator entries = sub.getEntries().iterator();
while(entries.hasNext()) {
strategy.remove(entries.next());
@@ -236,18 +238,18 @@ public class JPAPlanetManagerImpl extend
sub.getEntries().clear();
}
- public List getSubscriptions() throws PlanetException {
+ public List getSubscriptions() throws RollerException {
Query q = strategy.getNamedQuery("Subscription.getAllOrderByFeedURL");
return q.getResultList();
}
- public SubscriptionEntry getEntryById(String id) throws PlanetException {
+ public SubscriptionEntry getEntryById(String id) throws RollerException {
return (SubscriptionEntry) strategy.load(SubscriptionEntry.class, id);
}
- public List getEntries(Subscription sub, int offset, int len) throws PlanetException {
+ public List getEntries(Subscription sub, int offset, int len) throws RollerException {
if (sub == null) {
- throw new PlanetException("subscription cannot be null");
+ throw new WebloggerException("subscription cannot be null");
}
Query q = strategy.getNamedQuery("SubscriptionEntry.getBySubscription");
q.setParameter(1, sub);
@@ -256,15 +258,15 @@ public class JPAPlanetManagerImpl extend
return q.getResultList();
}
- public List getEntries(PlanetGroup group, int offset, int len) throws PlanetException {
+ public List getEntries(PlanetGroup group, int offset, int len) throws RollerException {
return getEntries(group, null, null, offset, len);
}
- public List getEntries(PlanetGroup group, Date startDate, Date endDate, int offset, int len) throws PlanetException {
+ public List getEntries(PlanetGroup group, Date startDate, Date endDate, int offset, int len) throws RollerException {
StringBuffer queryString = new StringBuffer();
if (group == null) {
- throw new PlanetException("group cannot be null or empty");
+ throw new WebloggerException("group cannot be null or empty");
}
List ret = null;
@@ -308,7 +310,7 @@ public class JPAPlanetManagerImpl extend
log.debug("Generated aggregation of " + ret.size() + " in " + ((endTime-startTime)/1000.0) + " seconds");
} catch (Throwable e) {
- throw new PlanetException(e);
+ throw new WebloggerException(e);
}
return ret;
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/FeedUpdater.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/FeedUpdater.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/FeedUpdater.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/FeedUpdater.java Sun Apr 14 20:32:25 2013
@@ -18,6 +18,7 @@
package org.apache.roller.planet.business.updater;
+import org.apache.roller.planet.business.fetcher.FetcherException;
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -19,19 +19,18 @@
package org.apache.roller.planet.business.updater;
import java.util.Collection;
-import java.util.Iterator;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.PlanetException;
-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.fetcher.FeedFetcher;
import org.apache.roller.planet.business.fetcher.FetcherException;
-import org.apache.roller.planet.config.PlanetRuntimeConfig;
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
import org.apache.roller.planet.pojos.SubscriptionEntry;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
/**
@@ -66,7 +65,7 @@ public class SingleThreadedFeedUpdater i
try {
// fetch the latest version of the subscription
log.debug("Getting fetcher");
- FeedFetcher fetcher = PlanetFactory.getPlanet().getFeedFetcher();
+ FeedFetcher fetcher = WebloggerFactory.getWeblogger().getFeedFetcher();
log.debug("Using fetcher class: " + fetcher.getClass().getName());
updatedSub = fetcher.fetchSubscription(sub.getFeedURL(), sub.getLastUpdated());
@@ -98,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 = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
// clear out old entries
pmgr.deleteEntries(sub);
@@ -109,12 +108,12 @@ public class SingleThreadedFeedUpdater i
// save and flush
pmgr.saveSubscription(sub);
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
log.debug("Added entries");
entries += newEntries.size();
- } catch(PlanetException ex) {
+ } catch(RollerException ex) {
throw new UpdaterException("Error persisting updated subscription", ex);
}
@@ -138,9 +137,9 @@ public class SingleThreadedFeedUpdater i
try {
// update all subscriptions in the system
- PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
updateSubscriptions(pmgr.getSubscriptions());
- } catch (PlanetException ex) {
+ } catch (RollerException ex) {
throw new UpdaterException("Error getting subscriptions list", ex);
}
@@ -176,55 +175,51 @@ public class SingleThreadedFeedUpdater i
// convenience method which handles updating any arbitrary collection of subs
private void updateSubscriptions(Collection<Subscription> subscriptions) {
- PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
-
- Iterator subs = subscriptions.iterator();
- while (subs.hasNext()) {
- Subscription sub = (Subscription)subs.next();
-
- try {
- // reattach sub. sub gets detached as we iterate
- sub = pmgr.getSubscriptionById(sub.getId());
- } catch (PlanetException ex) {
- log.warn("Subscription went missing while doing update: "+ex.getMessage());
- }
-
- // this updates and saves
- try {
- updateSubscription(sub);
- } catch(UpdaterException ex) {
- // do a little work to get at the source of the problem
- Throwable cause = ex;
- if(ex.getRootCause() != null) {
- cause = ex.getRootCause();
- }
- if(cause.getCause() != null) {
- cause = cause.getCause();
- }
-
- if (log.isDebugEnabled()) {
- log.debug("Error updating subscription - "+sub.getFeedURL(), cause);
- } else {
- log.warn("Error updating subscription - "+sub.getFeedURL()
- + " turn on debug logging for more info");
- }
-
- } catch(Exception ex) {
- if (log.isDebugEnabled()) {
- log.warn("Error updating subscription - "+sub.getFeedURL(), ex);
- } else {
- log.warn("Error updating subscription - "+sub.getFeedURL()
- + " turn on debug logging for more info");
- }
- }
- }
+ PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
+ for (Subscription sub : subscriptions) {
+ try {
+ // reattach sub. sub gets detached as we iterate
+ sub = pmgr.getSubscriptionById(sub.getId());
+ } catch (RollerException ex) {
+ log.warn("Subscription went missing while doing update: "+ex.getMessage());
+ }
+
+ // this updates and saves
+ try {
+ updateSubscription(sub);
+ } catch(UpdaterException ex) {
+ // do a little work to get at the source of the problem
+ Throwable cause = ex;
+ if(ex.getRootCause() != null) {
+ cause = ex.getRootCause();
+ }
+ if(cause.getCause() != null) {
+ cause = cause.getCause();
+ }
+
+ if (log.isDebugEnabled()) {
+ log.debug("Error updating subscription - "+sub.getFeedURL(), cause);
+ } else {
+ log.warn("Error updating subscription - "+sub.getFeedURL()
+ + " turn on debug logging for more info");
+ }
+
+ } catch(Exception ex) {
+ if (log.isDebugEnabled()) {
+ log.warn("Error updating subscription - "+sub.getFeedURL(), ex);
+ } else {
+ log.warn("Error updating subscription - "+sub.getFeedURL()
+ + " turn on debug logging for more info");
+ }
+ }
+ }
}
// upate proxy settings for jvm based on planet configuration
private void updateProxySettings() {
- String proxyHost = PlanetRuntimeConfig.getProperty("site.proxyhost");
- int proxyPort = PlanetRuntimeConfig.getIntProperty("site.proxyport");
+ String proxyHost = WebloggerRuntimeConfig.getProperty("site.proxyhost");
+ int proxyPort = WebloggerRuntimeConfig.getIntProperty("site.proxyport");
if (proxyHost != null && proxyPort > 0) {
System.setProperty("proxySet", "true");
System.setProperty("http.proxyHost", proxyHost);
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/UpdaterException.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/UpdaterException.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/UpdaterException.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/business/updater/UpdaterException.java Sun Apr 14 20:32:25 2013
@@ -18,13 +18,13 @@
package org.apache.roller.planet.business.updater;
-import org.apache.roller.planet.PlanetException;
+import org.apache.roller.RollerException;
/**
* Exception generated from FeedUpdater.
*/
-public class UpdaterException extends PlanetException {
+public class UpdaterException extends RollerException {
public UpdaterException(String msg) {
super(msg);
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -22,9 +22,9 @@ import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.TreeSet;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.util.UUIDGenerator;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -159,7 +159,7 @@ public class PlanetGroup implements Seri
/**
* @hibernate.many-to-one column="planet_id" cascade="none" non-null="false"
*/
- public Planet getPlanet() {
+ public Planet getWeblogger() {
return planet;
}
@@ -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 = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getWebloggerManager();
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -25,11 +25,11 @@ 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.config.PlanetConfig;
-import org.apache.roller.planet.business.Planet;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.util.Utilities;
+import org.apache.roller.weblogger.business.Weblogger;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.config.WebloggerConfig;
//import org.apache.roller.util.UtilitiesModel;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
@@ -51,8 +51,8 @@ public class GeneratePlanetTask extends
public void run() {
try {
- Planet planet = PlanetFactory.getPlanet();
- PlanetManager planetManager = planet.getPlanetManager();
+ Weblogger weblogger = WebloggerFactory.getWeblogger();
+ PlanetManager planetManager = weblogger.getWebloggerManager();
// Ignore values from database
//String mainPage = planetManager.getConfiguration().getMainPage();
@@ -61,11 +61,11 @@ public class GeneratePlanetTask extends
// Use values from PlanetConfig instead
String mainPage =
- PlanetConfig.getProperty("planet.aggregator.mainPage");
+ WebloggerConfig.getProperty("planet.aggregator.mainPage");
String templateDir =
- PlanetConfig.getProperty("planet.aggregator.template.dir");
+ WebloggerConfig.getProperty("planet.aggregator.template.dir");
String outputDir =
- PlanetConfig.getProperty("planet.aggregator.output.dir");
+ WebloggerConfig.getProperty("planet.aggregator.output.dir");
log.info("Calling Velocity Texen to generate Planet files");
log.info(" Control file ["+mainPage+"]");
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/PlanetTask.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/PlanetTask.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/PlanetTask.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/PlanetTask.java Sun Apr 14 20:32:25 2013
@@ -18,11 +18,6 @@
package org.apache.roller.planet.tasks;
-import org.apache.roller.planet.business.fetcher.FeedFetcher;
-import org.apache.roller.planet.business.PlanetFactory;
-import org.apache.roller.planet.business.URLStrategy;
-import org.apache.roller.planet.config.PlanetConfig;
-
/**
* An abstract class representing a scheduled task in Roller Planet.
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/RefreshPlanetTask.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/RefreshPlanetTask.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/RefreshPlanetTask.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/planet/tasks/RefreshPlanetTask.java Sun Apr 14 20:32:25 2013
@@ -20,10 +20,10 @@ package org.apache.roller.planet.tasks;
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.startup.PlanetStartup;
import org.apache.roller.planet.business.updater.FeedUpdater;
import org.apache.roller.planet.business.updater.SingleThreadedFeedUpdater;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.business.startup.WebloggerStartup;
/**
@@ -44,7 +44,7 @@ public class RefreshPlanetTask extends P
log.info("Refreshing Planet entries");
FeedUpdater updater = new SingleThreadedFeedUpdater();
updater.updateSubscriptions();
- PlanetFactory.getPlanet().release();
+ WebloggerFactory.getWeblogger().release();
} catch (Exception e) {
log.error("ERROR refreshing planet", e);
@@ -58,8 +58,8 @@ public class RefreshPlanetTask extends P
task.initialize();
// need to prepare and bootstrap Planet as well
- PlanetStartup.prepare();
- PlanetFactory.bootstrap();
+ WebloggerStartup.prepare();
+ WebloggerFactory.bootstrap();
task.run();
}
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -22,12 +22,12 @@ 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.PlanetException;
-import org.apache.roller.planet.business.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.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
+import org.apache.roller.weblogger.business.Weblogger;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
* Simple planet model for use static planet generation, designed
@@ -38,13 +38,13 @@ public class StaticPlanetModel {
PlanetManager planetManager = null;
- public StaticPlanetModel() throws PlanetException {
- Planet planet = PlanetFactory.getPlanet();
- planetManager = planet.getPlanetManager();
+ public StaticPlanetModel() throws RollerException {
+ Weblogger planet = WebloggerFactory.getWeblogger();
+ planetManager = planet.getWebloggerManager();
}
// TODO: replace this with something equivalent
-// public PlanetConfigData getConfiguration() throws PlanetException {
+// public PlanetConfigData getConfiguration() throws RollerException {
// return planetManager.getConfiguration();
// }
@@ -69,28 +69,28 @@ public class StaticPlanetModel {
}
// removed now that groups must be part of a planet, this method no longer makes sense
-// public List getGroups() throws PlanetException {
+// public List getGroups() throws RollerException {
// return planetManager.getGroups();
// }
// removed now that groups must be part of a planet, this method no longer makes sense
-// public PlanetGroup getGroup(String handle) throws PlanetException {
+// public PlanetGroup getGroup(String handle) throws RollerException {
// return planetManager.getGroup(handle);
// }
public List getAggregation(
- PlanetGroup group, int maxEntries) throws PlanetException {
+ PlanetGroup group, int maxEntries) throws RollerException {
return planetManager.getEntries(group, 0, maxEntries);
}
- public Iterator getAllSubscriptions() throws PlanetException {
+ public Iterator getAllSubscriptions() throws RollerException {
return planetManager.getSubscriptions().iterator();
}
- public int getSubscriptionCount() throws PlanetException {
+ public int getSubscriptionCount() throws RollerException {
return planetManager.getSubscriptionCount();
}
}
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/TestUtils.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/TestUtils.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/TestUtils.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/TestUtils.java Sun Apr 14 20:32:25 2013
@@ -23,10 +23,6 @@
package org.apache.roller.weblogger;
-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.business.BookmarkManager;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
@@ -35,7 +31,6 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.business.WeblogEntryManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.startup.WebloggerStartup;
-import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.AutoPing;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
@@ -74,25 +69,6 @@ public final class TestUtils {
WebloggerFactory.getWeblogger().shutdown();
}
-
- public static void setupPlanet() throws Exception {
-
- if(!PlanetFactory.isBootstrapped()) {
- // do core services preparation
- PlanetStartup.prepare();
-
- // do application bootstrapping
- String guiceModule = WebloggerConfig.getProperty("planet.aggregator.guice.module");
- PlanetProvider provider = new GuicePlanetProvider(guiceModule);
- PlanetFactory.bootstrap(provider);
-
- // always initialize the properties manager and flush
- PlanetFactory.getPlanet().getPropertiesManager().initialize();
- PlanetFactory.getPlanet().flush();
- }
- }
-
-
/**
* Convenience method that simulates the end of a typical session.
*
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -18,6 +18,8 @@
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;
@@ -190,5 +192,13 @@ public interface Weblogger {
* Get username that built Weblogger
*/
public String getBuildUser();
+
+ public PlanetManager getWebloggerManager();
+
+ public FeedFetcher getFeedFetcher();
+
+ public PlanetManager getPlanetManager();
+
+ public org.apache.roller.planet.business.URLStrategy getURLStrategy();
}
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WebloggerFactory.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WebloggerFactory.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WebloggerFactory.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/WebloggerFactory.java Sun Apr 14 20:32:25 2013
@@ -33,6 +33,10 @@ public final class WebloggerFactory {
// our configured weblogger provider
private static WebloggerProvider webloggerProvider = null;
+
+ public static Object getweblogger() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
// non-instantiable
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -22,6 +22,13 @@ import com.google.inject.Binder;
import com.google.inject.Module;
import net.oauth.OAuthValidator;
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.fetcher.FeedFetcher;
+import org.apache.roller.planet.business.fetcher.RomeFeedFetcher;
+import org.apache.roller.planet.business.jpa.JPAPlanetImpl;
+import org.apache.roller.planet.business.jpa.JPAPlanetManagerImpl;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.FileContentManager;
import org.apache.roller.weblogger.business.FileContentManagerImpl;
@@ -59,7 +66,6 @@ public class JPAWebloggerModule implemen
binder.bind(Weblogger.class).to(JPAWebloggerImpl.class);
binder.bind(JPAPersistenceStrategy.class);
- binder.bind(org.apache.roller.weblogger.planet.business.jpa.JPARollerPlanetPersistenceStrategy.class);
binder.bind(AutoPingManager.class).to( JPAAutoPingManagerImpl.class);
binder.bind(BookmarkManager.class).to( JPABookmarkManagerImpl.class);
@@ -83,6 +89,13 @@ 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);
}
}
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java Sun Apr 14 20:32:25 2013
@@ -19,9 +19,8 @@
package org.apache.roller.weblogger.planet.business;
import org.apache.roller.planet.business.MultiPlanetURLStrategy;
-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.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
@@ -39,9 +38,9 @@ public class PlanetURLStrategy extends M
StringBuffer url = new StringBuffer();
- PlanetManager mgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
- url.append(PlanetRuntimeConfig.getProperty("site.absoluteurl"));
+ url.append(WebloggerRuntimeConfig.getProperty("site.absoluteurl"));
return url.toString();
}
Modified: roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java?rev=1467825&r1=1467824&r2=1467825&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java (original)
+++ roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java Sun Apr 14 20:32:25 2013
@@ -22,15 +22,14 @@ import java.util.Date;
import java.util.Properties;
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.startup.PlanetStartup;
import org.apache.roller.weblogger.business.runnable.RollerTaskWithLeasing;
-import org.apache.roller.planet.business.PlanetFactory;
-import org.apache.roller.planet.business.PlanetProvider;
import org.apache.roller.planet.business.updater.FeedUpdater;
import org.apache.roller.planet.business.updater.SingleThreadedFeedUpdater;
import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.GuiceWebloggerProvider;
import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.business.WebloggerProvider;
+import org.apache.roller.weblogger.business.startup.WebloggerStartup;
import org.apache.roller.weblogger.config.WebloggerConfig;
@@ -137,7 +136,6 @@ public class RefreshRollerPlanetTask ext
} finally {
// always release
WebloggerFactory.getWeblogger().release();
- PlanetFactory.getPlanet().release();
}
}
@@ -145,12 +143,12 @@ public class RefreshRollerPlanetTask ext
public static void main(String[] args) throws Exception {
// before we can do anything we need to bootstrap the planet backend
- PlanetStartup.prepare();
+ WebloggerStartup.prepare();
// 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);
+ WebloggerProvider provider = new GuiceWebloggerProvider(guiceModule);
+ WebloggerFactory.bootstrap(provider);
RefreshRollerPlanetTask task = new RefreshRollerPlanetTask();
task.init();
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=1467825&r1=1467824&r2=1467825&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 Apr 14 20:32:25 2013
@@ -27,17 +27,16 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.planet.business.GuicePlanetProvider;
-import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
-import org.apache.roller.planet.business.PlanetProvider;
-import org.apache.roller.planet.business.startup.PlanetStartup;
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.WebloggerException;
+import org.apache.roller.weblogger.business.GuiceWebloggerProvider;
import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.business.WebloggerProvider;
import org.apache.roller.weblogger.business.runnable.RollerTaskWithLeasing;
+import org.apache.roller.weblogger.business.startup.WebloggerStartup;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -138,10 +137,10 @@ public class SyncWebsitesTask extends Ro
log.info("Syncing local weblogs with planet subscriptions list");
try {
- PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
+ PlanetManager pmgr = WebloggerFactory.getWeblogger().getWebloggerManager();
// first, make sure there is an "all" pmgr group
- Planet planetObject = pmgr.getPlanetById("zzz_default_planet_zzz");
+ Planet planetObject = pmgr.getWebloggerById("zzz_default_planet_zzz");
PlanetGroup group = pmgr.getGroup(planetObject, "all");
if (group == null) {
group = new PlanetGroup();
@@ -149,7 +148,7 @@ public class SyncWebsitesTask extends Ro
group.setHandle("all");
group.setTitle("all");
pmgr.saveGroup(group);
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
}
// walk through all enable weblogs and add/update subs as needed
@@ -193,7 +192,7 @@ public class SyncWebsitesTask extends Ro
}
// save as we go
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
}
// new subs added, existing subs updated, now delete old subs
@@ -223,14 +222,13 @@ public class SyncWebsitesTask extends Ro
// all done, lets save
pmgr.saveGroup(group);
- PlanetFactory.getPlanet().flush();
+ WebloggerFactory.getWeblogger().flush();
} catch (RollerException e) {
log.error("ERROR refreshing entries", e);
} finally {
// don't forget to release
WebloggerFactory.getWeblogger().release();
- PlanetFactory.getPlanet().release();
}
}
@@ -241,12 +239,12 @@ public class SyncWebsitesTask extends Ro
public static void main(String[] args) throws Exception {
// before we can do anything we need to bootstrap the planet backend
- PlanetStartup.prepare();
+ WebloggerStartup.prepare();
// 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);
+ WebloggerProvider provider = new GuiceWebloggerProvider(guiceModule);
+ WebloggerFactory.bootstrap(provider);
SyncWebsitesTask task = new SyncWebsitesTask();
task.init(); // use default name