roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r513725 - in /incubator/roller/branches/roller_4.0: apps/planet/src/java/org/apache/roller/planet/pojos/ src/org/apache/roller/pojos/
Date Fri, 02 Mar 2007 12:17:27 GMT
Author: snoopdave
Date: Fri Mar  2 04:17:25 2007
New Revision: 513725

URL: http://svn.apache.org/viewvc?view=rev&rev=513725
Log:
- Removing line feeds from queries to please OpenJPA
- Switching back to uRL to please OpenJPA and Toplink

Modified:
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml
    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.orm.xml
    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.orm.xml
    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.orm.xml
    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.orm.xml
    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.orm.xml
    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.orm.xml
    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.orm.xml
    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.orm.xml
    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.orm.xml
    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.orm.xml
    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.orm.xml

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -66,7 +66,7 @@
                 </join-table>
             </many-to-many>
             <transient name="name"/>
-            <transient name="URL"/>
+            <transient name="uRL"/>
         </attributes>
     </entity>
 </entity-mappings>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="AutoPingData"
             class="org.apache.roller.pojos.AutoPingData">
         <table name="autoping"/>
-        <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="AutoPingData.getByPingTarget">
             <query>SELECT a FROM AutoPingData a WHERE a.pingTarget = ?1</query>
         </named-query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="BookmarkData"
             class="org.apache.roller.pojos.BookmarkData">
         <table name="bookmark"/>
-        <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="BoomarkData.getByFolder">
             <query>SELECT b FROM BookmarkData b WHERE b.folder = ?1</query>
         </named-query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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 Fri
Mar  2 04:17:25 2007
@@ -11,7 +11,6 @@
     <package>org.apache.roller.pojos</package>
     <entity metadata-complete="true" name="CommentData" class="org.apache.roller.pojos.CommentData">
         <table name="roller_comment"/>
-        <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="CommentData.getCountAllDistinctByStatus">
             <!-- DISTINCT is not required for this query as comments would never be duplicated
in retrieved result-->
             <query>SELECT COUNT(c) FROM CommentData c where c.status = ?1</query>
@@ -25,19 +24,14 @@
             DISTINCT is not required for this query - comments would never be duplicated
in retrieved result 
             because all the navigations from c are for ManyToOne relationship.
             -->
-            <query>SELECT COUNT(c), c.weblogEntry.website.id, c.weblogEntry.website.handle,
c.weblogEntry.website.name
-                   FROM CommentData c WHERE c.weblogEntry.pubTime &lt; ?1
-                   GROUP BY c.weblogEntry.website.id, c.weblogEntry.website.handle, c.weblogEntry.website.name
-            </query>
+            <query>SELECT COUNT(c), c.weblogEntry.website.id, c.weblogEntry.website.handle,
c.weblogEntry.website.name FROM CommentData c WHERE c.weblogEntry.pubTime &lt; ?1 GROUP
BY c.weblogEntry.website.id, c.weblogEntry.website.handle, c.weblogEntry.website.name</query>
         </named-query>
         <named-query name="CommentData.getMostCommentedWebsiteByEndDate&amp;StartDate">
             <!--
             DISTINCT is not required for this query - comments would never be duplicated
in retrieved result
             because all the navigations from c are for ManyToOne relationship.
             -->
-            <query>SELECT COUNT(c), c.weblogEntry.website.id, c.weblogEntry.website.handle,
c.weblogEntry.website.name
-                   FROM CommentData c WHERE c.weblogEntry.pubTime &lt; ?1 AND c.weblogEntry.pubTime
&gt; ?2
-                GROUP BY c.weblogEntry.website.id, c.weblogEntry.website.handle, c.weblogEntry.website.name
+            <query>SELECT COUNT(c), c.weblogEntry.website.id, c.weblogEntry.website.handle,
c.weblogEntry.website.name FROM CommentData c WHERE c.weblogEntry.pubTime &lt; ?1 AND
c.weblogEntry.pubTime &gt; ?2 GROUP BY c.weblogEntry.website.id, c.weblogEntry.website.handle,
c.weblogEntry.website.name
             </query>
         </named-query>
         <named-query name="CommentData.getMostCommentedWeblogEntryByEndDate">
@@ -45,41 +39,28 @@
             DISTINCT is not required for this query - comments would never be duplicated
in retrieved result
             because all the navigations from c are for ManyToOne relationship.
             -->
-            <query>SELECT COUNT(c), c.weblogEntry.website.handle, c.weblogEntry.anchor,
c.weblogEntry.title
-                   FROM CommentData c WHERE c.weblogEntry.pubTime &lt; ?1
-                   GROUP BY c.weblogEntry.website.handle, c.weblogEntry.anchor, c.weblogEntry.title
-            </query>
+            <query>SELECT COUNT(c), c.weblogEntry.website.handle, c.weblogEntry.anchor,
c.weblogEntry.title FROM CommentData c WHERE c.weblogEntry.pubTime &lt; ?1 GROUP BY c.weblogEntry.website.handle,
c.weblogEntry.anchor, c.weblogEntry.title</query>
         </named-query>
         <named-query name="CommentData.getMostCommentedWeblogEntryByEndDate&amp;StartDate">
             <!--
             DISTINCT is not required for this query - comments would never be duplicated
in retrieved result
             because all the navigations from c are for ManyToOne relationship.
             -->
-            <query>SELECT COUNT(c), c.weblogEntry.website.handle, c.weblogEntry.anchor,
c.weblogEntry.title
-                   FROM CommentData c WHERE c.weblogEntry.pubTime &lt; ?1 AND c.weblogEntry.pubTime
&gt; ?2
-                   GROUP BY c.weblogEntry.website.handle, c.weblogEntry.anchor, c.weblogEntry.title
-            </query>
+            <query>SELECT COUNT(c), c.weblogEntry.website.handle, c.weblogEntry.anchor,
c.weblogEntry.title FROM CommentData c WHERE c.weblogEntry.pubTime &lt; ?1 AND c.weblogEntry.pubTime
&gt; ?2 GROUP BY c.weblogEntry.website.handle, c.weblogEntry.anchor, c.weblogEntry.title</query>
         </named-query>
         <named-query name="CommentData.getMostCommentedWeblogEntryByWebsite&amp;EndDate">
             <!--
             DISTINCT is not required for this query - comments would never be duplicated
in retrieved result
             because all the navigations from c are for ManyToOne relationship.
             -->
-            <query>SELECT COUNT(c), c.weblogEntry.website.handle, c.weblogEntry.anchor,
c.weblogEntry.title
-                   FROM CommentData c WHERE c.weblogEntry.website = ?1 AND c.weblogEntry.pubTime
&lt; ?2
-                  GROUP BY c.weblogEntry.website.handle, c.weblogEntry.anchor, c.weblogEntry.title
-            </query>
+            <query>SELECT COUNT(c), c.weblogEntry.website.handle, c.weblogEntry.anchor,
c.weblogEntry.title FROM CommentData c WHERE c.weblogEntry.website = ?1 AND c.weblogEntry.pubTime
&lt; ?2 GROUP BY c.weblogEntry.website.handle, c.weblogEntry.anchor, c.weblogEntry.title</query>
         </named-query>
         <named-query name="CommentData.getMostCommentedWeblogEntryByWebsite&amp;EndDate&amp;StartDate">
             <!--
             DISTINCT is not required for this query - comments would never be duplicated
in retrieved result
             because all the navigations from c are for ManyToOne relationship.
             -->
-            <query>SELECT COUNT(c), c.weblogEntry.website.handle, c.weblogEntry.anchor,
c.weblogEntry.title
-                   FROM CommentData c WHERE c.weblogEntry.website = ?1
-                                        AND c.weblogEntry.pubTime &lt; ?2 AND c.weblogEntry.pubTime
&gt; ?3
-                  GROUP BY c.weblogEntry.website.handle, c.weblogEntry.anchor, c.weblogEntry.title
-            </query>
+            <query>SELECT COUNT(c), c.weblogEntry.website.handle, c.weblogEntry.anchor,
c.weblogEntry.title FROM CommentData c WHERE c.weblogEntry.website = ?1 AND c.weblogEntry.pubTime
&lt; ?2 AND c.weblogEntry.pubTime &gt; ?3 GROUP BY c.weblogEntry.website.handle, c.weblogEntry.anchor,
c.weblogEntry.title</query>
         </named-query>
         <attributes>
             <id name="id">

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="EntryAttributeData"
             class="org.apache.roller.pojos.EntryAttributeData">
         <table name="entryattribute"/>
-        <table-generator name="ROLLER-TABLE-GENERATOR" table="roller_id_table" pk-column-name="pk"
value-column-name="value" pk-column-value="1"/>
         <attributes>
             <id name="id">
                 <column name="id"/>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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 Fri
Mar  2 04:17:25 2007
@@ -11,7 +11,6 @@
     <package>org.apache.roller.pojos</package>
     <entity metadata-complete="true" name="FolderData" class="org.apache.roller.pojos.FolderData">
         <table name="folder"/>
-        <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="FolderData.getByWebsite">
             <query>SELECT f FROM FolderData f WHERE f.website = ?1</query>
         </named-query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -11,15 +11,11 @@
     <package>org.apache.roller.pojos</package>
     <entity metadata-complete="true" name="HitCountData" class="org.apache.roller.pojos.HitCountData">
         <table name="roller_hitcounts"/>
-        <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="HitCountData.getByWeblog">
             <query>SELECT h FROM HitCountData h WHERE h.weblog = ?1</query>
         </named-query>
         <named-query name="HitCountData.getByWeblogEnabledTrueAndActiveTrue&amp;DailyHitsGreaterThenZero&amp;WeblogLastModifiedGreaterOrderByDailyHitsDesc">
-            <query>SELECT h FROM HitCountData h WHERE h.weblog.enabled = true AND h.weblog.active
= true
-                                                  AND h.weblog.lastModified > ?1 AND h.dailyHits
> 0
-                                                ORDER BY h.dailyHits DESC
-            </query>
+            <query>SELECT h FROM HitCountData h WHERE h.weblog.enabled = true AND h.weblog.active
= true AND h.weblog.lastModified > ?1 AND h.dailyHits > 0 ORDER BY h.dailyHits DESC</query>
         </named-query>
         <named-query name="HitCountData.updateDailyHitCountZero">
             <query>UPDATE HitCountData h SET h.dailyHits = 0</query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="ObjectAuditData"
             class="org.apache.roller.pojos.ObjectAuditData">
         <table name="roller_audit_log"/>
-        <table-generator name="ROLLER-TABLE-GENERATOR" table="roller_id_table" pk-column-name="pk"
value-column-name="value" pk-column-value="1"/>
         <attributes>
             <id name="id">
                 <column name="id"/>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="PermissionsData"
             class="org.apache.roller.pojos.PermissionsData">
         <table name="roller_user_permissions"/>
-        <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="PermissionsData.getByWebsiteAndUser">
             <query>SELECT p FROM PermissionsData p WHERE p.website = ?1 AND p.user
= ?2</query>
         </named-query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="PingCategoryRestrictionData"
             class="org.apache.roller.pojos.PingCategoryRestrictionData">
         <table name="pingcategory"/>
-        <table-generator name="ROLLER-TABLE-GENERATOR" table="roller_id_table" pk-column-name="pk"
value-column-name="value" pk-column-value="1"/>
         <attributes>
             <id name="id">
                 <column name="id"/>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="PingQueueEntryData"
             class="org.apache.roller.pojos.PingQueueEntryData">
         <table name="pingqueueentry"/>
-        <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="PingQueueEntryData.getAllOrderByEntryTime">
             <query>SELECT p FROM PingQueueEntryData p ORDER BY p.entryTime</query>
         </named-query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="PingTargetData"
             class="org.apache.roller.pojos.PingTargetData">
         <table name="pingtarget"/>
-        <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="PingTargetData.getByWebsiteNullOrderByName">
             <query>SELECT p FROM PingTargetData p WHERE p.website IS NULL ORDER BY
p.name</query>
         </named-query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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 Fri
Mar  2 04:17:25 2007
@@ -11,10 +11,8 @@
     <package>org.apache.roller.pojos</package>
     <entity metadata-complete="true" name="RefererData" class="org.apache.roller.pojos.RefererData">
         <table name="referer"/>
-        <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="RefererData.getByWeblogEntry&amp;TitleNotNull&amp;ExcerptNotNullOrderByTotalHitsDesc">
-            <query>SELECT r FROM RefererData r WHERE r.weblogEntry = ?1 AND r.title
IS NOT NULL AND r.excerpt IS NOT NULL
-                                               ORDER BY r.totalHits DESC</query>
+            <query>SELECT r FROM RefererData r WHERE r.weblogEntry = ?1 AND r.title
IS NOT NULL AND r.excerpt IS NOT NULL ORDER BY r.totalHits DESC</query>
         </named-query>
         <named-query name="RefererData.getByWeblogEntry">
                 <query>SELECT r FROM RefererData r WHERE r.weblogEntry = ?1</query>
@@ -26,8 +24,7 @@
             <query>SELECT r FROM RefererData r WHERE r.website = ?1 ORDER BY r.totalHits
DESC</query>
         </named-query>
         <named-query name="RefererData.getByWebsite&amp;DateString&amp;DuplicateOrderByTotalHitsDesc">
-            <query>SELECT r FROM RefererData r WHERE r.website = ?1 AND r.dateString
= ?2 AND r.duplicate = ?3
-                                               ORDER BY r.totalHits DESC</query>
+            <query>SELECT r FROM RefererData r WHERE r.website = ?1 AND r.dateString
= ?2 AND r.duplicate = ?3 ORDER BY r.totalHits DESC</query>
         </named-query>
         <named-query name="RefererData.getByWebsite&amp;DayHitsGreaterZeroOrderByDayHitsDesc">
             <query>SELECT r FROM RefererData r WHERE r.website = ?1 AND r.dayHits >
0 ORDER BY r.dayHits DESC</query>
@@ -42,29 +39,20 @@
             <query>SELECT r FROM RefererData r WHERE r.website = ?1 AND r.requestUrl
= ?2 AND r.refererUrl = ?3</query>
         </named-query>
         <named-query name="RefererData.getByWebsite&amp;RequestURL&amp;TitleOrExcerpt">
-            <query>SELECT r FROM RefererData r WHERE r.website = ?1 AND r.requestUrl
= ?2
-                                                AND (r.title = ?3 OR r.excerpt = ?4)</query>
+            <query>SELECT r FROM RefererData r WHERE r.website = ?1 AND r.requestUrl
= ?2 AND (r.title = ?3 OR r.excerpt = ?4)</query>
         </named-query>
         <named-query name="RefererData.getHotWeblogsByWebsite.enabled&amp;Website.active&amp;Website.lastModifiedGreater">
             <!--
             DISTINCT is not required for this query - RefererData would never be duplicated
in retrieved result
             because all the navigations from c are for ManyToOne relationship.
             -->
-            <query>SELECT COUNT(r), r.website.id, r.website.name, r.website.handle
-                FROM RefererData r WHERE r.website.enabled = ?1 AND r.website.active = ?2
AND r.website.lastModified &gt; ?3
-                GROUP BY r.website.id, r.website.name, r.website.handle
-            </query>
+            <query>SELECT COUNT(r), r.website.id, r.website.name, r.website.handle
FROM RefererData r WHERE r.website.enabled = ?1 AND r.website.active = ?2 AND r.website.lastModified
&gt; ?3 GROUP BY r.website.id, r.website.name, r.website.handle</query>
         </named-query>
         <named-query name="RefererData.getDaysPopularWebsitesByWebsite.enabled&amp;Website.active">
-            <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>
+            <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>
         </named-query>
         <named-query name="RefererData.getHitsByWebsite.enabled&amp;Website.id">
-            <query>SELECT SUM(r.dayHits), SUM(r.totalHits)
-                FROM RefererData r WHERE r.website.enabled = ?1 AND r.website.id = ?2
-            </query>
+            <query>SELECT SUM(r.dayHits), SUM(r.totalHits) FROM RefererData r WHERE
r.website.enabled = ?1 AND r.website.id = ?2</query>
         </named-query>
         <named-query name="RefererData.clearDayHits">
             <query>UPDATE RefererData r SET r.dayHits=0</query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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 Fri
Mar  2 04:17:25 2007
@@ -11,7 +11,6 @@
     <package>org.apache.roller.pojos</package>
     <entity metadata-complete="true" name="RoleData" class="org.apache.roller.pojos.RoleData">
         <table name="userrole"/>
-        <table-generator name="ROLLER-TABLE-GENERATOR" table="roller_id_table" pk-column-name="pk"
value-column-name="value" pk-column-value="1"/>
         <attributes>
             <id name="id">
                 <column name="id"/>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="RollerConfigData"
             class="org.apache.roller.pojos.RollerConfigData">
         <table name="rollerconfig"/>
-        <table-generator name="ROLLER-TABLE-GENERATOR" table="roller_id_table" pk-column-name="pk"
value-column-name="value" pk-column-value="1"/>
         <attributes>
             <id name="id">
                 <column name="id"/>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -11,14 +11,11 @@
 	<package>org.apache.roller.pojos</package>
 	<entity metadata-complete="true" name="TaskLockData" class="org.apache.roller.pojos.TaskLockData">
 		<table name="roller_tasklock"/>
-        <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="TaskLockData.getByName">
             <query>SELECT t FROM TaskLockData t WHERE t.name = ?1</query>
         </named-query>
         <named-query name="TaskLockData.updateClient&amp;Timeacquired&amp;TimeleasedByName&amp;Timeacquired">
-            <query> UPDATE TaskLockData t SET t.clientId=?1, t.timeAquired= CURRENT_TIMESTAMP,
t.timeLeased= ?2
-                    WHERE t.name=?3 AND t.timeAquired=?4 AND ?5 &lt; CURRENT_TIMESTAMP
-            </query>
+            <query> UPDATE TaskLockData t SET t.clientId=?1, t.timeAquired= CURRENT_TIMESTAMP,
t.timeLeased= ?2 WHERE t.name=?3 AND t.timeAquired=?4 AND ?5 &lt; CURRENT_TIMESTAMP</query>
         </named-query>
         <named-query name="TaskLockData.updateTimeLeasedByName&amp;Client">
             <query>UPDATE TaskLockData t SET t.timeLeased=?1 WHERE t.name=?2 AND t.clientId=?3</query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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 Fri
Mar  2 04:17:25 2007
@@ -11,7 +11,6 @@
     <package>org.apache.roller.pojos</package>
     <entity metadata-complete="true" name="UserData" class="org.apache.roller.pojos.UserData">
         <table name="rolleruser"/>
-        <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="UserData.getAll">
             <query>SELECT u FROM UserData u</query>
         </named-query>
@@ -52,14 +51,10 @@
             <query>SELECT u FROM UserData u JOIN u.permissions p WHERE p.website =
?1</query>
         </named-query>
         <named-query name="UserData.getByPermissions.website&amp;Enabled&amp;EndDate&amp;StartDate">
-            <query>SELECT u FROM UserData u JOIN u.permissions p WHERE p.website =
?1 AND u.enabled = ?2
-                                              AND u.dateCreated &lt; ?3 AND u.dateCreated
&gt; ?4
-            </query>
+            <query>SELECT u FROM UserData u JOIN u.permissions p WHERE p.website =
?1 AND u.enabled = ?2 AND u.dateCreated &lt; ?3 AND u.dateCreated &gt; ?4</query>
         </named-query>
         <named-query name="UserData.getByPermissions.website&amp;EndDate&amp;StartDate">
-            <query>SELECT u FROM UserData u JOIN u.permissions p WHERE p.website =
?1 
-                                              AND u.dateCreated &lt; ?2 AND u.dateCreated
&gt; ?3
-            </query>
+            <query>SELECT u FROM UserData u JOIN u.permissions p WHERE p.website =
?1 AND u.dateCreated &lt; ?2 AND u.dateCreated &gt; ?3</query>
         </named-query>
         <named-query name="UserData.getByEndDate&amp;StartDateOrderByStartDateDesc">
             <query>SELECT u FROM UserData u WHERE u.dateCreated &lt; ?1 AND u.dateCreated
&gt; ?2 ORDER BY u.dateCreated DESC</query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="WeblogCategoryData"
             class="org.apache.roller.pojos.WeblogCategoryData">
         <table name="weblogcategory"/>
-        <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="WeblogCategoryData.getByPath&amp;Website">
                 <query>SELECT w FROM WeblogCategoryData w WHERE w.path = ?1 AND w.website
= ?2</query>
         </named-query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="WeblogEntryData"
             class="org.apache.roller.pojos.WeblogEntryData">
         <table name="weblogentry"/>
-        <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="WeblogEntryData.getByStatus&amp;Category">
             <query>SELECT w FROM WeblogEntryData w WHERE w.status = ?1 AND w.category
= ?2</query>
         </named-query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="WeblogEntryTagAggregateData"
             class="org.apache.roller.pojos.WeblogEntryTagAggregateData">
         <table name="roller_weblogentrytagagg"/>
-        <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="WeblogEntryTagAggregateData.getByName&amp;WebsiteOrderByLastUsedDesc">
             <query>SELECT w FROM WeblogEntryTagAggregateData w WHERE w.name = ?1 AND
w.weblog = ?2 ORDER BY w.lastUsed DESC</query>
         </named-query>
@@ -64,8 +63,7 @@
             <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE
w.weblog IS NULL GROUP BY w.name, w.total ORDER BY w.name</query>
         </named-query>
         <named-query name="WeblogEntryTagAggregateData.updateAddToTotalByName&amp;Weblog">
-            <query>UPDATE WeblogEntryTagAggregateData w SET w.total = w.total + ?1,
lastUsed = CURRENT_TIMESTAMP
-                                                      WHERE w.name = ?2 AND w.weblog = ?3</query>
+            <query>UPDATE WeblogEntryTagAggregateData w SET w.total = w.total + ?1,
lastUsed = CURRENT_TIMESTAMP WHERE w.name = ?2 AND w.weblog = ?3</query>
         </named-query>
         <named-query name="WeblogEntryTagAggregateData.updateAddToTotalByName&amp;WeblogNull">
             <query>UPDATE WeblogEntryTagAggregateData w SET w.total = w.total + ?1
WHERE w.name = ?2 AND w.weblog IS NULL</query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="WeblogEntryTagData"
             class="org.apache.roller.pojos.WeblogEntryTagData">
         <table name="roller_weblogentrytag"/>
-        <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="WeblogEntryTagData.getByWeblog">
             <query>SELECT w FROM WeblogEntryTagData w WHERE w.weblog= ?1</query>
         </named-query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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
Fri Mar  2 04:17:25 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="WeblogTemplate"
             class="org.apache.roller.pojos.WeblogTemplate">
         <table name="webpage"/>
-        <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="WeblogTemplate.getByWebsite">
             <query>SELECT w FROM WeblogTemplate w Where w.website = ?1</query>
         </named-query>

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=513725&r1=513724&r2=513725
==============================================================================
--- 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 Fri
Mar  2 04:17:25 2007
@@ -11,7 +11,6 @@
 	<package>org.apache.roller.pojos</package>
 	<entity metadata-complete="true" name="WebsiteData" class="org.apache.roller.pojos.WebsiteData">
 		<table name="website"/>
-        <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="WebsiteData.getByHandle">
 			<query>SELECT w FROM WebsiteData w WHERE w.handle = ?1</query>
 		</named-query>
@@ -236,7 +235,7 @@
 			<transient name="commentModerationRequired"/>
 			<transient name="todaysHits"/>
 			<transient name="todaysReferrers"/>
-			<transient name="URL"/>
+			<transient name="uRL"/>
 			<transient name="userCount"/>
                         
                         <transient name="defaultPage"/>



Mime
View raw message