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 06:14:33 UTC
svn commit: r509899 - in /incubator/roller/branches/roller_4.0:
metadata/database/tmpls/ src/org/apache/roller/business/datamapper/
src/org/apache/roller/business/datamapper/jpa/
src/org/apache/roller/business/jpa/ tools/roller-core/ web/WEB-INF/classes/
Author: snoopdave
Date: Tue Feb 20 21:14:32 2007
New Revision: 509899
URL: http://svn.apache.org/viewvc?view=rev&rev=509899
Log:
- Moved jpa package under datamapper
- Added planet_id_table
- Updated roller-core.jar
- Tests passing 98.7% with JPA/Datamapper
Added:
incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/
incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPARefererManager.java
- copied, changed from r509214, incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPARefererManager.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPARollerImpl.java
- copied, changed from r509214, incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPARollerImpl.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAThreadManagerImpl.java
- copied, changed from r509214, incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPAThreadManagerImpl.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAUserManagerImpl.java
- copied, changed from r509214, incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAWeblogManagerImpl.java
- copied, changed from r509214, incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java
Removed:
incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/DatamapperRollerPlanetManagerImpl.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/
Modified:
incubator/roller/branches/roller_4.0/metadata/database/tmpls/3xx-to-400-migration.vm
incubator/roller/branches/roller_4.0/metadata/database/tmpls/createdb.vm
incubator/roller/branches/roller_4.0/tools/roller-core/roller-core.jar
incubator/roller/branches/roller_4.0/web/WEB-INF/classes/planet.properties
incubator/roller/branches/roller_4.0/web/WEB-INF/classes/roller.properties
Modified: incubator/roller/branches/roller_4.0/metadata/database/tmpls/3xx-to-400-migration.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/metadata/database/tmpls/3xx-to-400-migration.vm?view=diff&rev=509899&r1=509898&r2=509899
==============================================================================
--- incubator/roller/branches/roller_4.0/metadata/database/tmpls/3xx-to-400-migration.vm (original)
+++ incubator/roller/branches/roller_4.0/metadata/database/tmpls/3xx-to-400-migration.vm Tue Feb 20 21:14:32 2007
@@ -13,9 +13,14 @@
insert into roller_id_table (pk, value) values (1, 0);
-
-- TODO: figure out where these Planet tables belong for 4.0 release
+create table planet_id_table (
+ pk int not null primary key,
+ value int not null
+);
+insert into planet_id_table (pk, value) values (1, 0);
+
create table rag_properties (
name varchar(255) not null primary key,
value $TEXT_SQL_TYPE
@@ -39,7 +44,6 @@
insert into rag_planet (id,name,handle) values ('default_planet','default_planet','default_planet');
update rag_group set planet_id='default_planet';
-
-- remove old usercookie table which has been unused since 0.x?
Modified: incubator/roller/branches/roller_4.0/metadata/database/tmpls/createdb.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/metadata/database/tmpls/createdb.vm?view=diff&rev=509899&r1=509898&r2=509899
==============================================================================
--- incubator/roller/branches/roller_4.0/metadata/database/tmpls/createdb.vm (original)
+++ incubator/roller/branches/roller_4.0/metadata/database/tmpls/createdb.vm Tue Feb 20 21:14:32 2007
@@ -424,6 +424,12 @@
create index ea_entryid_idx on entryattribute( entryid );
alter table entryattribute add constraint ea_name_uq unique ( entryid, name$!db.INDEXSIZE );
+create table planet_id_table (
+ pk int not null primary key,
+ value int not null
+);
+insert into planet_id_table (pk, value) values (1, 0);
+
create table rag_group_subscription (
group_id varchar(48) not null,
subscription_id varchar(48) not null
@@ -485,8 +491,14 @@
published $db.TIMESTAMP_SQL_TYPE not null,
updated $db.TIMESTAMP_SQL_TYPE
);
-create index rage_sid_idx on rag_entry(subscription_id);
-
+create index rage_sid_idx on rag_entry(subscription_id);
+
+create table rag_planet (
+ id varchar(48) not null primary key,
+ name varchar(255) not null,
+ handle varchar(32) not null
+);
+create index ragp_handle_idx on rag_planet(handle);
insert into rag_planet (id,name,handle) values ('default_planet','default_planet','default_planet');
Copied: incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPARefererManager.java (from r509214, incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPARefererManager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPARefererManager.java?view=diff&rev=509899&p1=incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPARefererManager.java&r1=509214&p2=incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPARefererManager.java&r2=509899
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPARefererManager.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPARefererManager.java Tue Feb 20 21:14:32 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.business.jpa;
+package org.apache.roller.business.datamapper.jpa;
import org.apache.roller.business.datamapper.DatamapperRefererManagerImpl;
import org.apache.roller.business.datamapper.DatamapperQuery;
Copied: incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPARollerImpl.java (from r509214, incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPARollerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPARollerImpl.java?view=diff&rev=509899&p1=incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPARollerImpl.java&r1=509214&p2=incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPARollerImpl.java&r2=509899
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPARollerImpl.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPARollerImpl.java Tue Feb 20 21:14:32 2007
@@ -16,7 +16,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.business.jpa;
+package org.apache.roller.business.datamapper.jpa;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAThreadManagerImpl.java (from r509214, incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPAThreadManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAThreadManagerImpl.java?view=diff&rev=509899&p1=incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPAThreadManagerImpl.java&r1=509214&p2=incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAThreadManagerImpl.java&r2=509899
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPAThreadManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAThreadManagerImpl.java Tue Feb 20 21:14:32 2007
@@ -17,7 +17,7 @@
*/
-package org.apache.roller.business.jpa;
+package org.apache.roller.business.datamapper.jpa;
import org.apache.roller.business.runnable.RollerTask;
import org.apache.roller.business.RollerFactory;
Copied: incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAUserManagerImpl.java (from r509214, incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAUserManagerImpl.java?view=diff&rev=509899&p1=incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java&r1=509214&p2=incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAUserManagerImpl.java&r2=509899
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAUserManagerImpl.java Tue Feb 20 21:14:32 2007
@@ -17,11 +17,9 @@
*/
-package org.apache.roller.business.jpa;
+package org.apache.roller.business.datamapper.jpa;
import org.apache.roller.pojos.TagStat;
-import org.apache.roller.business.jpa.JPAPersistenceStrategy;
-import org.apache.roller.business.jpa.JPAUpdateQuery;
import org.apache.roller.business.datamapper.DatamapperUserManagerImpl;
import org.apache.roller.RollerException;
Copied: incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAWeblogManagerImpl.java (from r509214, incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAWeblogManagerImpl.java?view=diff&rev=509899&p1=incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java&r1=509214&p2=incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAWeblogManagerImpl.java&r2=509899
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/business/datamapper/jpa/JPAWeblogManagerImpl.java Tue Feb 20 21:14:32 2007
@@ -17,7 +17,7 @@
*/
-package org.apache.roller.business.jpa;
+package org.apache.roller.business.datamapper.jpa;
import java.util.ArrayList;
import java.util.Arrays;
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=509899&r1=509898&r2=509899
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/classes/planet.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/classes/planet.properties?view=diff&rev=509899&r1=509898&r2=509899
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/classes/planet.properties (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/classes/planet.properties Tue Feb 20 21:14:32 2007
@@ -40,7 +40,7 @@
# properties in this file are accessed like this ...
# PlanetConfig.getProperty("propname");
-persistence.planet.classname=org.apache.roller.planet.business.hibernate.HibernateRollerPlanetImpl
+persistence.planet.classname=org.apache.roller.planet.business.datamapper.jpa.JPAPlanetImpl
# Absolute URL to site
site.absoluteurl=http://localhost:8080/planet
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=509899&r1=509898&r2=509899
==============================================================================
--- 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 Tue Feb 20 21:14:32 2007
@@ -318,8 +318,7 @@
#----------------------------------
# Persistence settings
-persistence.roller.classname=org.apache.roller.business.hibernate.HibernateRollerImpl
-#persistence.roller.classname=org.apache.roller.business.jpa.JPARollerImpl
+persistence.roller.classname=org.apache.roller.business.datamapper.jpa.JPARollerImpl
persistence.filemanager.classname=org.apache.roller.business.FileManagerImpl
#----------------------------------