You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2013/05/31 23:02:49 UTC

svn commit: r1488398 - in /roller/trunk/weblogger-business/src/test/resources: planet-custom.properties roller-custom.properties

Author: gmazza
Date: Fri May 31 21:02:49 2013
New Revision: 1488398

URL: http://svn.apache.org/r1488398
Log:
More accurate (if still imperfect) Hibernate configuration for JUnit tests.

Modified:
    roller/trunk/weblogger-business/src/test/resources/planet-custom.properties
    roller/trunk/weblogger-business/src/test/resources/roller-custom.properties

Modified: roller/trunk/weblogger-business/src/test/resources/planet-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/test/resources/planet-custom.properties?rev=1488398&r1=1488397&r2=1488398&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/test/resources/planet-custom.properties (original)
+++ roller/trunk/weblogger-business/src/test/resources/planet-custom.properties Fri May 31 21:02:49 2013
@@ -10,6 +10,7 @@ database.jdbc.username=app
 database.jdbc.password=app
 
 hibernate.dialect=org.hibernate.dialect.DerbyDialect
+hibernate.transaction.factory_class=org.hibernate.transaction.JDBCTransactionFactory
 
 cache.dir=${planetCacheDir}
 
@@ -20,6 +21,5 @@ cache.dir=${planetCacheDir}
 #hibernate.dialect=org.hibernate.dialect.MySQLDialect
 #openjpa.jdbc.DBDictionary=mysql(SupportsSubselect=false, SearchStringEscape=\\\\)
 
-openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=INFO
-#openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=TRACE
+ openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=TRACE
 

Modified: roller/trunk/weblogger-business/src/test/resources/roller-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/test/resources/roller-custom.properties?rev=1488398&r1=1488397&r2=1488398&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/test/resources/roller-custom.properties (original)
+++ roller/trunk/weblogger-business/src/test/resources/roller-custom.properties Fri May 31 21:02:49 2013
@@ -11,10 +11,9 @@ openjpa.ConnectionRetainMode=always
 openjpa.Log=commons
 
 hibernate.dialect=org.hibernate.dialect.DerbyDialect
-# turn off transaction manager during JUnit testing (TODO: find way to activate for JUnit tests)
-hibernate.transaction.factory_class=
-hibernate.transaction.manager_lookup_class=
+hibernate.transaction.factory_class=org.hibernate.transaction.JDBCTransactionFactory
 
+# turn off transaction manager during JUnit testing (TODO: find way to activate for JUnit tests)
 # use CMA authentication to work around Spring init issues in UI tests
 authentication.cma.enabled=true
 
@@ -51,6 +50,7 @@ log4j.appender.roller.File=${project.bui
 log4j.category.org.apache.roller=INFO
 log4j.category.net.java.roller=ERROR
 
+
 #log4j.category.org.apache.roller.planet.business.jpa.JPAPropertiesManagerImpl=DEBUG
 #log4j.category.org.apache.roller.weblogger.business.jpa.JPAPropertiesManagerImpl=DEBUG
 log4j.category.org.apache.roller.weblogger.business=DEBUG