Author: agilliland
Date: Tue Jun 26 15:16:20 2007
New Revision: 550971
URL: http://svn.apache.org/viewvc?view=rev&rev=550971
Log:
a couple tweaks to stay inline with changes made to Planet backend and removing
old planet hibernate config since we no longer need it now that the planet
business jar includes it.
Removed:
roller/trunk/apps/weblogger/web/WEB-INF/classes/planet-hibernate.cfg.xml
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/RollerPlanetModule.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java?view=diff&rev=550971&r1=550970&r2=550971
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java
Tue Jun 26 15:16:20 2007
@@ -18,7 +18,6 @@
package org.apache.roller.weblogger.business.hibernate;
-import java.io.StringBufferInputStream;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -30,8 +29,6 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.hibernate.cfg.Environment;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
/**
@@ -43,16 +40,11 @@
*/
@com.google.inject.Singleton
public class HibernatePersistenceStrategy {
+
private static Log log =
LogFactory.getLog(HibernatePersistenceStrategy.class);
- protected static SessionFactory sessionFactory = null;
+ private final SessionFactory sessionFactory;
- /** No-op so XML parser doesn't hit the network looking for Hibernate DTDs
*/
- private EntityResolver noOpEntityResolver = new EntityResolver() {
- public InputSource resolveEntity(String publicId, String systemId) {
- return new InputSource(new StringBufferInputStream(""));
- }
- };
/**
* Persistence strategy configures itself by using Roller properties:
@@ -60,16 +52,14 @@
* 'hibernate.dialect' - the classname of the Hibernate dialect to be used,
* 'hibernate.connectionProvider - the classname of Roller's connnection
provider impl.
*/
- protected HibernatePersistenceStrategy() throws WebloggerException {
+ protected HibernatePersistenceStrategy() throws WebloggerException {
+
String dialect =
RollerConfig.getProperty("hibernate.dialect");
String connectionProvider =
RollerConfig.getProperty("hibernate.connectionProvider");
String configuration = "hibernate.cfg.xml";
- init(dialect, connectionProvider, configuration);
- }
-
- protected void init(String dialect, String connectionProvider, String
configuration) {
+
Configuration config = new Configuration();
config.configure(configuration);
@@ -79,7 +69,7 @@
props.put(Environment.CONNECTION_PROVIDER, connectionProvider);
config.mergeProperties(props);
- this.sessionFactory = config.buildSessionFactory();
+ sessionFactory = config.buildSessionFactory();
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java?view=diff&rev=550971&r1=550970&r2=550971
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
Tue Jun 26 15:16:20 2007
@@ -41,15 +41,15 @@
* dialect to be used, 'hibernate.connectionProvider - the classname of
* Roller's connnection provider impl.
*/
- protected HibernateRollerPlanetPersistenceStrategy() throws
PlanetException {
+ protected HibernateRollerPlanetPersistenceStrategy() throws
PlanetException {
+
String dialect =
RollerConfig.getProperty("hibernate.dialect");
String connectionProvider =
RollerConfig.getProperty("hibernate.connectionProvider");
- String configuration = "planet-hibernate.cfg.xml";
Configuration config = new Configuration();
- config.configure(configuration);
+ config.configure("/META-INF/planet-hibernate.cfg.xml");
// Add dialect specified by Roller config and our connection provider
Properties props = new Properties();
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java?view=diff&rev=550971&r1=550970&r2=550971
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java
Tue Jun 26 15:16:20 2007
@@ -27,10 +27,12 @@
import org.apache.roller.planet.business.PropertiesManager;
import org.apache.roller.planet.business.RomeFeedFetcher;
import org.apache.roller.planet.business.URLStrategy;
+import
org.apache.roller.planet.business.hibernate.HibernatePersistenceStrategy;
import org.apache.roller.planet.business.hibernate.HibernatePlanetImpl;
import org.apache.roller.planet.business.hibernate.HibernatePlanetManagerImpl;
import
org.apache.roller.planet.business.hibernate.HibernatePropertiesManagerImpl;
+
/**
* Guice module for configuring Roller's built-in Planet, Hibernate version.
*/
@@ -41,12 +43,12 @@
binder.bind(Planet.class).to(HibernatePlanetImpl.class);
// Use special Planet persistence strategy that works against
RollerConfig
- binder.bind(HibernateRollerPlanetPersistenceStrategy.class);
+
binder.bind(HibernatePersistenceStrategy.class).to(HibernateRollerPlanetPersistenceStrategy.class);
binder.bind(PlanetManager.class).to(
HibernatePlanetManagerImpl.class);
binder.bind(PropertiesManager.class).to(
HibernatePropertiesManagerImpl.class);
binder.bind(URLStrategy.class).to( MultiPlanetURLStrategy.class);
binder.bind(FeedFetcher.class).to( RomeFeedFetcher.class);
- }
+ }
+
}
-
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/RollerPlanetModule.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/RollerPlanetModule.java?view=diff&rev=550971&r1=550970&r2=550971
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/RollerPlanetModule.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/RollerPlanetModule.java
Tue Jun 26 15:16:20 2007
@@ -27,10 +27,12 @@
import org.apache.roller.planet.business.PropertiesManager;
import org.apache.roller.planet.business.RomeFeedFetcher;
import org.apache.roller.planet.business.URLStrategy;
+import org.apache.roller.planet.business.jpa.JPAPersistenceStrategy;
import org.apache.roller.planet.business.jpa.JPAPlanetImpl;
import org.apache.roller.planet.business.jpa.JPAPlanetManagerImpl;
import org.apache.roller.planet.business.jpa.JPAPropertiesManagerImpl;
+
/**
* Guice module for configuring Roller's built-in Planet, JPA version.
*/
@@ -41,12 +43,12 @@
binder.bind(Planet.class).to(JPAPlanetImpl.class);
// Use special Planet persistence strategy that works against
RollerConfig
- binder.bind(JPARollerPlanetPersistenceStrategy.class);
+
binder.bind(JPAPersistenceStrategy.class).to(JPARollerPlanetPersistenceStrategy.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);
- }
+ }
+
}
-
