You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/02/28 18:39:59 UTC
svn commit: r512868 -
/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/
Author: agilliland
Date: Wed Feb 28 09:39:57 2007
New Revision: 512868
URL: http://svn.apache.org/viewvc?view=rev&rev=512868
Log:
updating Planet pojos to generate their own UUIDs rather than rely on the persistence framework to assign ids at save time.
Roller Planet tests are now passing 100% tests on all of ...
- JPA/TopLink on Derby
- JPA/TopLink on MySQL
- JPA/Hibernate on Derby
- JPA/Hibernate on MySQL
Modified:
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java?view=diff&rev=512868&r1=512867&r2=512868
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java Wed Feb 28 09:39:57 2007
@@ -20,6 +20,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.roller.util.UUIDGenerator;
/**
@@ -29,7 +30,7 @@
*/
public class PlanetData {
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private String title = null;
private String handle = null;
private Set groups = new HashSet();
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml?view=diff&rev=512868&r1=512867&r2=512868
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml Wed Feb 28 09:39:57 2007
@@ -22,7 +22,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="PLANET-TABLE-GENERATOR"/>
</id>
<basic name="title">
<column name="title" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java?view=diff&rev=512868&r1=512867&r2=512868
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java Wed Feb 28 09:39:57 2007
@@ -31,6 +31,7 @@
import com.sun.syndication.feed.synd.SyndEntry;
import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.roller.util.UUIDGenerator;
/**
@@ -45,7 +46,7 @@
*/
public class PlanetEntryData implements Serializable, Comparable {
- protected String id;
+ protected String id = UUIDGenerator.generateUUID();
protected String handle;
protected String title;
protected String guid;
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml?view=diff&rev=512868&r1=512867&r2=512868
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml Wed Feb 28 09:39:57 2007
@@ -38,7 +38,7 @@
<named-query
name="PlanetEntryData.getByExternalOrInternalGroup&EndDateOrderByPubTimeDesc">
<query>SELECT p FROM PlanetEntryData p JOIN p.subscription s JOIN s.groups g
- WHERE (g.handle = "external" OR g.handle = "all")
+ WHERE (g.handle = 'external' OR g.handle = 'all')
AND p.pubTime < ?2
ORDER BY p.pubTime DESC
</query>
@@ -46,7 +46,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="PLANET-TABLE-GENERATOR"/>
</id>
<basic name="categoriesString">
<column name="categories" insertable="true" updatable="true" unique="false"/>
@@ -83,6 +82,12 @@
<transient name="published"/>
<transient name="updated"/>
<transient name="content"/>
+
+ <transient name="categories"/>
+ <transient name="category"/>
+ <transient name="creator"/>
+ <transient name="summary"/>
+ <transient name="website"/>
</attributes>
</entity>
</entity-mappings>
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java?view=diff&rev=512868&r1=512867&r2=512868
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java Wed Feb 28 09:39:57 2007
@@ -17,12 +17,10 @@
package org.apache.roller.planet.pojos;
import java.io.Serializable;
-import java.util.Collection;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import java.util.StringTokenizer;
-import java.util.TreeSet;
+import org.apache.roller.util.UUIDGenerator;
/**
@@ -35,7 +33,7 @@
transient private String[] catArray = null;
/** Database ID */
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
/** Unique handle by which group may be fetched */
private String handle = null;
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml?view=diff&rev=512868&r1=512867&r2=512868
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml Wed Feb 28 09:39:57 2007
@@ -30,7 +30,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="PLANET-TABLE-GENERATOR"/>
</id>
<basic name="categoryRestriction">
<column name="cat_restriction" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java?view=diff&rev=512868&r1=512867&r2=512868
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java Wed Feb 28 09:39:57 2007
@@ -24,6 +24,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.roller.util.UUIDGenerator;
/**
@@ -34,7 +35,7 @@
public class PlanetSubscriptionData implements Serializable, Comparable
{
/** Database ID */
- protected String id;
+ protected String id = UUIDGenerator.generateUUID();
/** Title of the blog or website */
protected String title;
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml?view=diff&rev=512868&r1=512867&r2=512868
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml Wed Feb 28 09:39:57 2007
@@ -30,7 +30,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="PLANET-TABLE-GENERATOR"/>
</id>
<basic name="feedURL">
<column name="feed_url" insertable="true" updatable="true" unique="false"/>
@@ -67,7 +66,7 @@
</join-table>
</many-to-many>
<transient name="name"/>
- <transient name="uRL"/>
+ <transient name="URL"/>
</attributes>
</entity>
</entity-mappings>