Author: agilliland
Date: Sun Jun 3 17:17:34 2007
New Revision: 544016
URL: http://svn.apache.org/viewvc?view=rev&rev=544016
Log:
fixing up planet code. it seems that when the jpa code was merged in our id
generation strategy switched to manually generating UUIDs but the hibernate
backend was not properly updated for this change.
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java?view=diff&rev=544016&r1=544015&r2=544016
==============================================================================
---
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java
(original)
+++
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java
Sun Jun 3 17:17:34 2007
@@ -18,19 +18,16 @@
package org.apache.roller.planet.business.hibernate;
-import java.io.StringBufferInputStream;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.planet.PlanetException;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
-import org.apache.roller.planet.PlanetException;
import org.hibernate.cfg.Environment;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
/**
@@ -42,18 +39,12 @@
*/
public class HibernatePersistenceStrategy {
- static final long serialVersionUID = 2561090040518169098L;
+ private static final long serialVersionUID = 2561090040518169098L;
- protected static SessionFactory sessionFactory = null;
+ private static final Log log =
LogFactory.getLog(HibernatePersistenceStrategy.class);
- private static Log log =
LogFactory.getLog(HibernatePersistenceStrategy.class);
+ 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:
@@ -61,7 +52,9 @@
* 'hibernate.dialect' - the classname of the Hibernate dialect to be used,
* 'hibernate.connectionProvider - the classname of Roller's connnection
provider impl.
*/
- public HibernatePersistenceStrategy(String configResource, String dialect,
String connectionProvider) {
+ public HibernatePersistenceStrategy(String configResource,
+ String dialect,
+ String connectionProvider) {
// Read Hibernate config file specified by Roller config
Configuration config = new Configuration();
@@ -73,7 +66,7 @@
props.put(Environment.CONNECTION_PROVIDER, connectionProvider);
config.mergeProperties(props);
- this.sessionFactory = config.buildSessionFactory();
+ sessionFactory = config.buildSessionFactory();
}
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java?view=diff&rev=544016&r1=544015&r2=544016
==============================================================================
---
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
(original)
+++
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
Sun Jun 3 17:17:34 2007
@@ -58,7 +58,7 @@
/**
- * @hibernate.id column="id" generator-class="uuid.hex"
unsaved-value="null"
+ * @hibernate.id column="id" generator-class="assigned"
*/
public String getId() {
return id;
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java?view=diff&rev=544016&r1=544015&r2=544016
==============================================================================
---
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java
(original)
+++
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java
Sun Jun 3 17:17:34 2007
@@ -180,7 +180,7 @@
//----------------------------------------------------------- persistent
fields
/**
- * @hibernate.id column="id" generator-class="uuid.hex"
unsaved-value="null"
+ * @hibernate.id column="id" generator-class="assigned"
* @roller.wrapPojoMethod type="simple"
*/
public String getId() {
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java?view=diff&rev=544016&r1=544015&r2=544016
==============================================================================
---
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java
(original)
+++
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java
Sun Jun 3 17:17:34 2007
@@ -24,6 +24,7 @@
import java.util.TreeSet;
import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
+import org.apache.roller.util.UUIDGenerator;
/**
@@ -36,7 +37,7 @@
transient private String[] catArray = null;
// attributes
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private String handle = null;
private String title = null;
private String description = null;
@@ -71,7 +72,7 @@
/**
- * @hibernate.id column="id" generator-class="uuid.hex"
unsaved-value="null"
+ * @hibernate.id column="id" generator-class="assigned"
*/
public String getId() {
return id;
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java?view=diff&rev=544016&r1=544015&r2=544016
==============================================================================
---
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java
(original)
+++
roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java
Sun Jun 3 17:17:34 2007
@@ -71,7 +71,7 @@
/**
- * @hibernate.id column="id" generator-class="uuid.hex"
unsaved-value="null"
+ * @hibernate.id column="id" generator-class="assigned"
*/
public String getId() {
return id;
