Author: julien(a)jboss.com Date: 2007-07-18 11:38:56 -0400 (Wed, 18 Jul 2007) New Revision: 7821 Modified: branches/JBoss_Portal_Branch_2_6/test/src/etc/hibernates.xml branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java Log: portal to 2.6 the fix of oracle with instance container and the improvement of hibernate support logging from commit #7820 from trunk Modified: branches/JBoss_Portal_Branch_2_6/test/src/etc/hibernates.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/etc/hibernates.xml 2007-07-18 15:34:41 UTC (rev 7820) +++ branches/JBoss_Portal_Branch_2_6/test/src/etc/hibernates.xml 2007-07-18 15:38:56 UTC (rev 7821) @@ -55,6 +55,11 @@ <name>hibernate.dialect</name> <value>org.hibernate.dialect.Oracle9Dialect</value> </property> + <!-- Needed in order to avoid the bug described in HBX-146 to happen in instance container test case --> + <property> + <name>hibernate.cache.use_second_level_cache</name> + <value>true</value> + </property> </properties> </configuration> <!-- The oracle 10g configuration --> @@ -65,6 +70,11 @@ <name>hibernate.dialect</name> <value>org.hibernate.dialect.Oracle9Dialect</value> </property> + <!-- Needed in order to avoid the bug described in HBX-146 to happen in instance container test case --> + <property> + <name>hibernate.cache.use_second_level_cache</name> + <value>true</value> + </property> </properties> </configuration> <!-- The sqlserver configuration --> @@ -107,4 +117,4 @@ </property> </properties> </configuration> -</configurations> \ No newline at end of file +</configurations> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java 2007-07-18 15:34:41 UTC (rev 7820) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java 2007-07-18 15:38:56 UTC (rev 7821) @@ -35,6 +35,7 @@ import org.jboss.portal.common.io.IOTools; import org.w3c.dom.Element; import org.w3c.dom.Document; +import org.apache.log4j.Logger; import javax.transaction.Synchronization; import java.util.Collection; @@ -54,6 +55,9 @@ { /** . */ + protected Logger log = Logger.getLogger(HibernateSupport.class); + + /** . */ protected String jndiName; /** . */ @@ -107,29 +111,49 @@ public void setJNDIName(String jndiName) { this.jndiName = jndiName; + + // + if (jndiName == null) + { + log = Logger.getLogger(HibernateSupport.class); + } + else + { + log = Logger.getLogger(jndiName); + } } protected void createConfiguration() { Configuration cfg = new Configuration(); + // for (Iterator i = mappings.iterator(); i.hasNext();) { String mapping = (String)i.next(); + log.debug("Adding mapping " + mapping); cfg.addResource(mapping, Thread.currentThread().getContextClassLoader()); } // Properties props = new Properties(); - props.putAll(config.properties); + for (Iterator i = config.properties.entrySet().iterator();i.hasNext();) + { + Map.Entry entry = (Map.Entry)i.next(); + String key = (String)entry.getKey(); + String value = (String)entry.getValue(); + log.debug("Adding property " + key + " = " + value); + cfg.setProperty(key, value); + } cfg.addProperties(props); - // + // todo : make this configurable somehow cfg.setProperty("hibernate.connection.datasource", "java:/DefaultDS"); // if (jndiName != null) { + log.debug("Setting jndi name to " + jndiName); cfg.setProperty("hibernate.session_factory_name", jndiName); }