You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/02/08 23:40:37 UTC
svn commit: r505072 [2/2] - in /incubator/roller/branches/roller_4.0: ./
apps/planet/
apps/planet/src/java/org/apache/roller/planet/business/datamapper/
apps/planet/src/java/org/apache/roller/planet/pojos/
components/core/src/java/org/apache/roller/bus...
Added: 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=auto&rev=505072
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.orm.xml (added)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.orm.xml Thu Feb 8 14:40:35 2007
@@ -0,0 +1,52 @@
+<?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="TaskLockData" class="org.apache.roller.pojos.TaskLockData">
+ <table name="roller_tasklock"/>
+ <named-query name="TaskLockData.getByName">
+ <query>SELECT t FROM TaskLockData t WHERE t.name = ?1</query>
+ </named-query>
+ <named-query name="TaskLockData.updateClient&Timeacquired&TimeleasedByName&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 < CURRENT_TIMESTAMP
+ </query>
+ </named-query>
+ <named-query name="TaskLockData.updateTimeLeasedByName&Client">
+ <query>UPDATE TaskLockData t SET t.timeLeased=?1 WHERE t.name=?2 AND t.clientId=?3</query>
+ </named-query>
+ <attributes>
+ <id name="id">
+ <column name="id"/>
+ <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
+ </id>
+ <basic name="name">
+ <column name="name" insertable="true" updatable="true" unique="true"/>
+ </basic>
+ <basic name="timeAquired">
+ <column name="timeacquired" insertable="true" updatable="true" unique="false"/>
+ <temporal>TIMESTAMP</temporal>
+ </basic>
+ <basic name="lastRun">
+ <column name="lastrun" insertable="true" updatable="true" unique="false"/>
+ <temporal>TIMESTAMP</temporal>
+ </basic>
+ <basic name="locked">
+ <column name="islocked" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="timeLeased">
+ <column name="timeleased" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="clientId">
+ <column name="client" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ </attributes>
+ </entity>
+</entity-mappings>
Added: 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=auto&rev=505072
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.orm.xml (added)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.orm.xml Thu Feb 8 14:40:35 2007
@@ -0,0 +1,114 @@
+<?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&EndDateOrderByStartDateDesc">
+ <query>SELECT u FROM UserData u WHERE u.enabled = ?1 AND u.dateCreated < ?2 ORDER BY u.dateCreated DESC</query>
+ </named-query>
+ <named-query name="UserData.getByEnabled&EndDate&StartDate">
+ <query>SELECT u FROM UserData u WHERE u.enabled = ?1 AND u.dateCreated < ?2 AND u.dateCreated > ?3</query>
+ </named-query>
+ <named-query name="UserData.getByEnabled&EndDate&StartDateOrderByStartDateDesc">
+ <query>SELECT u FROM UserData u WHERE u.enabled = ?1 AND u.dateCreated < ?2 AND u.dateCreated > ?3 ORDER BY u.dateCreated DESC</query>
+ </named-query>
+ <named-query name="UserData.getByEnabled&Permissions.website">
+ <query>SELECT u FROM UserData u JOIN u.permissions p WHERE u.enabled = ?1 AND p.website = ?2</query>
+ </named-query>
+ <named-query name="UserData.getByEnabled&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.getByEndDateOrderByStartDateDesc">
+ <query>SELECT u FROM UserData u WHERE u.dateCreated < ?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&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 JOIN u.permissions p WHERE p.website = ?1</query>
+ </named-query>
+ <named-query name="UserData.getByPermissions.website&Enabled&EndDate&StartDate">
+ <query>SELECT u FROM UserData u JOIN u.permissions p WHERE p.website = ?1 AND u.enabled = ?2
+ AND u.dateCreated < ?3 AND u.dateCreated > ?4
+ </query>
+ </named-query>
+ <named-query name="UserData.getByPermissions.website&EndDate&StartDate">
+ <query>SELECT u FROM UserData u JOIN u.permissions p WHERE p.website = ?1
+ AND u.dateCreated < ?2 AND u.dateCreated > ?3
+ </query>
+ </named-query>
+ <named-query name="UserData.getByEndDate&StartDateOrderByStartDateDesc">
+ <query>SELECT u FROM UserData u WHERE u.dateCreated < ?1 AND u.dateCreated > ?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">
+ <!--
+ DISTINCT is not required for this query as no duplicate UserData would be retrieved
+ -->
+ <query>SELECT COUNT(u) FROM UserData u WHERE u.enabled = ?1</query>
+ </named-query>
+ <attributes>
+ <id name="id">
+ <column name="id"/>
+ <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
+ </id>
+ <basic name="enabled">
+ <column name="isenabled" insertable="true" updatable="true" unique="false"/>
+ </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>
+ <one-to-many name="permissions" mapped-by="user" target-entity="org.apache.roller.pojos.PermissionsData" fetch="LAZY">
+ </one-to-many>
+ <one-to-many name="roles" mapped-by="user" target-entity="org.apache.roller.pojos.RoleData" fetch="LAZY">
+ <cascade>
+ <cascade-all/>
+ </cascade>
+ </one-to-many>
+ </attributes>
+ </entity>
+</entity-mappings>
Added: 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=auto&rev=505072
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml (added)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml Thu Feb 8 14:40:35 2007
@@ -0,0 +1,55 @@
+<?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.getByPath&Website">
+ <query>SELECT w FROM WeblogCategoryData w WHERE w.path = ?1 AND w.website = ?2</query>
+ </named-query>
+ <named-query name="WeblogCategoryData.getByWebsite">
+ <query>SELECT w FROM WeblogCategoryData w WHERE w.website = ?1</query>
+ </named-query>
+ <named-query name="WeblogCategoryData.getByWebsite&ParentNull">
+ <query>SELECT w FROM WeblogCategoryData w WHERE w.website = ?1 AND w.parent IS NULL</query>
+ </named-query>
+ <attributes>
+ <id name="id">
+ <column name="id"/>
+ <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
+ </id>
+ <basic name="name">
+ <column name="name" insertable="true" updatable="true" unique="false"/>
+ </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" fetch="LAZY">
+ <cascade>
+ <cascade-remove/>
+ </cascade>
+ </one-to-many>
+ <transient name="inUse"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Added: 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=auto&rev=505072
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.orm.xml (added)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.orm.xml Thu Feb 8 14:40:35 2007
@@ -0,0 +1,171 @@
+<?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.getByStatus&Category">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.status = ?1 AND w.category = ?2</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getByStatus&Category.pathLike&Website">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.status = ?1 AND w.category.path LIKE ?2 AND w.website = ?3</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getByPinnedToMain&statusOrderByPubTimeDesc">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.pinnedToMain = ?1 AND w.status = ?2 ORDER BY w.pubTime DESC</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getByWebsite&Status&PubTimeGreater&CategoryOrderByPubTimeAsc">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime > ?3 AND w.category = ?4
+ ORDER BY w.pubTime ASC</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getByWebsite&Status&PubTimeGreater&Category&LocaleLikeOrderByPubTimeAsc">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime > ?3 AND w.category = ?4
+ AND UPPER(w.locale) LIKE ?5
+ ORDER BY w.pubTime ASC</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getByWebsite&Status&PubTimeGreaterOrderByPubTimeAsc">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime > ?3
+ ORDER BY w.pubTime ASC</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getByWebsite&Status&PubTimeGreater&LocaleLikeOrderByPubTimeAsc">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime > ?3
+ AND UPPER(w.locale) LIKE ?4
+ ORDER BY w.pubTime ASC</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getByWebsite&Status&PubTimeLessOrderByPubTimeDesc">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime < ?3
+ ORDER BY w.pubTime DESC</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getByWebsite&Status&PubTimeLess&CategoryOrderByPubTimeDesc">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime < ?3 AND w.category = ?4
+ ORDER BY w.pubTime DESC</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getByWebsite&Status&PubTimeLess&Category&LocaleLikeOrderByPubTimeDesc">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime < ?3 AND w.category = ?4
+ AND UPPER(w.locale) LIKE ?5
+ ORDER BY w.pubTime DESC</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getByWebsite&Status&PubTimeLess&LocaleLikeOrderByPubTimeDesc">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.status = ?2 AND w.pubTime < ?3
+ AND UPPER(w.locale) LIKE ?4
+ ORDER BY w.pubTime DESC</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getByWebsite&AnchorOrderByPubTimeDesc">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?1 AND w.anchor = ?2 ORDER BY w.pubTime DESC</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getByWebsite&Anchor">
+ <query>SELECT w FROM WeblogEntryData w WHERE w.website = ?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">
+ <!-- DISTINCT is not required for this query -->
+ <query>SELECT COUNT(e) FROM WeblogEntryData e WHERE e.status = ?1</query>
+ </named-query>
+ <named-query name="WeblogEntryData.getCountDistinctByStatus&Website">
+ <!-- DISTINCT is not required for this query -->
+ <query>SELECT COUNT(e) FROM WeblogEntryData e WHERE e.status = ?1 AND e.website = ?2</query>
+ </named-query>
+ <named-query name="WeblogEntryData.updateAllowComments&CommentDaysByWebsite">
+ <query>UPDATE WeblogEntryData SET allowComments = ?1, commentDays = ?2,
+ pubTime=pubTime, updateTime=updateTime
+ WHERE website = ?3</query>
+ </named-query>
+ <attributes>
+ <id name="id">
+ <column name="id"/>
+ <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
+ </id>
+ <basic name="title">
+ <column name="title" insertable="true" updatable="true" unique="false"/>
+ </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>
+ <one-to-many name="entryAttributes" mapped-by="entry" target-entity="org.apache.roller.pojos.EntryAttributeData" fetch="LAZY">
+ <cascade>
+ <cascade-remove/>
+ </cascade>
+ </one-to-many>
+ <one-to-many name="tags" mapped-by="weblogEntry" target-entity="org.apache.roller.pojos.WeblogEntryTagData" fetch="LAZY">
+ <cascade>
+ <cascade-persist/> <!-- Added so entry added by addTag() gets persisted -->
+ </cascade>
+ </one-to-many>
+ <transient name="categories"/>
+ <transient name="commentCount"/>
+ <transient name="commentsLink"/>
+ <transient name="commentsStillAllowed"/>
+ <transient name="displayContent"/>
+ <transient name="displayTitle"/>
+ <transient name="draft"/>
+ <transient name="pending"/>
+ <transient name="permaLink"/>
+ <transient name="permalink"/>
+ <transient name="published"/>
+ <transient name="rss09xDescription"/>
+ <transient name="tagsAsString"/>
+ <transient name="transformedText"/>
+ <transient name="transformedSummary"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Added: 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=auto&rev=505072
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml (added)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml Thu Feb 8 14:40:35 2007
@@ -0,0 +1,100 @@
+<?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="roller_weblogentrytagagg"/>
+ <named-query name="WeblogEntryTagAggregateData.getByName&WebsiteOrderByLastUsedDesc">
+ <query>SELECT w FROM WeblogEntryTagAggregateData w WHERE w.name = ?1 AND w.weblog = ?2 ORDER BY w.lastUsed DESC</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getByName&WebsiteNullOrderByLastUsedDesc">
+ <query>SELECT w FROM WeblogEntryTagAggregateData w WHERE w.name = ?1 AND w.weblog IS NULL ORDER BY w.lastUsed DESC</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getNameByNameIn&Website">
+ <query>SELECT DISTINCT w.name FROM WeblogEntryTagAggregateData w WHERE w.name IN (?1) AND w.weblog = ?2</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getNameByNameIn&WebsiteNull">
+ <query>SELECT DISTINCT w.name FROM WeblogEntryTagAggregateData w WHERE w.name IN (?1) AND w.weblog IS NULL</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getPopularTagsByWebsite&StartDate">
+ <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.weblog = ?1 AND w.lastUsed >= ?2</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getPopularTagsByWebsite">
+ <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.weblog = ?1</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getPopularTagsByWebsiteNull&StartDate">
+ <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.weblog IS NULL AND w.lastUsed >= ?2</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getPopularTagsByWebsiteNull">
+ <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.weblog IS NULL</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getTagsByWebsite&NameStartsWith">
+ <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.weblog = ?1 AND w.name LIKE ?2 GROUP BY w.name, w.total </query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getTagsByWebsite">
+ <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.weblog = ?1 GROUP BY w.name, w.total</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getTagsByWebsiteNull&NameStartsWith">
+ <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.weblog IS NULL AND w.name LIKE ?2 GROUP BY w.name, w.total</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getTagsByWebsiteNull">
+ <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.weblog IS NULL GROUP BY w.name, w.total</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getTagsByWebsite&NameStartsWithOrderByName">
+ <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.weblog = ?1 AND w.name LIKE ?2 GROUP BY w.name, w.total ORDER BY w.name</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getTagsByWebsiteOrderByName">
+ <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.weblog = ?1 GROUP BY w.name, w.total ORDER BY w.name</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getTagsByWebsiteNull&NameStartsWithOrderByName">
+ <query>SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregateData w WHERE w.weblog IS NULL AND w.name LIKE ?2 GROUP BY w.name, w.total ORDER BY w.name</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.getTagsByWebsiteNullOrderByName">
+ <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&Weblog">
+ <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&WeblogNull">
+ <query>UPDATE WeblogEntryTagAggregateData w SET w.total = w.total + ?1 WHERE w.name = ?2 AND w.weblog IS NULL</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.updateMinusFromTotalByName&WeblogNull">
+ <query>UPDATE WeblogEntryTagAggregateData w SET w.total = w.total - ?1 WHERE w.name = ?2 AND w.weblog IS NULL</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.removeByTotalLessEqual">
+ <query>DELETE FROM WeblogEntryTagAggregateData w WHERE w.total <= ?1</query>
+ </named-query>
+ <named-query name="WeblogEntryTagAggregateData.removeByWeblog">
+ <query>DELETE FROM WeblogEntryTagAggregateData w WHERE w.weblog = ?1</query>
+ </named-query>
+
+
+ <attributes>
+ <id name="id">
+ <column name="id"/>
+ <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
+ </id>
+ <basic name="name">
+ <column name="name" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="lastUsed">
+ <column name="lastused" insertable="true" updatable="true" unique="false"/>
+ </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/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=auto&rev=505072
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml (added)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml Thu Feb 8 14:40:35 2007
@@ -0,0 +1,40 @@
+<?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"/>
+ <named-query name="WeblogEntryTagData.getByWeblog">
+ <query>SELECT w FROM WeblogEntryTagData w WHERE w.weblog= ?1</query>
+ </named-query>
+ <attributes>
+ <id name="id">
+ <column name="id"/>
+ <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
+ </id>
+ <basic name="name">
+ <column name="name" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="time">
+ <column name="time" 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>
+ <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/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=auto&rev=505072
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.orm.xml (added)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.orm.xml Thu Feb 8 14:40:35 2007
@@ -0,0 +1,67 @@
+<?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="WeblogTemplate.getByWebsite">
+ <query>SELECT w FROM WeblogTemplate w Where w.website = ?1</query>
+ </named-query>
+ <named-query name="WeblogTemplate.getByWebsiteOrderByName">
+ <query>SELECT w FROM WeblogTemplate w Where w.website = ?1 ORDER BY w.name</query>
+ </named-query>
+ <named-query name="WeblogTemplate.getByWebsite&Link">
+ <query>SELECT w FROM WeblogTemplate w Where w.website = ?1 AND w.link = ?2</query>
+ </named-query>
+ <named-query name="WeblogTemplate.getByWebsite&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"/>
+ <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
+ </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>
+ <transient name="required"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Added: 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=auto&rev=505072
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.orm.xml (added)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.orm.xml Thu Feb 8 14:40:35 2007
@@ -0,0 +1,243 @@
+<?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="WebsiteData" class="org.apache.roller.pojos.WebsiteData">
+ <table name="website"/>
+ <named-query name="WebsiteData.getByHandle">
+ <query>SELECT w FROM WebsiteData w WHERE w.handle = ?1</query>
+ </named-query>
+ <named-query name="WebsiteData.getByHandleOrderByHandle">
+ <query>SELECT w FROM WebsiteData w WHERE w.handle = ?1 ORDER BY w.handle</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&StartDate&Enabled&Active&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
+ AND w.enabled = ?3 AND w.active = ?4
+ AND EXISTS (SELECT p from PermissionsData p where
+ p.website = w
+ AND p.user = ?5
+ AND p.pending = ?6 )
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&Enabled&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1
+ AND w.enabled = ?2
+ AND EXISTS (SELECT p from PermissionsData p where
+ p.website = w
+ AND p.user = ?3
+ AND p.pending = ?4 )
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&StartDate&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
+ AND EXISTS (SELECT p from PermissionsData p where
+ p.website = w
+ AND p.user = ?3
+ AND p.pending = ?4 )
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&StartDate&Enabled&ActiveOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
+ AND w.enabled = ?3 AND w.active = ?4
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&StartDate&EnabledOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
+ AND w.enabled = ?3
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&StartDateOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDateOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&StartDate&Enabled&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
+ AND w.enabled = ?3
+ AND EXISTS (SELECT p from PermissionsData p where
+ p.website = w
+ AND p.user = ?4
+ AND p.pending = ?5 )
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&StartDate&Active&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
+ AND w.active = ?3
+ AND EXISTS (SELECT p from PermissionsData p where
+ p.website = w
+ AND p.user = ?4
+ AND p.pending = ?5 )
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&StartDate&ActiveOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
+ AND w.active = ?3
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&Enabled&Active&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1
+ AND w.enabled = ?2 AND w.active = ?3
+ AND EXISTS (SELECT p from PermissionsData p where
+ p.website = w
+ AND p.user = ?4
+ AND p.pending = ?5 )
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&Enabled&ActiveOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1
+ AND w.enabled = ?2 AND w.active = ?3
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&EnabledOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1
+ AND w.enabled = ?2
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&Active&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1
+ AND w.active = ?2
+ AND EXISTS (SELECT p from PermissionsData p where
+ p.website = w
+ AND p.user = ?3
+ AND p.pending = ?4 )</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&ActiveOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1
+ AND w.active = ?2
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getByEndDate&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
+ <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1
+ AND EXISTS (SELECT p from PermissionsData p where
+ p.website = w
+ AND p.user = ?2
+ AND p.pending = ?3 )
+ ORDER BY w.dateCreated DESC</query>
+ </named-query>
+ <named-query name="WebsiteData.getCountAllDistinct">
+ <!-- DISTINCT is not required here -->
+ <query>SELECT COUNT(w) FROM WebsiteData w</query>
+ </named-query>
+ <named-query name="WebsiteData.getCountByHandleLike">
+ <query>SELECT COUNT(w) FROM WebsiteData w WHERE UPPER(w.handle) like ?1</query>
+ </named-query>
+ <attributes>
+ <id name="id">
+ <column name="id"/>
+ <generated-value strategy="TABLE" generator="ROLLER-TABLE-GENERATOR"/>
+ </id>
+ <basic name="handle">
+ <column name="handle" insertable="true" updatable="true" unique="true"/>
+ </basic>
+ <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="defaultPageId">
+ <column name="defaultpageid" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="weblogDayPageId">
+ <column name="weblogdayid" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="enableBloggerApi">
+ <column name="enablebloggerapi" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="editorPage">
+ <column name="editorpage" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="blacklist">
+ <column name="blacklist" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="allowComments">
+ <column name="allowcomments" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="defaultAllowComments">
+ <column name="defaultallowcomments" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="defaultCommentDays">
+ <column name="defaultcommentdays" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="moderateComments">
+ <column name="commentmod" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="emailComments">
+ <column name="emailcomments" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="emailFromAddress">
+ <column name="emailfromaddress" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="emailAddress">
+ <column name="emailaddress" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="editorTheme">
+ <column name="editortheme" insertable="true" updatable="true" unique="false"/>
+ </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>
+ <basic name="dateCreated">
+ <column name="datecreated" insertable="true" updatable="true" unique="false"/>
+ <temporal>TIMESTAMP</temporal>
+ </basic>
+ <basic name="defaultPlugins">
+ <column name="defaultplugins" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="entryDisplayCount">
+ <column name="displaycnt" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="enabled">
+ <column name="isenabled" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="active">
+ <column name="isactive" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="lastModified">
+ <column name="lastmodified" insertable="true" updatable="true" unique="false"/>
+ <temporal>TIMESTAMP</temporal>
+ </basic>
+ <basic name="enableMultiLang">
+ <column name="enablemultilang" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="showAllLangs">
+ <column name="showalllangs" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <basic name="pageModels">
+ <column name="pagemodels" insertable="true" updatable="true" unique="false"/>
+ </basic>
+ <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>
+ <many-to-one name="bloggerCategory" target-entity="org.apache.roller.pojos.WeblogCategoryData">
+ <join-column name="bloggercatid" insertable="true" updatable="true"/>
+ </many-to-one>
+ <many-to-one name="defaultCategory" target-entity="org.apache.roller.pojos.WeblogCategoryData">
+ <join-column name="defaultcatid" insertable="true" updatable="true"/>
+ </many-to-one>
+ <one-to-many name="permissions" mapped-by="website" target-entity="org.apache.roller.pojos.PermissionsData" fetch="LAZY">
+ </one-to-many>
+ <transient name="absoluteURL"/>
+ <transient name="adminUserCount"/>
+ <transient name="commentCount"/>
+ <transient name="commentModerationRequired"/>
+ <transient name="todaysHits"/>
+ <transient name="todaysReferrers"/>
+ <transient name="uRL"/>
+ <transient name="userCount"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Modified: incubator/roller/branches/roller_4.0/tools/roller-core/roller-core.jar
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/tools/roller-core/roller-core.jar?view=diff&rev=505072&r1=505071&r2=505072
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_4.0/tools/roller-planet/roller-planet-business.jar
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/tools/roller-planet/roller-planet-business.jar?view=diff&rev=505072&r1=505071&r2=505072
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/classes/JPAEMF.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/classes/JPAEMF.properties?view=diff&rev=505072&r1=505071&r2=505072
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/classes/JPAEMF.properties (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/classes/JPAEMF.properties Thu Feb 8 14:40:35 2007
@@ -1,6 +1,6 @@
toplink.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#toplink.jdbc.url=jdbc:derby://localhost:3219/roller
-toplink.jdbc.url=jdbc:derby://localhost:1527/roller-jpa
+toplink.jdbc.url=jdbc:derby://localhost:3219/roller
+#toplink.jdbc.url=jdbc:derby://localhost:1527/roller-jpa
toplink.jdbc.user=APP
toplink.jdbc.password=APP
toplink.logging.level=FINE
Added: incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml?view=auto&rev=505072
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml (added)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml Thu Feb 8 14:40:35 2007
@@ -0,0 +1,30 @@
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+
+ <persistence-unit name ="RollerPU" transaction-type = "RESOURCE_LOCAL">
+ <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
+ <mapping-file>org/apache/roller/pojos/AutoPingData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/BookmarkData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/CommentData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/EntryAttributeData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/FolderData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/HitCountData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/ObjectAuditData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/PermissionsData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/PingQueueEntryData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/PingTargetData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/RefererData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/RoleData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/RollerConfigData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/RollerPropertyData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/TaskLockData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/UserData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/WeblogCategoryData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/WeblogEntryData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/WeblogEntryTagData.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/WeblogTemplate.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/pojos/WebsiteData.orm.xml </mapping-file>
+ </persistence-unit>
+
+</persistence>
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/classes/roller.properties?view=diff&rev=505072&r1=505071&r2=505072
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/classes/roller.properties Thu Feb 8 14:40:35 2007
@@ -319,6 +319,7 @@
# Persistence settings
persistence.roller.classname=org.apache.roller.business.hibernate.HibernateRollerImpl
+#persistence.roller.classname=org.apache.roller.business.jpa.JPARollerImpl
persistence.filemanager.classname=org.apache.roller.business.FileManagerImpl
#----------------------------------