Return-Path: 
 <roller-commits-return-2918-apmail-incubator-roller-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org
Received: (qmail 81855 invoked from network); 2 Mar 2007 13:10:58 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 2 Mar 2007 13:10:58 -0000
Received: (qmail 22720 invoked by uid 500); 2 Mar 2007 13:11:06 -0000
Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org
Received: (qmail 22695 invoked by uid 500); 2 Mar 2007 13:11:06 -0000
Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:roller-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:roller-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:roller-commits@incubator.apache.org>
List-Id: <roller-commits.incubator.apache.org>
Reply-To: roller-dev@incubator.apache.org
Delivered-To: mailing list roller-commits@incubator.apache.org
Received: (qmail 22684 invoked by uid 99); 2 Mar 2007 13:11:06 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2007 05:11:06 -0800
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2007 05:10:57 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id E942A1A981A; Fri,  2 Mar 2007 05:10:36 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r513745 - in /incubator/roller/branches/roller_4.0: ./
 nbproject/ src/org/apache/roller/business/ testdata/
 testdata/WEB-INF/classes/ testdata/WEB-INF/classes/META-INF/
 tools/roller-planet/ web/WEB-INF/classes/ web/WEB-INF/classes/META-INF/
Date: Fri, 02 Mar 2007 13:10:36 -0000
To: roller-commits@incubator.apache.org
From: snoopdave@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070302131036.E942A1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: snoopdave
Date: Fri Mar  2 05:10:35 2007
New Revision: 513745

URL: http://svn.apache.org/viewvc?view=rev&rev=513745
Log:
Default to Hibernate for now in Roller 4.0 branch

Modified:
    incubator/roller/branches/roller_4.0/nbproject/project.xml
    incubator/roller/branches/roller_4.0/properties.xmlf
    incubator/roller/branches/roller_4.0/src/org/apache/roller/business/RollerFactory.java
    incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/JPAEMF.properties
    incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml
    incubator/roller/branches/roller_4.0/testdata/roller-custom.properties
    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
    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/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/nbproject/project.xml?view=diff&rev=513745&r1=513744&r2=513745
==============================================================================
--- incubator/roller/branches/roller_4.0/nbproject/project.xml (original)
+++ incubator/roller/branches/roller_4.0/nbproject/project.xml Fri Mar  2 05:10:35 2007
@@ -7,11 +7,6 @@
             <name>roller_4.0</name>
             <folders>
                 <source-folder>
-                    <label>web</label>
-                    <type>doc_root</type>
-                    <location>web</location>
-                </source-folder>
-                <source-folder>
                     <label>src</label>
                     <type>java</type>
                     <location>src</location>
@@ -41,6 +36,11 @@
                     <type>java</type>
                     <location>apps/planet/src/java</location>
                 </source-folder>
+                <source-folder>
+                    <label>web</label>
+                    <type>doc_root</type>
+                    <location>web</location>
+                </source-folder>
             </folders>
             <ide-actions>
                 <action name="build">
@@ -143,7 +143,7 @@
                 <package-root>build/generated/web</package-root>
                 <package-root>tests</package-root>
                 <package-root>apps/planet/src/java</package-root>
-                <classpath mode="compile">tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.3.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/jaxen-full.jar:tools/lib/jdom.jar:tools/lib/log4j-1.2.11.jar:tools/lib/lucene-1.4.3.jar:tools/lib/rome-0.9.jar:tools/lib/rome-fetcher-0.9.jar:tools/lib/saxpath.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/hibernate-3.1/hibernate3.jar:tools/hibernate-3.1/lib/asm-attrs.jar:tools/hibernate-3.1/lib/asm.jar:tools/hibernate-3.1/lib/cglib-2.1.3.jar:tools/hibernate-3.1/lib/dom4j-1.6.1.jar:tools/hibernate-3.1/lib/ehcache-1.1.jar:tools/hibernate-3.1/lib/jdbc2_0-stdext.jar:tools/hibernate-3.1/lib/jta.jar:tools/spring-1.2/acegi-security-1.0.1.jar:tools/spring-1.2/spring.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/l
 ib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/jpa/toplink-essentials.jar:tools/buildtime/junit-3.8.1.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar</classpath>
+                <classpath mode="compile">tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.3.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/jaxen-full.jar:tools/lib/jdom.jar:tools/lib/log4j-1.2.11.jar:tools/lib/lucene-1.4.3.jar:tools/lib/rome-0.9.jar:tools/lib/rome-fetcher-0.9.jar:tools/lib/saxpath.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/hibernate-3.1/hibernate3.jar:tools/hibernate-3.1/lib/asm-attrs.jar:tools/hibernate-3.1/lib/asm.jar:tools/hibernate-3.1/lib/cglib-2.1.3.jar:tools/hibernate-3.1/lib/dom4j-1.6.1.jar:tools/hibernate-3.1/lib/ehcache-1.1.jar:tools/hibernate-3.1/lib/jdbc2_0-stdext.jar:tools/hibernate-3.1/lib/jta.jar:tools/spring-1.2/acegi-security-1.0.1.jar:tools/spring-1.2/spring.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/l
 ib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/buildtime/junit-3.8.1.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/toplink-essentials-9.1/toplink-essentials.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>

Modified: incubator/roller/branches/roller_4.0/properties.xmlf
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/properties.xmlf?view=diff&rev=513745&r1=513744&r2=513745
==============================================================================
--- incubator/roller/branches/roller_4.0/properties.xmlf (original)
+++ incubator/roller/branches/roller_4.0/properties.xmlf Fri Mar  2 05:10:35 2007
@@ -180,8 +180,8 @@
     <fileset refid="commons.jars"/>
     <fileset refid="roller-core.jars" />
     <fileset refid="roller-planet.jars" />
-    <!-- JPA bytecode enhancement apparently wants JPA classes everywhere
-    <fileset refid="jpa.jars" /> -->
+    <!-- JPA bytecode enhancement apparently wants JPA classes everywhere -->
+    <fileset refid="jpa.jars" />
 </path>
 
 <path id="business.path">

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=513745&r1=513744&r2=513745
==============================================================================
--- 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 Fri Mar  2 05:10:35 2007
@@ -31,7 +31,8 @@
     private static Log log = LogFactory.getLog(RollerFactory.class);
     
     private static final String DEFAULT_IMPL =
-        "org.apache.roller.business.jpa.JPARollerImpl";
+        "org.apache.roller.business.hibernate.HibernateRollerImpl";
+        //"org.apache.roller.business.jpa.JPARollerImpl";
         //"org.apache.roller.business.datamapper.jpa.JPARollerImpl";
         //"org.apache.roller.business.hibernate.HibernateRollerImpl";
     

Modified: incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/JPAEMF.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/JPAEMF.properties?view=diff&rev=513745&r1=513744&r2=513745
==============================================================================
--- incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/JPAEMF.properties (original)
+++ incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/JPAEMF.properties Fri Mar  2 05:10:35 2007
@@ -2,6 +2,8 @@
 #-----------------------------------------------------------------------------
 # Database configuration for Glassfish JPA/Toplink
 
+#toplink.logging.level=FINEST
+
 # Default test setup runs Derby
 toplink.jdbc.driver=org.apache.derby.jdbc.ClientDriver
 toplink.jdbc.url=jdbc:derby://localhost:3219/roller
@@ -14,7 +16,6 @@
 #toplink.jdbc.user=scott
 #toplink.jdbc.password=tiger
 
-toplink.logging.level=FINEST
 
 #-----------------------------------------------------------------------------
 # Database configuration for Apache OpenJPA (incubating)

Modified: 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=diff&rev=513745&r1=513744&r2=513745
==============================================================================
--- incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml (original)
+++ incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/META-INF/persistence.xml Fri Mar  2 05:10:35 2007
@@ -4,6 +4,7 @@
     <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
     <!--
     <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+    <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>

Modified: incubator/roller/branches/roller_4.0/testdata/roller-custom.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/testdata/roller-custom.properties?view=diff&rev=513745&r1=513744&r2=513745
==============================================================================
--- incubator/roller/branches/roller_4.0/testdata/roller-custom.properties (original)
+++ incubator/roller/branches/roller_4.0/testdata/roller-custom.properties Fri Mar  2 05:10:35 2007
@@ -1,6 +1,7 @@
 
-# Uncomment this to use JDO backend
-#persistence.roller.classname=org.apache.roller.business.JDO.JDORollerImpl
+#persistence.roller.classname=org.apache.roller.business.jpa.JPARollerImpl
+#persistence.roller.classname=org.apache.roller.business.datamapper.jpa.JPARollerImpl
+#persistence.roller.classname=org.apache.roller.business.hibernate.HibernateRollerImpl
 
 # we don't want to start with any folders/bookmarks for testing
 newuser.blogroll=
@@ -8,7 +9,6 @@
 # we don't want to start with any weblog categories for testing
 newuser.categories=
 
-
 search.index.dir=search-index
 
 jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
@@ -17,8 +17,8 @@
 jdbc.password=APP
 hibernate.dialect=org.hibernate.dialect.DerbyDialect
 
-#jdbc.driverClass=org.hsqldb.jdbcDriver
-#jdbc.connectionURL=jdbc:hsqldb:hsql://localhost:3219
-#jdbc.username=sa
-#jdbc.password=
-#hibernate.dialect=org.hibernate.dialect.HSQLDialect
+#jdbc.driverClass=com.mysql.jdbc.Driver
+#jdbc.connectionURL=jdbc:mysql://localhost:3306/rollertest
+#jdbc.username=scott
+#jdbc.password=tiger
+

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=513745&r1=513744&r2=513745
==============================================================================
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=513745&r1=513744&r2=513745
==============================================================================
--- 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 Fri Mar  2 05:10:35 2007
@@ -4,6 +4,8 @@
         <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
         <!--
         <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+        <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
         -->
         <jta-data-source>jdbc/rollerdb</jta-data-source>
         <mapping-file>org/apache/roller/pojos/AutoPingData.orm.xml                   </mapping-file>
@@ -31,17 +33,14 @@
         <mapping-file>org/apache/roller/pojos/WebsiteData.orm.xml                    </mapping-file>
     </persistence-unit> 
     
-    <persistence-unit name ="PlanetPU" transaction-type = "RESOURCE_LOCAL">
+    <!-- <persistence-unit name ="PlanetPU" transaction-type = "RESOURCE_LOCAL">
         <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-        <!--
-        <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-unit> -->
     
 </persistence>

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=513745&r1=513744&r2=513745
==============================================================================
--- 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 Fri Mar  2 05:10:35 2007
@@ -40,7 +40,8 @@
 # properties in this file are accessed like this ...
 #    PlanetConfig.getProperty("propname");
 
-persistence.planet.classname=org.apache.roller.planet.business.datamapper.jpa.JPAPlanetImpl
+persistence.planet.classname=org.apache.roller.planet.business.hibernate.HibernatePlanetImpl
+#persistence.planet.classname=org.apache.roller.planet.business.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=513745&r1=513744&r2=513745
==============================================================================
--- 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 Fri Mar  2 05:10:35 2007
@@ -322,7 +322,9 @@
 #----------------------------------
 # Persistence settings
 
-persistence.roller.classname=org.apache.roller.business.jpa.JPARollerImpl
+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
 
 #----------------------------------