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/21 23:09:58 UTC
svn commit: r510265 - in /incubator/roller/branches/roller_4.0:
src/org/apache/roller/business/ src/org/apache/roller/pojos/
testdata/WEB-INF/classes/META-INF/ tools/roller-planet/
web/WEB-INF/classes/META-INF/
Author: snoopdave
Date: Wed Feb 21 14:09:57 2007
New Revision: 510265
URL: http://svn.apache.org/viewvc?view=rev&rev=510265
Log:
- More tweaks to JPA mappings
- For now, JPA/Datamapper impl is the default in this branch
Added:
incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/
incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml
Modified:
incubator/roller/branches/roller_4.0/src/org/apache/roller/business/RollerFactory.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerPropertyData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.orm.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.orm.xml
incubator/roller/branches/roller_4.0/tools/roller-planet/roller-planet-business.jar
incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/business/RollerFactory.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/business/RollerFactory.java?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/business/RollerFactory.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/business/RollerFactory.java Wed Feb 21 14:09:57 2007
@@ -31,7 +31,8 @@
private static Log log = LogFactory.getLog(RollerFactory.class);
private static final String DEFAULT_IMPL =
- "org.apache.roller.business.hibernate.HibernateRollerImpl";
+ "org.apache.roller.business.datamapper.jpa.JPARollerImpl";
+ //"org.apache.roller.business.hibernate.HibernateRollerImpl";
private static Roller rollerInstance = null;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/AutoPingData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/BookmarkData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/CommentData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/EntryAttributeData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/FolderData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/HitCountData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/ObjectAuditData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PermissionsData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/PingTargetData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RefererData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RoleData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerConfigData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerPropertyData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerPropertyData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerPropertyData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/RollerPropertyData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/TaskLockData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/UserData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WeblogTemplate.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.orm.xml?view=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/WebsiteData.orm.xml Wed Feb 21 14:09:57 2007
@@ -1,7 +1,7 @@
<?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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
<description>Persistence Metadata for Roller</description>
<persistence-unit-metadata>
<persistence-unit-defaults>
Added: incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml?view=auto&rev=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml (added)
+++ incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml Wed Feb 21 14:09:57 2007
@@ -0,0 +1,31 @@
+<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>
+ <jta-data-source>jdbc/rollerdb</jta-data-source>
+ <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/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=510265&r1=510264&r2=510265
==============================================================================
Binary files - no diff available.
Modified: 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=diff&rev=510265&r1=510264&r2=510265
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/classes/META-INF/persistence.xml Wed Feb 21 14:09:57 2007
@@ -26,6 +26,16 @@
<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-unit>
+
+ <persistence-unit name ="PlanetPU" transaction-type = "RESOURCE_LOCAL">
+ <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
+ <jta-data-source>jdbc/rollerdb</jta-data-source>
+ <mapping-file>org/apache/roller/planet/pojos/PlanetData.orm.xml</mapping-file>
+ <mapping-file>org/apache/roller/planet/pojos/PlanetGroupData.orm.xml</mapping-file>
+ <mapping-file>org/apache/roller/planet/pojos/PropertyData.orm.xml</mapping-file>
+ <mapping-file>org/apache/roller/planet/pojos/PlanetEntryData.orm.xml</mapping-file>
+ <mapping-file>org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml</mapping-file>
+ </persistence-unit>
</persistence>