Author: agilliland
Date: Sun Jun 3 12:30:27 2007
New Revision: 543967
URL: http://svn.apache.org/viewvc?view=rev&rev=543967
Log:
updating Roller Core and removing hibernate and jpa persistence strategy
classes and updating roller-core.jar and roller-planet-business.jar used by
weblogger. this also required a couple tweaks to the weblogger code to support
the changes in planet with throwing PlanetExceptions.
Removed:
roller/trunk/components/core/src/java/org/apache/roller/business/hibernate/
roller/trunk/components/core/src/java/org/apache/roller/business/jpa/
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetImpl.java
roller/trunk/components/core/src/java/org/apache/roller/RollerException.java
roller/trunk/tools/roller-core/roller-core.jar
roller/trunk/tools/roller-planet/roller-planet-business.jar
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java?view=diff&rev=543967&r1=543966&r2=543967
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
Sun Jun 3 12:30:27 2007
@@ -30,7 +30,7 @@
import org.apache.commons.lang.StringUtils;
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.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.business.RomeFeedFetcher;
@@ -60,7 +60,7 @@
protected Set getNewEntries(PlanetSubscriptionData sub,
com.sun.syndication.fetcher.FeedFetcher
feedFetcher,
FeedFetcherCache feedInfoCache)
- throws RollerException {
+ throws PlanetException {
String localURL = RollerRuntimeConfig.getProperty("site.absoluteurl");
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetImpl.java?view=diff&rev=543967&r1=543966&r2=543967
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetImpl.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetImpl.java
Sun Jun 3 12:30:27 2007
@@ -19,7 +19,7 @@
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.hibernate.HibernatePersistenceStrategy;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.planet.business.Planet;
@@ -31,11 +31,11 @@
public class HibernateRollerPlanetImpl extends HibernatePlanetImpl {
private static Log log =
LogFactory.getLog(HibernateRollerPlanetImpl.class);
- public HibernateRollerPlanetImpl() throws RollerException {
+ public HibernateRollerPlanetImpl() throws PlanetException {
super();
}
- protected HibernatePersistenceStrategy getStrategy() throws
RollerException {
+ protected HibernatePersistenceStrategy getStrategy() throws
PlanetException {
try {
String dialect =
RollerConfig.getProperty("hibernate.dialect");
@@ -47,7 +47,7 @@
} catch(Throwable t) {
// if this happens then we are screwed
log.fatal("Error initializing Hibernate", t);
- throw new RollerException(t);
+ throw new PlanetException(t);
}
}
@@ -55,7 +55,7 @@
/**
* Instantiates and returns an instance of HibernatePlanetImpl.
*/
- public static Planet instantiate() throws RollerException {
+ public static Planet instantiate() throws PlanetException {
if (me == null) {
log.debug("Instantiating HibernatePlanetImpl");
me = new HibernateRollerPlanetImpl();
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetImpl.java?view=diff&rev=543967&r1=543966&r2=543967
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetImpl.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetImpl.java
Sun Jun 3 12:30:27 2007
@@ -22,9 +22,10 @@
import java.util.Properties;
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.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.DatabaseProvider;
-import org.apache.roller.business.jpa.JPAPersistenceStrategy;
+import org.apache.roller.planet.business.jpa.JPAPersistenceStrategy;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.planet.business.Planet;
import org.apache.roller.planet.business.jpa.JPAPlanetImpl;
@@ -37,11 +38,11 @@
public class JPARollerPlanetImpl extends JPAPlanetImpl {
private static Log log = LogFactory.getLog(JPARollerPlanetImpl.class);
- public JPARollerPlanetImpl() throws RollerException {
+ public JPARollerPlanetImpl() throws PlanetException {
super();
}
- protected JPAPersistenceStrategy getStrategy() throws RollerException {
+ protected JPAPersistenceStrategy getStrategy() throws PlanetException {
// Add OpenJPA, Toplink and Hibernate properties to Roller config.
Properties props = new Properties();
@@ -55,7 +56,13 @@
}
}
- DatabaseProvider dbProvider = DatabaseProvider.getDatabaseProvider();
+ DatabaseProvider dbProvider;
+ try {
+ dbProvider = DatabaseProvider.getDatabaseProvider();
+ } catch (WebloggerException ex) {
+ throw new PlanetException(ex);
+ }
+
if (dbProvider.getType() ==
DatabaseProvider.ConfigurationType.JNDI_NAME) {
return new JPAPersistenceStrategy(
"PlanetPU", "java:comp/env/" + dbProvider.getJndiName(),
props);
@@ -72,7 +79,7 @@
/**
* Instantiates and returns an instance of JPAPlanetImpl.
*/
- public static Planet instantiate() throws RollerException {
+ public static Planet instantiate() throws PlanetException {
if (me == null) {
log.debug("Instantiating JPAPlanetImpl");
me = new JPARollerPlanetImpl();
Modified:
roller/trunk/components/core/src/java/org/apache/roller/RollerException.java
URL:
http://svn.apache.org/viewvc/roller/trunk/components/core/src/java/org/apache/roller/RollerException.java?view=diff&rev=543967&r1=543966&r2=543967
==============================================================================
---
roller/trunk/components/core/src/java/org/apache/roller/RollerException.java
(original)
+++
roller/trunk/components/core/src/java/org/apache/roller/RollerException.java
Sun Jun 3 12:30:27 2007
@@ -25,9 +25,9 @@
/**
* Base Roller exception class.
*/
-public class RollerException extends Exception {
+public abstract class RollerException extends Exception {
- private Throwable mRootCause = null;
+ private final Throwable mRootCause;
/**
@@ -35,6 +35,7 @@
*/
public RollerException() {
super();
+ mRootCause = null;
}
@@ -44,6 +45,7 @@
*/
public RollerException(String s) {
super(s);
+ mRootCause = null;
}
Modified: roller/trunk/tools/roller-core/roller-core.jar
URL:
http://svn.apache.org/viewvc/roller/trunk/tools/roller-core/roller-core.jar?view=diff&rev=543967&r1=543966&r2=543967
==============================================================================
Binary files - no diff available.
Modified: roller/trunk/tools/roller-planet/roller-planet-business.jar
URL:
http://svn.apache.org/viewvc/roller/trunk/tools/roller-planet/roller-planet-business.jar?view=diff&rev=543967&r1=543966&r2=543967
==============================================================================
Binary files - no diff available.
