Author: jeff.yuchang Date: 2009-06-02 01:29:57 -0400 (Tue, 02 Jun 2009) New Revision: 551 Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/SQLPopulator.java Log: * Update the hibernate configuration, using the XA JTA Transaction.(removing session_context_class) Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-06-01 07:44:08 UTC (rev 550) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-06-02 05:29:57 UTC (rev 551) @@ -28,11 +28,6 @@ <hibernate-configuration> <session-factory> - <property name="show_sql">false</property> - <property name="cache.use_second_level_cache">true</property> - <property name="cache.use_query_cache">false</property> - - <property name="current_session_context_class">thread</property> <!-- ask hibernate to do the schema population --> <!-- property name="hibernate.hbm2ddl.auto">create-drop</property--> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-06-01 07:44:08 UTC (rev 550) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-06-02 05:29:57 UTC (rev 551) @@ -28,11 +28,6 @@ <hibernate-configuration> <session-factory> - <property name="show_sql">false</property> - <property name="cache.use_second_level_cache">true</property> - <property name="cache.use_query_cache">false</property> - - <property name="current_session_context_class">thread</property> <!-- ask hibernate to do the schema population --> <!-- property name="hibernate.hbm2ddl.auto">create-drop</property--> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-06-01 07:44:08 UTC (rev 550) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-06-02 05:29:57 UTC (rev 551) @@ -28,11 +28,6 @@ <hibernate-configuration> <session-factory> - <property name="show_sql">false</property> - <property name="cache.use_second_level_cache">true</property> - <property name="cache.use_query_cache">false</property> - - <property name="current_session_context_class">thread</property> <!-- ask hibernate to do the schema population --> <!-- property name="hibernate.hbm2ddl.auto">create-drop</property--> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-06-01 07:44:08 UTC (rev 550) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-06-02 05:29:57 UTC (rev 551) @@ -28,11 +28,6 @@ <hibernate-configuration> <session-factory> - <property name="show_sql">false</property> - <property name="cache.use_second_level_cache">true</property> - <property name="cache.use_query_cache">false</property> - - <property name="current_session_context_class">thread</property> <!-- ask hibernate to do the schema population --> <!-- property name="hibernate.hbm2ddl.auto">create-drop</property--> Modified: idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/SQLPopulator.java =================================================================== --- idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/SQLPopulator.java 2009-06-01 07:44:08 UTC (rev 550) +++ idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/SQLPopulator.java 2009-06-02 05:29:57 UTC (rev 551) @@ -11,6 +11,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.util.logging.Level; import java.util.logging.Logger; import javax.naming.InitialContext; @@ -71,28 +72,34 @@ } } - private void executeSql(String resource, Connection conn) throws Exception + private void executeSql(String resource, Connection conn) { URL url = Thread.currentThread().getContextClassLoader().getResource(resource); - String sql = new String(readStream(url.openStream()) , "UTF-8"); - sql = sql.replaceAll("(?m)^--([^\n]+)?$", ""); // Remove all commented lines - final String[] statements ; - statements = sql.split(";"); - - for (String statement : statements) - { - if ((statement == null) || ("".equals(statement.trim()))) { - } else { - Statement sqlStatement = conn.createStatement(); - try - { - sqlStatement.executeUpdate(statement); - } - finally - { - sqlStatement.close(); - } + try { + String sql = new String(readStream(url.openStream()) , "UTF-8"); + sql = sql.replaceAll("(?m)^--([^\n]+)?$", ""); // Remove all commented lines + final String[] statements ; + statements = sql.split(";"); + + for (String statement : statements) + { + if ((statement == null) || ("".equals(statement.trim()))) { + } else { + Statement sqlStatement = conn.createStatement(); + try + { + sqlStatement.executeUpdate(statement); + } catch (Exception e) { + logger.log(Level.WARNING, "Exception in executing :" + statement, e); + } + finally + { + sqlStatement.close(); + } + } } + } catch (Exception e) { + logger.log(Level.WARNING, "Exception in populating :" + resource, e); } }