svn commit: r550899 - in /roller/trunk/apps/weblogger: ./ src/java/org/apache/roller/weblogger/planet/business/hibernate/ src/java/org/apache/roller/weblogger/planet/business/jpa/

[ag...@apache.org]

Author: agilliland
Date: Tue Jun 26 11:22:22 2007
New Revision: 550899

URL: http://svn.apache.org/viewvc?view=rev&rev=550899
Log:
tidy up Weblogger planet integration.


Modified:
    roller/trunk/apps/weblogger/properties.xmlf
    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/jpa/JPARollerPlanetPersistenceStrategy.java

Modified: roller/trunk/apps/weblogger/properties.xmlf
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/properties.xmlf?view=diff&rev=550899&r1=550898&r2=550899
==============================================================================
--- roller/trunk/apps/weblogger/properties.xmlf (original)
+++ roller/trunk/apps/weblogger/properties.xmlf Tue Jun 26 11:22:22 2007
@@ -191,12 +191,12 @@
     <fileset refid="roller-planet.jars" />
     <!-- JPA bytecode enhancement apparently wants JPA classes everywhere -->
     <fileset refid="jpa.jars" />
+    <fileset refid="hibernate.jar" />
+    <fileset refid="hibernate.jars" />
 </path>
 
 <path id="business.path">
     <path refid="base.path"/>
-    <fileset refid="hibernate.jar" />
-    <fileset refid="hibernate.jars" />
 </path>
 
 <path id="presentation.path">

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=550899&r1=550898&r2=550899
==============================================================================
--- 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 11:22:22 2007
@@ -18,19 +18,22 @@
 
 package org.apache.roller.weblogger.planet.business.hibernate;
 
+import java.util.Properties;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.planet.PlanetException;
 import org.apache.roller.planet.business.hibernate.HibernatePersistenceStrategy;
 import org.apache.roller.weblogger.config.RollerConfig;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
+
 
 /**
  * Hibernate strategy for Planet, uses RollerConfig to get Hibernate configuration.
  */
 @com.google.inject.Singleton
 public class HibernateRollerPlanetPersistenceStrategy extends HibernatePersistenceStrategy {
-    private static Log logger = 
-        LogFactory.getFactory().getInstance(HibernateRollerPlanetPersistenceStrategy.class); 
+    
     
     /**
      * Persistence strategy configures itself by using 'planet-hibernate.cfg.xml' 
@@ -44,6 +47,17 @@
         String connectionProvider = 
             RollerConfig.getProperty("hibernate.connectionProvider");        
         String configuration = "planet-hibernate.cfg.xml";
-        init(dialect, connectionProvider, configuration);
-    }   
+        
+        Configuration config = new Configuration();
+        config.configure(configuration);
+
+        // Add dialect specified by Roller config and our connection provider
+        Properties props = new Properties();
+        props.put(Environment.DIALECT, dialect);
+        props.put(Environment.CONNECTION_PROVIDER, connectionProvider);
+        config.mergeProperties(props);
+        
+        sessionFactory = config.buildSessionFactory(); 
+    }
+    
 }

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java?view=diff&rev=550899&r1=550898&r2=550899
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java Tue Jun 26 11:22:22 2007
@@ -30,14 +30,17 @@
 import org.apache.roller.weblogger.business.startup.WebloggerStartup;
 import org.apache.roller.weblogger.config.RollerConfig;
 
+
 /**
  * JPA strategy for Planet, uses RollerConfig to get JPA configuration.
  */
 @com.google.inject.Singleton
 public class JPARollerPlanetPersistenceStrategy extends JPAPersistenceStrategy {
+    
     private static Log logger = 
         LogFactory.getFactory().getInstance(JPARollerPlanetPersistenceStrategy.class); 
     
+    
     /**
      * Construct by finding using DatabaseProvider and RollerConfig.
      * @throws org.apache.roller.PlanetException on any error
@@ -87,10 +90,11 @@
         }
         
         try {
-            this.emf = Persistence.createEntityManagerFactory("PlanetPU", emfProps);
+            emf = Persistence.createEntityManagerFactory("PlanetPU", emfProps);
         } catch (PersistenceException pe) {
             logger.error("ERROR: creating entity manager", pe);
             throw new PlanetException(pe);
         }
-    }  
+    }
+    
 }