Return-Path: 
 <roller-commits-return-2526-apmail-incubator-roller-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org
Received: (qmail 71493 invoked from network); 5 Dec 2006 00:27:12 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 5 Dec 2006 00:27:12 -0000
Received: (qmail 18155 invoked by uid 500); 5 Dec 2006 00:27:20 -0000
Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org
Received: (qmail 18075 invoked by uid 500); 5 Dec 2006 00:27:20 -0000
Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:roller-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:roller-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:roller-commits@incubator.apache.org>
List-Id: <roller-commits.incubator.apache.org>
Reply-To: roller-dev@incubator.apache.org
Delivered-To: mailing list roller-commits@incubator.apache.org
Received: (qmail 18050 invoked by uid 99); 5 Dec 2006 00:27:20 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Dec 2006 16:27:20 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Dec 2006 16:27:06 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 49BE81A9858; Mon,  4 Dec 2006 16:26:25 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r482428 [5/6] - in
 /incubator/roller/trunk/sandbox/jdobackend:
 src/org/apache/roller/business/datamapper/
 src/org/apache/roller/business/jdo/ src/org/apache/roller/business/jpa/
 src/org/apache/roller/planet/ src/org/apache/roller/planet/poj...
Date: Tue, 05 Dec 2006 00:26:21 -0000
To: roller-commits@incubator.apache.org
From: clr@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061205002625.49BE81A9858@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/AutoPingData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/AutoPingData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/AutoPingData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/AutoPingData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="AutoPingData"
+            class="org.apache.roller.pojos.AutoPingData">
+        <table name="autoping"/>
+        <named-query name="AutoPingData.getByPingTarget">
+            <query>SELECT a FROM AutoPingData a WHERE a.pingTarget = ?1</query>
+        </named-query>
+        <named-query name="AutoPingData.getByPingTarget&amp;Website">
+            <query>SELECT a FROM AutoPingData a WHERE a.pingTarget = ?1 AND a.website = ?2</query>
+        </named-query>
+        <named-query name="AutoPingData.getByWebsite">
+            <query>SELECT a FROM AutoPingData a WHERE a.website = ?1</query>
+        </named-query>
+        <named-query name="AutoPingData.removeByPingTarget">
+            <query>DELETE FROM AutoPingData a WHERE a.pingTarget = ?1</query>
+        </named-query>
+        <named-query name="AutoPingData.removeByPingTarget&amp;Website">
+            <query>DELETE FROM AutoPingData a WHERE a.pingTarget = ?1 AND a.website = ?2</query>
+        </named-query>
+
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
+                <join-column name="websiteid" insertable="true" updatable="true" nullable="true"/>
+            </many-to-one>
+            <many-to-one name="pingTarget" target-entity="org.apache.roller.pojos.PingTargetData">
+                <join-column name="pingtargetid" insertable="true" updatable="true"
+                             nullable="true"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/BookmarkData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/BookmarkData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/BookmarkData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/BookmarkData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="BookmarkData"
+            class="org.apache.roller.pojos.BookmarkData">
+        <table name="bookmark"/>
+        <named-query name="BoomarkData.getByFolder">
+            <query>SELECT b FROM BookmarkData b WHERE b.folder = ?1</query>
+        </named-query>
+        <named-query name="BoomarkData.getByFolder.pathLike&amp;Folder.website">
+            <query>SELECT b FROM BookmarkData b WHERE b.folder.path LIKE '?1%' AND b.folder.website = ?2</query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="name">
+                <column name="name" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="description">
+                <column name="description" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="url">
+                <column name="url" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="weight">
+                <column name="weight" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="priority">
+                <column name="priority" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="image">
+                <column name="image" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="feedUrl">
+                <column name="feedurl" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <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>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/CommentData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/CommentData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/CommentData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/CommentData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="CommentData" class="org.apache.roller.pojos.CommentData">
+        <table name="roller_comment"/>
+        <named-query name="CommentData.getCountAllDistinct">
+            <query>SELECT COUNT(DISTINCT c) FROM CommentData c</query>
+        </named-query>
+        <named-query name="CommentData.getCountDistinctByWebsite">
+            <query>SELECT COUNT(DISTINCT c) FROM CommentData c WHERE c.weblogEntry.website = ?1</query>
+        </named-query>
+        <named-query name="CommentData.getMostCommentedWebsiteByEndDate">
+            <query>SELECT COUNT(DISTINCT c), c.weblogEntry.website.id, c.weblogEntry.website.name, c.weblogEntry.website.description
+                   FROM CommentData c WHERE c.weblogEntry.pubTime &lt; ?1
+                   GROUP BY c.weblogEntry.website.id, c.weblogEntry.website.name, c.weblogEntry.website.description
+            </query>
+        </named-query>
+        <named-query name="CommentData.getMostCommentedWebsiteByEndDate&amp;StartDate">
+            <query>SELECT COUNT(DISTINCT c), c.weblogEntry.website.id, c.weblogEntry.website.name, c.weblogEntry.website.description
+                   FROM CommentData c WHERE c.weblogEntry.pubTime &lt; ?1 AND c.weblogEntry.pubTime &gt; ?2
+                   GROUP BY c.weblogEntry.website.id, c.weblogEntry.website.name, c.weblogEntry.website.description
+            </query>
+        </named-query>
+        <named-query name="CommentData.getMostCommentedWeblogEntryByEndDate">
+            <query>SELECT COUNT(DISTINCT c), c.weblogEntry.website.id, c.weblogEntry.website.anchor, c.weblogEntry.website.title
+                   FROM CommentData c WHERE c.weblogEntry.pubTime &lt; ?1
+                   GROUP BY c.weblogEntry.website.id, c.weblogEntry.website.anchor, c.weblogEntry.website.title
+            </query>
+        </named-query>
+        <named-query name="CommentData.getMostCommentedWeblogEntryByEndDate&amp;StartDate">
+            <query>SELECT COUNT(DISTINCT c), c.weblogEntry.website.id, c.weblogEntry.website.anchor, c.weblogEntry.website.title
+                   FROM CommentData c WHERE c.weblogEntry.pubTime &lt; ?1 AND c.weblogEntry.pubTime &gt; ?2
+                   GROUP BY c.weblogEntry.website.id, c.weblogEntry.website.anchor, c.weblogEntry.website.title
+            </query>
+        </named-query>
+        <named-query name="CommentData.getMostCommentedWeblogEntryByWebsite&amp;EndDate">
+            <query>SELECT COUNT(DISTINCT c), c.weblogEntry.website.id, c.weblogEntry.website.anchor, c.weblogEntry.website.title
+                   FROM CommentData c WHERE c.weblogEntry.website = ? 1 AND c.weblogEntry.pubTime &lt; ?2
+                   GROUP BY c.weblogEntry.website.id, c.weblogEntry.website.anchor, c.weblogEntry.website.title
+            </query>
+        </named-query>
+        <named-query name="CommentData.getMostCommentedWeblogEntryByWebsite&amp;EndDate&amp;StartDate">
+            <query>SELECT COUNT(DISTINCT c), c.weblogEntry.website.id, c.weblogEntry.website.anchor, c.weblogEntry.website.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.id, c.weblogEntry.website.anchor, c.weblogEntry.website.title
+            </query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="name">
+                <column name="name" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="email">
+                <column name="email" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="url">
+                <column name="url" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="content">
+                <column name="content" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="postTime">
+                <column name="posttime" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="spam">
+                <column name="spam" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="notify">
+                <column name="notify" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="pending">
+                <column name="pending" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="approved">
+                <column name="approved" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="remoteHost">
+                <column name="remotehost" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="weblogEntry" target-entity="org.apache.roller.pojos.WeblogEntryData">
+                <join-column name="entryid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/EntryAttributeData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/EntryAttributeData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/EntryAttributeData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/EntryAttributeData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="EntryAttributeData"
+            class="org.apache.roller.pojos.EntryAttributeData">
+        <table name="entryattribute"/>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="name">
+                <column name="name" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="value">
+                <column name="value" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="entry" target-entity="org.apache.roller.pojos.WeblogEntryData">
+                <join-column name="entryid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/FolderData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/FolderData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/FolderData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/FolderData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="FolderData" class="org.apache.roller.pojos.FolderData">
+        <table name="folder"/>
+        <named-query name="FolderData.getByWebsite">
+            <query>SELECT f FROM FolderData f WHERE f.website = ?1</query>
+        </named-query>
+        <named-query name="FolderData.getByWebsite&amp;ParentNull">
+            <query>SELECT f FROM FolderData f WHERE f.website = ?1 AND f.parent IS NULL</query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="name">
+                <column name="name" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="description">
+                <column name="description" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
+                <join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+            <many-to-one name="parent" target-entity="org.apache.roller.pojos.FolderData">
+                <join-column name="parentid" insertable="true" updatable="true" nullable="true"/>
+            </many-to-one>
+            <one-to-many name="folders" mapped-by="parent" target-entity="org.apache.roller.pojos.FolderData">
+                <cascade>
+                    <cascade-remove/>
+                </cascade>
+            </one-to-many>
+            <one-to-many name="bookmarks" mapped-by="folder" target-entity="org.apache.roller.pojos.BookmarkData" order-by="name">
+                <cascade>
+                    <cascade-remove/>  <!--cascade="all-delete-orphan" -->
+                </cascade>
+            </one-to-many>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/HitCountData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/HitCountData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/HitCountData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/HitCountData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="HitCountData" class="org.apache.roller.pojos.HitCountData">
+        <table name="referer"/>
+        <named-query name="HitCountData.getByWeblog">
+            <query>SELECT h FROM HitCountData h WHERE h.weblog = ?1</query>
+        </named-query>
+        <named-query name="HitCountData.getByWeblogEnabledTrueAndActiveTrue&amp;DailyHitsGreaterZero&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>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="dailyHits">
+                <column name="dailyhits" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="weblog" target-entity="org.apache.roller.pojos.WebsiteData">
+                <join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/ObjectAuditData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/ObjectAuditData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/ObjectAuditData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/ObjectAuditData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="ObjectAuditData"
+            class="org.apache.roller.pojos.ObjectAuditData">
+        <table name="roller_audit_log"/>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="changeTime">
+                <column name="change_time" insertable="true" updatable="true" unique="false"/>
+                <temporal>TIMESTAMP</temporal>
+            </basic>
+            <basic name="comment">
+                <column name="comment_text" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="objectClass">
+                <column name="object_class" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="objectId">
+                <column name="object_id" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="userId">
+                <column name="user_id" insertable="true" updatable="true" unique="false"/>
+            </basic>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PermissionsData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PermissionsData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PermissionsData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PermissionsData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="PermissionsData"
+            class="org.apache.roller.pojos.PermissionsData">
+        <table name="roller_user_permissions"/>
+        <named-query name="PermissionsData.getByWebsiteAndUser">
+            <query>SELECT p FROM PermissionsData p WHERE p.website = ?1 AND p.user = ?2</query>
+        </named-query>
+        <named-query name="PermissionsData.getByUserAndPending">
+            <query>SELECT p FROM PermissionsData p WHERE p.user = ?1 AND p.pending = ?2</query>
+        </named-query>
+        <named-query name="PermissionsData.getByWebsiteAndPending">
+            <query>SELECT p FROM PermissionsData p WHERE p.website = ?1 AND p.pending = ?2</query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="permissionMask">
+                <column name="permission_mask" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="pending">
+                <column name="pending" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
+                <join-column name="website_id" insertable="true" updatable="true" nullable="true"/>
+            </many-to-one>
+            <many-to-one name="user" target-entity="org.apache.roller.pojos.UserData">
+                <join-column name="user_id" insertable="true" updatable="true" nullable="true"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="PingCategoryRestrictionData"
+            class="org.apache.roller.pojos.PingCategoryRestrictionData">
+        <table name="pingcategory"/>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <many-to-one name="autoping" target-entity="org.apache.roller.pojos.AutoPingData">
+                <join-column name="autopingid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+            <many-to-one name="weblogCategory"
+                         target-entity="org.apache.roller.pojos.WeblogCategoryData">
+                <join-column name="weblogcategoryid" insertable="true" updatable="true"
+                             nullable="false"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="PingQueueEntryData"
+            class="org.apache.roller.pojos.PingQueueEntryData">
+        <table name="pingqueueentry"/>
+        <named-query name="PingQueueEntryData.getAllOrderByEntryTime">
+            <query>SELECT p FROM PingQueueEntryData p ORDER BY p.entryTime</query>
+        </named-query>
+        <named-query name="PingQueueEntryData.getByPingTarget&amp;Website">
+            <query>SELECT p FROM PingQueueEntryData p WHERE p.pingTarget = ?1 AND p.website = ?2
+            </query>
+        </named-query>
+        <named-query name="PingQueueEntryData.getByWebsite">
+            <query>SELECT p FROM PingQueueEntryData p WHERE p.website = ?1</query>
+        </named-query>
+        <named-query name="PingQueueEntryData.removeByPingTarget">
+            <query>DELETE FROM PingQueueEntryData p WHERE p.pingTarget = ?1</query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="entryTime">
+                <column name="entrytime" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="attempts">
+                <column name="attempts" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="pingTarget" target-entity="org.apache.roller.pojos.PingTargetData">
+                <join-column name="pingtargetid" insertable="true" updatable="true"
+                             nullable="false"/>
+            </many-to-one>
+            <many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
+                <join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PingTargetData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PingTargetData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PingTargetData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/PingTargetData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="PingTargetData"
+            class="org.apache.roller.pojos.PingTargetData">
+        <table name="pingtarget"/>
+        <named-query name="PingTargetData.getByWebsiteNullOrderByName">
+            <query>SELECT p FROM PingTargetData p WHERE p.website IS NULL ORDER BY p.name</query>
+        </named-query>
+        <named-query name="PingTargetData.getByWebsiteOrderByName">
+            <query>SELECT p FROM PingTargetData p WHERE p.website = ?1 ORDER BY p.name</query>
+        </named-query>
+        <named-query name="PingTargetData.getByWebsite&amp;Name&amp;IdNotEqual">
+            <query>SELECT p FROM PingTargetData p WHERE p.website = ?1
+                AND p.name = ?2
+                AND p.id &lt;&gt; ?3
+            </query>
+        </named-query>
+        <named-query name="PingTargetData.removeByWebsiteNotNull">
+            <query>DELETE FROM PingTargetData p WHERE p.website IS NOT NULL</query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="name">
+                <column name="name" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="pingUrl">
+                <column name="pingurl" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="conditionCode">
+                <column name="conditioncode" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="lastSuccess">
+                <column name="lastsuccess" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="autoEnabled">
+                <column name="autoenabled" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
+                <join-column name="websiteid" insertable="true" updatable="true" nullable="true"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RefererData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RefererData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RefererData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RefererData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="RefererData" class="org.apache.roller.pojos.RefererData">
+        <table name="referer"/>
+        <named-query name="RefererData.getByEntryId&amp;TitleNotNull&amp;EcerptNotNullOrderByTotalHitsDesc">
+            <query>SELECT r FROM RefererData r WHERE r.entryId = ?1 AND r.title NOT NULL AND r.ecerpt 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>
+        </named-query>
+        <named-query name="RefererData.getByWebsite">
+            <query>SELECT r FROM RefererData r WHERE r.website = ?1</query>
+        </named-query>
+        <named-query name="RefererData.getByWebsiteOrderByTotalHitsDesc">
+            <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>
+        </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>
+        </named-query>
+        <named-query name="RefererData.getByWebsite&amp;DateString&amp;RefererPermalink">
+            <query>SELECT r FROM RefererData r WHERE r.website = ?1 AND r.dateString = ?2 AND r.refererPermalink = ?3</query>
+        </named-query>
+        <named-query name="RefererData.getByWebsite&amp;RefererURL">
+            <query>SELECT r FROM RefererData r WHERE r.website = ?1 AND r.refererURL = ?2</query>
+        </named-query>
+        <named-query name="RefererData.getByWebsite&amp;RequestURL&amp;RefererURL">
+            <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>
+        </named-query>
+        <named-query name="RefererData.getHotWeblogsByWebsite.enabled&amp;Website.active&amp;Website.lastModifiedGreater">
+            <query>SELECT COUNT(DISTINCT 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(DISTICT 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(DISTICT r.dayHits), SUM(DISTINCT r.totalHits)
+                FROM RefererData r WHERE r.website.enabled = ?1 AND r.website.id = ?2
+            </query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="dateString">
+                <column name="datestr" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="refererUrl">
+                <column name="refurl" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="refererPermalink">
+                <column name="refpermalink" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="requestUrl">
+                <column name="requrl" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="title">
+                <column name="title" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="excerpt">
+                <column name="excerpt" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="visible">
+                <column name="visible" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="duplicate">
+                <column name="duplicate" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="dayHits">
+                <column name="dayhits" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="totalHits">
+                <column name="totalhits" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
+                <join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+            <many-to-one name="weblogEntry" target-entity="org.apache.roller.pojos.WeblogEntryData">
+                <join-column name="entryid" insertable="true" updatable="true"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RoleData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RoleData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RoleData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RoleData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="RoleData" class="org.apache.roller.pojos.RoleData">
+        <table name="userrole"/>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="userName">
+                <column name="username" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="role">
+                <column name="rolename" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="user" target-entity="org.apache.roller.pojos.UserData">
+                <join-column name="userid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RollerConfigData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RollerConfigData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RollerConfigData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RollerConfigData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="RollerConfigData"
+            class="org.apache.roller.pojos.RollerConfigData">
+        <table name="rollerconfig"/>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="absoluteURL">
+                <column name="absoluteurl" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="rssUseCache">
+                <column name="rssusecache" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="rssCacheTime">
+                <column name="rsscachetime" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="newUserAllowed">
+                <column name="newuserallowed" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="userThemes">
+                <column name="userthemes" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="editorPages">
+                <column name="editorpages" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="enableAggregator">
+                <column name="enableaggregator" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="uploadEnabled">
+                <column name="uploadenabled" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="uploadMaxDirMB">
+                <column name="uploadmaxdirmb" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="uploadMaxFileMB">
+                <column name="uploadmaxfilemb" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="uploadAllow">
+                <column name="uploadallow" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="uploadForbid">
+                <column name="uploadforbid" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="uploadDir">
+                <column name="uploaddir" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="uploadPath">
+                <column name="uploadpath" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="memDebug">
+                <column name="memdebug" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="autoformatComments">
+                <column name="autoformatcomments" insertable="true" updatable="true"
+                        unique="false"/>
+            </basic>
+            <basic name="escapeCommentHtml">
+                <column name="escapecommenthtml" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="emailComments">
+                <column name="emailcomments" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="enableLinkback">
+                <column name="enablelinkback" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="siteDescription">
+                <column name="sitedescription" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="siteName">
+                <column name="sitename" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="emailAddress">
+                <column name="emailaddress" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="indexDir">
+                <column name="indexdir" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="encryptPasswords">
+                <column name="encryptpasswords" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="algorithm">
+                <column name="algorithm" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="databaseVersion">
+                <column name="dbversion" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="refererSpamWords">
+                <column name="refspamwords" insertable="true" updatable="true" unique="false"/>
+            </basic>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RollerPropertyData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RollerPropertyData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RollerPropertyData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/RollerPropertyData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="RollerPropertyData"
+            class="org.apache.roller.pojos.RollerPropertyData">
+        <table name="roller_properties"/>
+        <named-query name="RollerPropertyData.getAll">
+            <query>SELECT r FROM RollerPropertyData r</query>
+        </named-query>
+        <attributes>
+            <id name="name">
+                <column name="name"/>
+            </id>
+            <basic name="value">
+                <column name="value" insertable="true" updatable="true" unique="false"/>
+            </basic>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/UserData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/UserData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/UserData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/UserData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="UserData" class="org.apache.roller.pojos.UserData">
+        <table name="rolleruser"/>
+        <named-query name="UserData.getAll">
+            <query>SELECT u FROM UserData u</query>
+        </named-query>
+        <named-query name="UserData.getByEnabled">
+            <query>SELECT u FROM UserData u WHERE u.enabled = ?1</query>
+        </named-query>
+        <named-query name="UserData.getByEnabled&amp;EndDate">
+            <query>SELECT u FROM UserData u WHERE u.enabled = ?1 AND u.dateCreated &lt; ?2</query>
+        </named-query>
+        <named-query name="UserData.getByEnabled&amp;EndDateOrderByStartDateDesc">
+            <query>SELECT u FROM UserData u WHERE u.enabled = ?1 AND u.dateCreated &lt; ?2 ORDER BY u.dateCreated DESC</query>
+        </named-query>
+        <named-query name="UserData.getByEnabled&amp;EndDate&amp;StartDate">
+            <query>SELECT u FROM UserData u WHERE u.enabled = ?1 AND u.dateCreated &lt; ?2 AND u.dateCreated &gt; ?3</query>
+        </named-query>
+        <named-query name="UserData.getByEnabled&amp;EndDate&amp;StartDateOrderByStartDateDesc">
+            <query>SELECT u FROM UserData u WHERE u.enabled = ?1 AND u.dateCreated &lt; ?2 AND u.dateCreated &gt; ?3 ORDER BY u.dateCreated DESC</query>
+        </named-query>
+        <named-query name="UserData.getByEnabled&amp;Permissions.website">
+            <query>SELECT u FROM UserData u WHERE u.enabled = ?1 AND u.permissions.website = ?2</query>
+        </named-query>
+        <named-query name="UserData.getByEnabled&amp;UserNameOrEmailAddressStartsWith">
+            <query>SELECT u FROM UserData u WHERE u.enabled = ?1 AND (u.userName LIKE ?2 OR u.emailAddress LIKE ?2)</query>
+        </named-query>
+        <named-query name="UserData.getByEndDate">
+            <query>SELECT u FROM UserData u WHERE u.dateCreated &lt; ?1</query>
+        </named-query>
+        <named-query name="UserData.getByEndDateOrderByStartDateDesc">
+            <query>SELECT u FROM UserData u WHERE u.dateCreated &lt; ?1 ORDER BY u.dateCreated DESC</query>
+        </named-query>
+        <named-query name="UserData.getByUserName">
+            <query>SELECT u FROM UserData u WHERE u.userName= ?1</query>
+        </named-query>
+        <named-query name="UserData.getByUserName&amp;Enabled">
+            <query>SELECT u FROM UserData u WHERE u.userName= ?1 AND u.enabled = ?2</query>
+        </named-query>
+        <named-query name="UserData.getByUserNameOrEmailAddressStartsWith">
+            <query>SELECT u FROM UserData u WHERE u.userName LIKE ?1 OR u.emailAddress LIKE ?1</query>
+        </named-query>
+        <named-query name="UserData.getByUserNameOrderByUserName">
+            <query>SELECT u FROM UserData u WHERE u.userName= ?1 ORDER BY u.userName</query>
+        </named-query>
+        <named-query name="UserData.getByPermissions.website">
+            <query>SELECT u FROM UserData u WHERE u.permissions.website = ?1</query>
+        </named-query>
+        <named-query name="UserData.getByPermissions.website&amp;Enabled&amp;EndDate&amp;StartDate">
+            <query>SELECT u FROM UserData u WHERE u.permissions.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 WHERE u.permissions.website = ?1 
+                                              AND u.dateCreated &lt; ?2 AND u.dateCreated &gt; ?3
+            </query>
+        </named-query>
+        <named-query name="UserData.getByEndDate&amp;StartDate">
+            <query>SELECT u FROM UserData u WHERE u.dateCreated &lt; ?1 AND u.dateCreated &gt; ?2</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>
+        </named-query>
+        <named-query name="UserData.getCountByUserNameLike">
+            <query>SELECT COUNT(u) FROM UserData u WHERE UPPER(u.userName) LIKE ?1</query>
+        </named-query>
+        <named-query name="UserData.getCountEnabledDistinct">
+            <query>SELECT COUNT(DISTINCT u) FROM UserData WHERE u.enabled = ?1</query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="enabled">
+                <column name="isenabled" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="userName">
+                <column name="username" insertable="true" updatable="true" unique="true"/>
+            </basic>
+            <basic name="password">
+                <column name="passphrase" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="fullName">
+                <column name="fullname" insertable="true" updatable="true" unique="true"/>
+            </basic>
+            <basic name="emailAddress">
+                <column name="emailaddress" insertable="true" updatable="true" unique="true"/>
+            </basic>
+            <basic name="dateCreated">
+                <column name="datecreated" insertable="true" updatable="true" unique="false"/>
+                <temporal>TIMESTAMP</temporal>
+            </basic>
+            <basic name="locale">
+                <column name="locale" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="timeZone">
+                <column name="timeZone" insertable="true" updatable="true" unique="false"/>
+            </basic>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="WeblogCategoryData"
+            class="org.apache.roller.pojos.WeblogCategoryData">
+        <table name="weblogcategory"/>
+        <named-query name="WeblogCategoryData.getByWebsite">
+                <query>SELECT w FROM WeblogCategoryData w WHERE w.website = ?1</query>
+        </named-query>
+        <named-query name="WeblogCategoryData.getByWebsite&amp;ParentNull">
+                <query>SELECT w FROM WeblogCategoryData w WHERE w.website = ?1 AND w.parent IS NULL</query>
+        </named-query>
+        <named-query name="WeblogCategoryData.getByWebsite&amp;ParentNotNull">
+                <query>SELECT w FROM WeblogCategoryData w WHERE w.website = ?1 AND w.parent IS NOT NULL</query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="name">
+                <column name="name" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="description">
+                <column name="description" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="image">
+                <column name="image" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="path">
+                <column name="path" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
+                <join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+            <many-to-one name="parent" target-entity="org.apache.roller.pojos.WeblogCategoryData">
+                <join-column name="parentid" insertable="true" updatable="true" nullable="true"/>
+            </many-to-one>
+            <one-to-many name="weblogCategories" mapped-by="parent" target-entity="org.apache.roller.pojos.WeblogCategoryData">
+                <cascade>
+                    <cascade-remove/>
+                </cascade>
+            </one-to-many>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="WeblogEntryData"
+            class="org.apache.roller.pojos.WeblogEntryData">
+        <table name="weblogentry"/>
+        <named-query name="WeblogEntryData.getByCategory">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.category = ?1</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByCategory.pathLike&amp;Website">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.path LIKE '?1%' AND w.website = ?2</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByPinnedToMainOrderByPubTimeDesc">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.pinnedToMain = ?1 ORDER BY w.pubtime DESC</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByWebsite&amp;Status&amp;PubTimeGreaterThen&amp;CategoryOrderByPubTimeAsc">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime &gt; ?3 AND w.category = ?4
+                                                   ORDER BY w.pubtime ASC</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByWebsite&amp;Status&amp;PubTimeGreaterThen&amp;Category&amp;LocaleLikeOrderByPubTimeAsc">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime &gt; ?3 AND w.category = ?4
+                                                     AND UPPER(w.locale) LIKE '?5%'
+                                                   ORDER BY w.pubtime ASC</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByWebsite&amp;Status&amp;PubTimeGreaterThenOrderByPubTimeAsc">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime &gt; ?3
+                                                   ORDER BY w.pubtime ASC</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByWebsite&amp;Status&amp;PubTimeGreaterThen&amp;LocaleLikeOrderByPubTimeAsc">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime &gt; ?3
+                                                     AND UPPER(w.locale) LIKE '?4%'
+                                                   ORDER BY w.pubtime ASC</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByWebsite&amp;Status&amp;PubTimeLessEqualOrderByPubTimeDesc">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime &lt;= ?3
+                                                   ORDER BY w.pubtime DESC</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByWebsite&amp;Status&amp;PubTimeLessEqual&amp;CategoryOrderByPubTimeDesc">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime &lt;= ?3 AND w.category = ?4
+                                                   ORDER BY w.pubtime DESC</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByWebsite&amp;Status&amp;PubTimeLessEqual&amp;Category&amp;LocaleLikeOrderByPubTimeDesc">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime &lt;= ?3 AND w.category = ?4
+                                                     AND UPPER(w.locale) LIKE '?5%'
+                                                   ORDER BY w.pubtime DESC</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByWebsite&amp;Status&amp;PubTimeLessThenOrderByPubTimeDesc">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime &lt; ?3
+                                                   ORDER BY w.pubtime DESC</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByWebsite&amp;Status&amp;PubTimeLessThen&amp;LocaleLikeOrderByPubTimeDesc">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime &lt; ?3
+                                                     AND UPPER(w.locale) LIKE '?4%'
+                                                   ORDER BY w.pubtime DESC</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByWeblogEntry&amp;Anchor">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.weblogEntry = ?1 AND w.anchor = ?2</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByWebsite">
+            <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getCountDistinctByStatus">
+            <query>SELECT COUNT(DISTINCT e) FROM WeblogEntryData e WHERE e.status = ?1</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getCountDistinctByStatus&amp;Website">
+            <query>SELECT COUNT(DISTINCT e) FROM WeblogEntryData e WHERE e.status = ?1 AND e.website = ?2</query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="title">
+                <column name="title" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="summary">
+                <column name="summary" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="text">
+                <column name="text" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="contentType">
+                <column name="content_type" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="contentSrc">
+                <column name="content_src" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="anchor">
+                <column name="anchor" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="pubTime">
+                <column name="pubtime" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="updateTime">
+                <column name="updatetime" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="status">
+                <column name="status" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="link">
+                <column name="link" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="plugins">
+                <column name="plugins" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="allowComments">
+                <column name="allowcomments" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="commentDays">
+                <column name="commentdays" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="rightToLeft">
+                <column name="righttoleft" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="pinnedToMain">
+                <column name="pinnedtomain" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="locale">
+                <column name="locale" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="category" target-entity="org.apache.roller.pojos.WeblogCategoryData">
+                <join-column name="categoryid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+            <many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
+                <join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+            <many-to-one name="creator" target-entity="org.apache.roller.pojos.UserData">
+                <join-column name="userid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+            <transient name="permaLink"/>
+            <transient name="permaLink"/>
+            <transient name="commentsLink"/>
+            <transient name="displayTitle"/>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="WeblogEntryTagAggregateData"
+            class="org.apache.roller.pojos.WeblogEntryTagAggregateData">
+        <table name="weblogentrytagaggregate"/>
+        <named-query name="WeblogEntryTagAggregateData.getPopularTagsByWebsite&amp;StartDate">
+            <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.website = ?1 AND w.lastUsed &gt;= ?2</query>
+        </named-query>
+        <named-query name="WeblogEntryTagAggregateData.getPopularTagsByWebsite">
+            <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.website = ?1</query>
+        </named-query>
+        <named-query name="WeblogEntryTagAggregateData.getPopularTagsByWebsiteNull&amp;StartDate">
+            <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.website IS NULL AND w.lastUsed &gt;= ?2</query>
+        </named-query>
+        <named-query name="WeblogEntryTagAggregateData.getPopularTagsByWebsiteNull">
+            <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.website IS NULL</query>
+        </named-query>
+        <named-query name="WeblogEntryTagAggregateData.getTagsByWebsite&amp;NameStartsWith">
+            <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.website = ?1 AND w.name LIKE ?2</query>
+        </named-query>
+        <named-query name="WeblogEntryTagAggregateData.getTagsByWebsite">
+            <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.website = ?1</query>
+        </named-query>
+        <named-query name="WeblogEntryTagAggregateData.getTagsByWebsiteNull&amp;NameStartsWith">
+            <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.website IS NULL AND w.name LIKE ?2</query>
+        </named-query>
+        <named-query name="WeblogEntryTagAggregateData.getTagsByWebsiteNull">
+            <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.website IS NULL</query>
+        </named-query>
+        <named-query name="WeblogEntryTagAggregateData.getTagsByWebsite&amp;NameStartsWithOrderByName">
+            <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.website = ?1 AND w.name LIKE ?2 ORDER BY w.name</query>
+        </named-query>
+        <named-query name="WeblogEntryTagAggregateData.getTagsByWebsiteOrderByName">
+            <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.website = ?1 ORDER BY w.name</query>
+        </named-query>
+        <named-query name="WeblogEntryTagAggregateData.getTagsByWebsiteNull&amp;NameStartsWithOrderByName">
+            <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.website IS NULL AND w.name LIKE ?2 ORDER BY w.name</query>
+        </named-query>
+        <named-query name="WeblogEntryTagAggregateData.getTagsByWebsiteNullOrderByName">
+            <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.website IS NULL ORDER BY w.name</query>
+        </named-query>
+        <named-query name="WeblogEntryTagAggregateData.removeByTotalLessEqual">
+            <query>DELETE FROM WeblogEntryTagAggregateData w WHERE w.total &lt;= ?1</query>
+        </named-query>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="name">
+                <column name="name" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="lastUsed">
+                <column name="lastused" insertable="true" updatable="true" unique="false"/>
+                <temporal>TIMESTAMP</temporal>
+            </basic>
+            <basic name="total">
+                <column name="total" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="weblog" target-entity="org.apache.roller.pojos.WebsiteData">
+                <join-column name="websiteid" insertable="true" updatable="true" nullable="true"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="WeblogEntryTagData"
+            class="org.apache.roller.pojos.WeblogEntryTagData">
+        <table name="roller_weblogentrytag"/>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="name">
+                <column name="name" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="time">
+                <column name="time" insertable="true" updatable="true" unique="false"/>
+                <temporal>TIMESTAMP</temporal>
+            </basic>
+            <many-to-one name="weblog" target-entity="org.apache.roller.pojos.WebsiteData">
+                <join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+            <many-to-one name="weblogEntry" target-entity="org.apache.roller.pojos.WeblogEntryData">
+                <join-column name="entryid" insertable="true" updatable="true"/>
+            </many-to-one>
+            <many-to-one name="user" target-entity="org.apache.roller.pojos.UserData">
+                <join-column name="userid" insertable="true" updatable="true"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogTemplate.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogTemplate.orm.xml?view=auto&rev=482428
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogTemplate.orm.xml (added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogTemplate.orm.xml Mon Dec  4 16:26:15 2006
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings version="1.0" xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
+ orm_1_0.xsd">
+    <description>Persistence Metadata for Roller</description>
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <access>PROPERTY</access>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.apache.roller.pojos</package>
+    <entity metadata-complete="true" name="WeblogTemplate"
+            class="org.apache.roller.pojos.WeblogTemplate">
+        <table name="webpage"/>
+        <named-query name="WeblogEntryData.getByWebsite">
+            <query>SELECT w FROM WeblogTemplate w Where w.website = ?1</query>
+        </named-query>
+        <named-query name="WeblogEntryData.getByWebsiteOrderByName">
+            <query>SELECT w FROM WeblogTemplate w Where w.website = ?1 ORDER BY w.name</query>
+        </named-query>
+        <named-query name="WeblogTemplate.getByWebsite&amp;Link">
+            <query>SELECT w FROM WeblogTemplate w Where w.website = ?1 AND w.link = ?2</query>
+        </named-query>
+        <named-query name="WeblogTemplate.getByWebsite&amp;Name">
+            <query>SELECT w FROM WeblogTemplate w Where w.website = ?1 AND w.name= ?2</query>
+        </named-query>
+
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+            </id>
+            <basic name="name">
+                <column name="name" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="description">
+                <column name="description" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="link">
+                <column name="link" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="contents">
+                <column name="template" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="lastModified">
+                <column name="updatetime" insertable="true" updatable="true" unique="false"/>
+                <temporal>TIMESTAMP</temporal>
+            </basic>
+            <basic name="templateLanguage">
+                <column name="templatelang" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="navbar">
+                <column name="navbar" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="hidden">
+                <column name="hidden" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="decoratorName">
+                <column name="decorator" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
+                <join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>