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 19:00:15 UTC
svn commit: r512879 -
/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/
Author: agilliland
Date: Wed Feb 28 10:00:10 2007
New Revision: 512879
URL: http://svn.apache.org/viewvc?view=rev&rev=512879
Log:
changing pojos to generate UUIDs themselves rather than rely on the persistence framework to generate ids at save time.
NOTE: this commit also contains the modification for a query involving the DISTINCT keyword that Hibernate did not like for some reason so i commented it out, however this may not be okay and should therefore be rolled back.
Modified:
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerPropertyData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.orm.xml
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.java Wed Feb 28 10:00:10 2007
@@ -21,6 +21,7 @@
import java.io.Serializable;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
@@ -35,7 +36,7 @@
* @hibernate.cache usage="read-write"
*/
public class AutoPingData implements Serializable {
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private PingTargetData pingTarget = null;
private WebsiteData website = null;
@@ -55,7 +56,7 @@
* @param website website to which this configuration applies
*/
public AutoPingData(String id, PingTargetData pingtarget, WebsiteData website) {
- this.id = id;
+ //this.id = id;
this.website = website;
this.pingTarget = pingtarget;
}
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.orm.xml Wed Feb 28 10:00:10 2007
@@ -31,7 +31,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
<join-column name="websiteid" insertable="true" updatable="true" nullable="true"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.java Wed Feb 28 10:00:10 2007
@@ -23,6 +23,7 @@
import java.io.Serializable;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
@@ -45,7 +46,7 @@
private FolderData folder;
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private String name;
private String description;
private String url;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.orm.xml Wed Feb 28 10:00:10 2007
@@ -22,7 +22,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="name">
<column name="name" insertable="true" updatable="true" unique="false"/>
@@ -48,6 +47,8 @@
<many-to-one name="folder" target-entity="org.apache.roller.pojos.FolderData">
<join-column name="folderid" insertable="true" updatable="true" nullable="false"/>
</many-to-one>
+
+ <transient name="website"/>
</attributes>
</entity>
</entity-mappings>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.java Wed Feb 28 10:00:10 2007
@@ -22,6 +22,7 @@
import java.sql.Timestamp;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* Weblogentry Comment bean.
@@ -41,7 +42,7 @@
public static final String SPAM = "SPAM";
public static final String PENDING = "PENDING";
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private String name = null;
private String email = null;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.orm.xml Wed Feb 28 10:00:10 2007
@@ -84,7 +84,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="name">
<column name="name" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.java Wed Feb 28 10:00:10 2007
@@ -19,6 +19,7 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* @author David M Johnson
@@ -28,7 +29,7 @@
*/
public class EntryAttributeData implements java.lang.Comparable
{
- private String id;
+ private String id = UUIDGenerator.generateUUID();
private WeblogEntryData entry;
private String name;
private String value;
@@ -43,7 +44,7 @@
String name,
String value)
{
- this.id = id;
+ //this.id = id;
this.entry = entry;
this.name = name;
this.value = value;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.orm.xml Wed Feb 28 10:00:10 2007
@@ -16,7 +16,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="name">
<column name="name" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.java Wed Feb 28 10:00:10 2007
@@ -29,6 +29,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.business.BookmarkManager;
import org.apache.roller.business.RollerFactory;
+import org.apache.roller.util.UUIDGenerator;
/**
@@ -49,7 +50,7 @@
public static final long serialVersionUID = -6272468884763861944L;
// attributes
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private String name = null;
private String description = null;
private String path = null;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.orm.xml Wed Feb 28 10:00:10 2007
@@ -24,7 +24,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="name">
<column name="name" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.java Wed Feb 28 10:00:10 2007
@@ -20,6 +20,7 @@
import java.io.Serializable;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* Represents hit count data for a weblog.
@@ -30,7 +31,7 @@
*/
public class HitCountData implements Serializable {
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private WebsiteData weblog = null;
private int dailyHits = 0;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.orm.xml Wed Feb 28 10:00:10 2007
@@ -27,7 +27,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="dailyHits">
<column name="dailyhits" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.java Wed Feb 28 10:00:10 2007
@@ -19,6 +19,7 @@
import java.util.Date;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* Records change that a user has made to an object.
@@ -30,7 +31,7 @@
*/
public class ObjectAuditData
{
- private String id; // primary key
+ private String id = UUIDGenerator.generateUUID(); // primary key
private String userId; // user that made change
private String objectId; // id of associated object, if any
private String objectClass; // name of associated object class (e.g. WeblogEntryData)
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.orm.xml Wed Feb 28 10:00:10 2007
@@ -16,7 +16,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="changeTime">
<column name="change_time" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.java Wed Feb 28 10:00:10 2007
@@ -18,6 +18,7 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* Represents a user's permissions within a website.
@@ -31,7 +32,7 @@
*/
public class PermissionsData
{
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private WebsiteData website = null;
private UserData user = null;
private boolean pending = true;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.orm.xml Wed Feb 28 10:00:10 2007
@@ -25,7 +25,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="permissionMask">
<column name="permission_mask" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.java Wed Feb 28 10:00:10 2007
@@ -21,6 +21,7 @@
import java.io.Serializable;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* Ping Category Restriction. An instance of this class relates an auto ping configuration {@link AutoPingData} to a
@@ -35,7 +36,7 @@
* @hibernate.cache usage="read-write"
*/
public class PingCategoryRestrictionData implements Serializable {
- private String id;
+ private String id = UUIDGenerator.generateUUID();
private AutoPingData autoPing;
private WeblogCategoryData weblogCategory;
@@ -55,7 +56,7 @@
* @param weblogCategory weblog category to which this auto ping configuration is restricted
*/
public PingCategoryRestrictionData(String id, AutoPingData autoPing, WeblogCategoryData weblogCategory) {
- this.id = id;
+ //this.id = id;
this.autoPing = autoPing;
this.weblogCategory = weblogCategory;
}
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml Wed Feb 28 10:00:10 2007
@@ -16,7 +16,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<many-to-one name="autoping" target-entity="org.apache.roller.pojos.AutoPingData">
<join-column name="autopingid" insertable="true" updatable="true" nullable="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.java Wed Feb 28 10:00:10 2007
@@ -22,6 +22,7 @@
import java.sql.Timestamp;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* Ping queue entry. Each instance of this class represents an entry on the ping queue. The entry indicates when it was
@@ -34,7 +35,7 @@
* @hibernate.cache usage="read-write"
*/
public class PingQueueEntryData implements Serializable {
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private Timestamp entryTime = null;
private PingTargetData pingTarget = null;
private WebsiteData website = null;
@@ -58,7 +59,7 @@
* @param attempts number of prior ping attempts
*/
public PingQueueEntryData(String id, Timestamp entryTime, PingTargetData pingTarget, WebsiteData website, int attempts) {
- this.id = id;
+ //this.id = id;
this.entryTime = entryTime;
this.pingTarget = pingTarget;
this.website = website;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml Wed Feb 28 10:00:10 2007
@@ -29,7 +29,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="entryTime">
<column name="entrytime" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.java Wed Feb 28 10:00:10 2007
@@ -22,6 +22,7 @@
import java.sql.Timestamp;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* Ping target. Each instance represents a possible target of a weblog update ping that we send. Ping targets are
@@ -42,7 +43,7 @@
public static final int CONDITION_FAILING = 1; // last use failed after retrials
public static final int CONDITION_DISABLED = 2; // disabled by failure policy after failures - editing resets
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private String name = null;
private String pingUrl = null;
private WebsiteData website = null;
@@ -67,7 +68,7 @@
* @param website the website (on this server) for which this is a custom ping target (may be null)
*/
public PingTargetData(String id, String name, String pingUrl, WebsiteData website, boolean autoEnable) {
- this.id = id;
+ //this.id = id;
this.name = name;
this.pingUrl = pingUrl;
this.website = website;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.orm.xml Wed Feb 28 10:00:10 2007
@@ -28,7 +28,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="name">
<column name="name" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.java Wed Feb 28 10:00:10 2007
@@ -23,6 +23,7 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* Referer bean.
@@ -37,7 +38,7 @@
implements java.io.Serializable
{
static final long serialVersionUID = -1817992900602131316L;
- private java.lang.String id = null;
+ private java.lang.String id = UUIDGenerator.generateUUID();
private org.apache.roller.pojos.WebsiteData website = null;
private org.apache.roller.pojos.WeblogEntryData weblogEntry = null;
private java.lang.String dateString = null;
@@ -65,7 +66,7 @@
java.lang.Boolean duplicate, java.lang.Integer dayHits,
java.lang.Integer totalHits)
{
- this.id = id;
+ //this.id = id;
this.website = website;
this.weblogEntry = weblogEntry;
this.dateString = dateString;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.orm.xml Wed Feb 28 10:00:10 2007
@@ -56,7 +56,7 @@
</query>
</named-query>
<named-query name="RefererData.getDaysPopularWebsitesByWebsite.enabled&Website.active">
- <query>SELECT SUM(DISTINCT r.dayHits), r.website.id, r.website.name, r.website.handle
+ <query>SELECT SUM(r.dayHits), r.website.id, r.website.name, r.website.handle
FROM RefererData r WHERE r.website.enabled = ?1 AND r.website.active = ?2
GROUP BY r.website.id, r.website.name, r.website.handle
</query>
@@ -81,7 +81,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="dateString">
<column name="datestr" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.java Wed Feb 28 10:00:10 2007
@@ -20,6 +20,7 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* Role bean.
@@ -35,7 +36,7 @@
{
static final long serialVersionUID = -4254083071697970972L;
- private java.lang.String id;
+ private java.lang.String id = UUIDGenerator.generateUUID();
private java.lang.String userName;
private UserData user;
private java.lang.String role;
@@ -46,7 +47,7 @@
public RoleData(String id, UserData user, String role)
{
- this.id = id;
+ //this.id = id;
this.userName = user.getUserName();
this.user = user;
this.role = role;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.orm.xml Wed Feb 28 10:00:10 2007
@@ -15,7 +15,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="userName">
<column name="username" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.java Wed Feb 28 10:00:10 2007
@@ -25,6 +25,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* Configuration object for Roller. Reads and writes roller-config.xml.
@@ -42,7 +43,7 @@
{
static final long serialVersionUID = -6354583200913127875L;
- protected java.lang.String id = null;
+ protected java.lang.String id = UUIDGenerator.generateUUID();
/**
* Roller database version.
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.orm.xml Wed Feb 28 10:00:10 2007
@@ -16,7 +16,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="absoluteURL">
<column name="absoluteurl" insertable="true" updatable="true" unique="false"/>
@@ -101,6 +100,8 @@
<column name="refspamwords" insertable="true" updatable="true" unique="false"/>
</basic>
<transient name="adminUsers"/>
+
+ <transient name="editorPagesList"/>
</attributes>
</entity>
</entity-mappings>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerPropertyData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerPropertyData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerPropertyData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerPropertyData.orm.xml Wed Feb 28 10:00:10 2007
@@ -12,14 +12,12 @@
<entity metadata-complete="true" name="RollerPropertyData"
class="org.apache.roller.pojos.RollerPropertyData">
<table name="roller_properties"/>
- <table-generator name="ROLLER-TABLE-GENERATOR" table="roller_id_table" pk-column-name="pk" value-column-name="value" pk-column-value="1"/>
<named-query name="RollerPropertyData.getAll">
<query>SELECT r FROM RollerPropertyData r</query>
</named-query>
<attributes>
<id name="name">
- <column name="name"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
+ <column name="name" unique="true" />
</id>
<basic name="value">
<column name="value" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.java Wed Feb 28 10:00:10 2007
@@ -21,6 +21,7 @@
import java.io.Serializable;
import java.util.Calendar;
import java.util.Date;
+import org.apache.roller.util.UUIDGenerator;
/**
* Represents locking information about a specific RollerTask.
@@ -31,7 +32,7 @@
*/
public class TaskLockData implements Serializable {
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private String name = null;
private boolean locked = false;
private Date timeAquired = null;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.orm.xml Wed Feb 28 10:00:10 2007
@@ -26,7 +26,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="name">
<column name="name" insertable="true" updatable="true" unique="true"/>
@@ -48,6 +47,9 @@
<basic name="clientId">
<column name="client" insertable="true" updatable="true" unique="false"/>
</basic>
+
+ <transient name="leaseExpires" />
+
</attributes>
</entity>
</entity-mappings>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.java Wed Feb 28 10:00:10 2007
@@ -31,6 +31,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
import org.apache.roller.business.Roller;
+import org.apache.roller.util.UUIDGenerator;
import org.apache.roller.util.Utilities;
@@ -55,7 +56,7 @@
static final long serialVersionUID = -6354583200913127874L;
- private String id;
+ private String id = UUIDGenerator.generateUUID();
private String userName;
private String password;
private String fullName;
@@ -77,7 +78,7 @@
String locale, String timeZone,
Date dateCreated,
Boolean isEnabled) {
- this.id = id;
+ //this.id = id;
this.userName = userName;
this.password = password;
this.fullName = fullName;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.orm.xml Wed Feb 28 10:00:10 2007
@@ -76,7 +76,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="enabled">
<column name="isenabled" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.java Wed Feb 28 10:00:10 2007
@@ -29,6 +29,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.business.WeblogManager;
+import org.apache.roller.util.UUIDGenerator;
/**
@@ -45,7 +46,7 @@
public static final long serialVersionUID = 1435782148712018954L;
// attributes
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private String name = null;
private String description = null;
private String image = null;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml Wed Feb 28 10:00:10 2007
@@ -28,7 +28,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="name">
<column name="name" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.java Wed Feb 28 10:00:10 2007
@@ -52,6 +52,7 @@
import org.apache.roller.util.DateUtil;
import org.apache.roller.util.MessageUtilities;
import org.apache.roller.util.URLUtilities;
+import org.apache.roller.util.UUIDGenerator;
import org.apache.roller.util.Utilities;
/**
@@ -74,7 +75,7 @@
public static final String SCHEDULED = "SCHEDULED";
// Simple properies
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private String title = null;
private String link = null;
private String summary = null;
@@ -122,7 +123,7 @@
Timestamp pubTime,
Timestamp updateTime,
String status) {
- this.id = id;
+ //this.id = id;
this.category = category;
this.website = website;
this.creator = creator;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.orm.xml Wed Feb 28 10:00:10 2007
@@ -86,7 +86,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="title">
<column name="title" insertable="true" updatable="true" unique="false"/>
@@ -170,6 +169,12 @@
<transient name="tagsAsString"/>
<transient name="transformedText"/>
<transient name="transformedSummary"/>
+
+ <transient name="comments"/>
+ <transient name="pluginsList"/>
+ <transient name="referers"/>
+ <transient name="addedTags"/>
+ <transient name="removedTags"/>
</attributes>
</entity>
</entity-mappings>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.java Wed Feb 28 10:00:10 2007
@@ -23,6 +23,7 @@
import java.sql.Timestamp;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* @author Elias Torres
@@ -36,7 +37,7 @@
implements java.io.Serializable
{
private static final long serialVersionUID = -4343500268898106982L;
- private java.lang.String id = null;
+ private java.lang.String id = UUIDGenerator.generateUUID();
private java.lang.String name = null;
private WebsiteData website = null;
private Timestamp lastUsed = null;
@@ -50,7 +51,7 @@
WebsiteData website,
java.lang.String name, int total)
{
- this.id = id;
+ //this.id = id;
this.website = website;
this.name = name;
this.total = total;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml Wed Feb 28 10:00:10 2007
@@ -20,10 +20,12 @@
<query>SELECT w FROM WeblogEntryTagAggregateData w WHERE w.name = ?1 AND w.weblog IS NULL ORDER BY w.lastUsed DESC</query>
</named-query>
<named-query name="WeblogEntryTagAggregateData.getNameByNameIn&Website">
- <query>SELECT DISTINCT w.name FROM WeblogEntryTagAggregateData w WHERE w.name IN (?1) AND w.weblog = ?2</query>
+ <!-- <query>SELECT DISTINCT w.name FROM WeblogEntryTagAggregateData w WHERE w.name IN (?1) AND w.weblog = ?2</query> -->
+ <query>SELECT w.name FROM WeblogEntryTagAggregateData w WHERE w.name IN (?1) AND w.weblog = ?2</query>
</named-query>
<named-query name="WeblogEntryTagAggregateData.getNameByNameIn&WebsiteNull">
- <query>SELECT DISTINCT w.name FROM WeblogEntryTagAggregateData w WHERE w.name IN (?1) AND w.weblog IS NULL</query>
+ <!-- <query>SELECT DISTINCT w.name FROM WeblogEntryTagAggregateData w WHERE w.name IN (?1) AND w.weblog IS NULL</query> -->
+ <query>SELECT w.name FROM WeblogEntryTagAggregateData w WHERE w.name IN (?1) AND w.weblog IS NULL</query>
</named-query>
<named-query name="WeblogEntryTagAggregateData.getPopularTagsByWebsite&StartDate">
<query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.weblog = ?1 AND w.lastUsed >= ?2</query>
@@ -82,7 +84,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="name">
<column name="name" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.java Wed Feb 28 10:00:10 2007
@@ -23,6 +23,7 @@
import java.sql.Timestamp;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.roller.util.UUIDGenerator;
/**
* Tag bean.
@@ -37,7 +38,7 @@
implements java.io.Serializable
{
private static final long serialVersionUID = -2602052289337573384L;
- private java.lang.String id = null;
+ private java.lang.String id = UUIDGenerator.generateUUID();
private WebsiteData website = null;
private WeblogEntryData weblogEntry = null;
private UserData user = null;
@@ -54,7 +55,7 @@
UserData user, java.lang.String name,
Timestamp time)
{
- this.id = id;
+ //this.id = id;
this.website = website;
this.weblogEntry = weblogEntry;
this.user = user;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml Wed Feb 28 10:00:10 2007
@@ -19,7 +19,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="name">
<column name="name" insertable="true" updatable="true" unique="false"/>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.java Wed Feb 28 10:00:10 2007
@@ -27,6 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
+import org.apache.roller.util.UUIDGenerator;
/**
* Pojo that represents a single user defined template page.
@@ -48,7 +49,7 @@
private static Log log = LogFactory.getLog(WeblogTemplate.class);
private static Set requiredTemplates = null;
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private String name = null;
private String description = null;
private String link = null;
@@ -84,7 +85,7 @@
boolean hid,
boolean navbar,
String decorator) {
- this.id = id;
+ //this.id = id;
this.weblog = website;
this.name = name;
this.description = description;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.orm.xml Wed Feb 28 10:00:10 2007
@@ -29,7 +29,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="name">
<column name="name" insertable="true" updatable="true" unique="false"/>
@@ -63,6 +62,8 @@
<join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
</many-to-one>
<transient name="required"/>
+
+ <transient name="decorator"/>
</attributes>
</entity>
</entity-mappings>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.java?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.java Wed Feb 28 10:00:10 2007
@@ -47,6 +47,7 @@
import org.apache.roller.business.ThemeManager;
import org.apache.roller.business.UserManager;
import org.apache.roller.business.WeblogManager;
+import org.apache.roller.util.UUIDGenerator;
/**
* Website has many-to-many association with users. Website has one-to-many and
@@ -66,7 +67,7 @@
private static Log log = LogFactory.getLog(WebsiteData.class);
// Simple properties
- private String id = null;
+ private String id = UUIDGenerator.generateUUID();
private String handle = null;
private String name = null;
private String description = null;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.orm.xml?view=diff&rev=512879&r1=512878&r2=512879
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.orm.xml Wed Feb 28 10:00:10 2007
@@ -135,7 +135,6 @@
<attributes>
<id name="id">
<column name="id"/>
- <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
</id>
<basic name="handle">
<column name="handle" insertable="true" updatable="true" unique="true"/>
@@ -237,8 +236,16 @@
<transient name="commentModerationRequired"/>
<transient name="todaysHits"/>
<transient name="todaysReferrers"/>
- <transient name="uRL"/>
+ <transient name="URL"/>
<transient name="userCount"/>
+
+ <transient name="defaultPage"/>
+ <transient name="entryCount"/>
+ <transient name="initializedPlugins"/>
+ <transient name="pages"/>
+ <transient name="weblogCategories"/>
+ <transient name="localeInstance"/>
+ <transient name="timeZoneInstance" />
</attributes>
</entity>
</entity-mappings>