From: erik <erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Date: Sat, 22 Mar 2008 17:59:03 +0000 (+0000)
Subject: automatic schema update done by configuring the localsessionfactory for
X-Git-Tag: wamblee-utils-0.2~1^2~234
X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=b961289eb6559d614ec08eb38932e674d58621f9;p=utils

automatic schema update done by configuring the localsessionfactory for
testing.
---

diff --git a/security/src/test/resources/properties/test.org.wamblee.security.hibernate.properties b/security/src/test/resources/properties/test.org.wamblee.security.hibernate.properties
index 42491b2c..47a21e2a 100644
--- a/security/src/test/resources/properties/test.org.wamblee.security.hibernate.properties
+++ b/security/src/test/resources/properties/test.org.wamblee.security.hibernate.properties
@@ -9,6 +9,11 @@ hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
 ###################################################################################
 hibernate.show_sql=false
 
+##############################################################################
+# schema update for test 
+##############################################################################
+hibernate.schemaupdate=true
+
 ###################################################################################
 # hibernate cache provider
 ###################################################################################
diff --git a/security/src/test/resources/spring/test.org.wamblee.security.database.xml b/security/src/test/resources/spring/test.org.wamblee.security.database.xml
index af51a1e3..c9209053 100644
--- a/security/src/test/resources/spring/test.org.wamblee.security.database.xml
+++ b/security/src/test/resources/spring/test.org.wamblee.security.database.xml
@@ -17,6 +17,9 @@
                 <prop key="hibernate.cache.use_query_cache">${hibernate.cache.use_query_cache}</prop>
             </props>
         </property>
+        <property name="schemaUpdate">
+            <value>${hibernate.schemaupdate}</value>
+        </property>
         <property name="mappingResources"><ref bean="hibernateMappingFiles"/></property>
     </bean>
     
diff --git a/support/src/main/java/org/wamblee/cache/EhCache.java b/support/src/main/java/org/wamblee/cache/EhCache.java
index 0dcb2b7a..ffbbab4b 100644
--- a/support/src/main/java/org/wamblee/cache/EhCache.java
+++ b/support/src/main/java/org/wamblee/cache/EhCache.java
@@ -24,6 +24,8 @@ import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheException;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
+import net.sf.ehcache.config.Configuration;
+import net.sf.ehcache.config.ConfigurationFactory;
 
 import org.apache.log4j.Logger;
 import org.wamblee.io.InputResource;
@@ -61,7 +63,7 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
             throws IOException, CacheException {
         InputStream is = aResource.getInputStream();
         try {
-            _manager = CacheManager.create(is);
+        	_manager = new CacheManager(is);
             _cache = _manager.getCache(aCacheName);
             if (_cache == null) {
                 LOGGER.warn("Creating cache '" + aCacheName
diff --git a/support/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java b/support/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java
index 65160dd1..85087f32 100644
--- a/support/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java
+++ b/support/src/main/java/org/wamblee/persistence/hibernate/HibernateSupport.java
@@ -130,7 +130,7 @@ public class HibernateSupport extends HibernateDaoSupport {
         }
         aProcessed.add(elem);
 
-        LOG.info("Setting pk/version on " + aPersistent + " from " + aMerged);
+        LOG.debug("Setting pk/version on " + aPersistent + " from " + aMerged);
 
         if (aPersistent.getPrimaryKey() != null
                 && !aMerged.getPrimaryKey().equals(aPersistent.getPrimaryKey())) {