Author: kurtstam Date: 2009-11-24 14:25:38 -0500 (Tue, 24 Nov 2009) New Revision: 322 Modified: branches/ODE/ODE-1.x-fixes/Rakefile-riftsaw branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java branches/ODE/ODE-1.x-fixes/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java Log: RIFTSAW-106 bringing hibernate version to 3.3.2.ga Modified: branches/ODE/ODE-1.x-fixes/Rakefile-riftsaw =================================================================== --- branches/ODE/ODE-1.x-fixes/Rakefile-riftsaw 2009-11-24 17:15:41 UTC (rev 321) +++ branches/ODE/ODE-1.x-fixes/Rakefile-riftsaw 2009-11-24 19:25:38 UTC (rev 322) @@ -44,8 +44,8 @@ :version=>"1.3"), "org.apache.ws.security:wss4j:jar:1.5.3", "org.apache.santuario:xmlsec:jar:1.4.0", - "opensaml:opensaml:jar:1.1", - "bouncycastle:bcprov-jdk15:jar:132"] + "opensaml:opensaml:jar:1.1b", + "bouncycastle:bcprov-jdk15:jar:140"] ) AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.3" BACKPORT = "backport-util-concurrent:backport-util-concurrent:jar:3.0" @@ -69,8 +69,8 @@ :transaction =>"org.apache.geronimo.components:geronimo-transaction:jar:2.0.1", :connector =>"org.apache.geronimo.components:geronimo-connector:jar:2.0.1" ) -HIBERNATE = [ "org.hibernate:hibernate:jar:3.2.5.ga", "asm:asm:jar:1.5.3", - "antlr:antlr:jar:2.7.6", "cglib:cglib:jar:2.1_3", "net.sf.ehcache:ehcache:jar:1.2.3" ] +HIBERNATE = [ "org.hibernate:hibernate-core:jar:3.3.2.GA", "asm:asm:jar:1.5.3", + "antlr:antlr:jar:2.7.6", "cglib:cglib:jar:2.2", "net.sf.ehcache:ehcache:jar:1.2.3" ] HSQLDB = "hsqldb:hsqldb:jar:1.8.0.7" JAVAX = struct( :activation =>"javax.activation:activation:jar:1.1", @@ -167,7 +167,7 @@ compile.options.source = "1.5" compile.options.target = "1.5" - manifest["Implementation-Vendor"] = "Apache Software Foundation" + manifest["Implementation-Vendor"] = "JBoss by Red Hat" meta_inf << file("NOTICE") desc "ODE Axis Integration Layer" Modified: branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java =================================================================== --- branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java 2009-11-24 17:15:41 UTC (rev 321) +++ branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java 2009-11-24 19:25:38 UTC (rev 322) @@ -34,7 +34,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.connection.ConnectionProvider; import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.DialectFactory; +import org.hibernate.dialect.resolver.StandardDialectResolver; import javax.sql.DataSource; import javax.transaction.TransactionManager; @@ -42,7 +42,6 @@ import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.SQLException; -import java.util.HashMap; import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; @@ -52,32 +51,12 @@ private static final Messages __msgs = MessageBundle.getMessages(Messages.class); - private static final String DEFAULT_HIBERNATE_DIALECT = "org.hibernate.dialect.DerbyDialect"; + private static final Dialect DEFAULT_HIBERNATE_DIALECT = new org.hibernate.dialect.DerbyDialect(); - private static final HashMap<String, DialectFactory.VersionInsensitiveMapper> HIBERNATE_DIALECTS = new HashMap<String, DialectFactory.VersionInsensitiveMapper>(); - private static final String _guid = new GUID().toString(); private static final Map<String, DataSource> _dataSources = new ConcurrentHashMap<String, DataSource>(); - static { - // Hibernate has a nice table that resolves the dialect from the database - // product name, - // but doesn't include all the drivers. So this is supplementary, and some - // day in the - // future they'll add more drivers and we can get rid of this. - // Drivers already recognized by Hibernate: - // HSQL Database Engine - // DB2/NT - // MySQL - // PostgreSQL - // Microsoft SQL Server Database, Microsoft SQL Server - // Sybase SQL Server - // Informix Dynamic Server - // Oracle 8 and Oracle >8 - HIBERNATE_DIALECTS.put("Apache Derby", new DialectFactory.VersionInsensitiveMapper(DEFAULT_HIBERNATE_DIALECT)); - } - private TransactionManager _txMgr; private final DataSource _ds; @@ -150,9 +129,9 @@ } } - private String guessDialect(DataSource dataSource) throws Exception { + private Dialect guessDialect(DataSource dataSource) throws Exception { - String dialect = null; + Dialect dialect = null; // Open a connection and use that connection to figure out database // product name/version number in order to decide which Hibernate // dialect to use. @@ -160,17 +139,8 @@ try { DatabaseMetaData metaData = conn.getMetaData(); if (metaData != null) { - String dbProductName = metaData.getDatabaseProductName(); - int dbMajorVer = metaData.getDatabaseMajorVersion(); - __log.info("Using database " + dbProductName + " major version " + dbMajorVer); - DialectFactory.DatabaseDialectMapper mapper = HIBERNATE_DIALECTS.get(dbProductName); - if (mapper != null) { - dialect = mapper.getDialectClass(dbMajorVer); - } else { - Dialect hbDialect = DialectFactory.determineDialect(dbProductName, dbMajorVer); - if (hbDialect != null) - dialect = hbDialect.getClass().getName(); - } + StandardDialectResolver dialectResolver = new StandardDialectResolver(); + dialect = dialectResolver.resolveDialect(metaData); } } finally { conn.close(); Modified: branches/ODE/ODE-1.x-fixes/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java =================================================================== --- branches/ODE/ODE-1.x-fixes/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java 2009-11-24 17:15:41 UTC (rev 321) +++ branches/ODE/ODE-1.x-fixes/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java 2009-11-24 19:25:38 UTC (rev 322) @@ -28,7 +28,8 @@ import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.DialectFactory; +import org.hibernate.dialect.resolver.DialectFactory; +import org.hibernate.dialect.resolver.StandardDialectResolver; import javax.sql.DataSource; import javax.transaction.TransactionManager; @@ -137,39 +138,14 @@ return new SessionManager(properties, ds, tm); } - private static final String DEFAULT_HIBERNATE_DIALECT = "org.hibernate.dialect.DerbyDialect"; + private static final Dialect DEFAULT_HIBERNATE_DIALECT = new org.hibernate.dialect.DerbyDialect(); - private static final HashMap<String, DialectFactory.VersionInsensitiveMapper> HIBERNATE_DIALECTS = new HashMap<String, DialectFactory.VersionInsensitiveMapper>(); - - static { - // Hibernate has a nice table that resolves the dialect from the - // database - // product name, - // but doesn't include all the drivers. So this is supplementary, and - // some - // day in the - // future they'll add more drivers and we can get rid of this. - // Drivers already recognized by Hibernate: - // HSQL Database Engine - // DB2/NT - // MySQL - // PostgreSQL - // Microsoft SQL Server Database, Microsoft SQL Server - // Sybase SQL Server - // Informix Dynamic Server - // Oracle 8 and Oracle >8 - HIBERNATE_DIALECTS.put("Apache Derby", new DialectFactory.VersionInsensitiveMapper( - "org.hibernate.dialect.DerbyDialect")); - HIBERNATE_DIALECTS.put("INGRES", new DialectFactory.VersionInsensitiveMapper( - "org.hibernate.dialect.IngresDialect")); - } - public void shutdown() { // Not too much to do for hibernate. } - private String guessDialect(DataSource dataSource) throws Exception { - String dialect = null; + private Dialect guessDialect(DataSource dataSource) throws Exception { + Dialect dialect = null; // Open a connection and use that connection to figure out database // product name/version number in order to decide which Hibernate // dialect to use. @@ -177,17 +153,9 @@ try { DatabaseMetaData metaData = conn.getMetaData(); if (metaData != null) { - String dbProductName = metaData.getDatabaseProductName(); - int dbMajorVer = metaData.getDatabaseMajorVersion(); - __log.info("Using database " + dbProductName + " major version " + dbMajorVer); - DialectFactory.DatabaseDialectMapper mapper = HIBERNATE_DIALECTS.get(dbProductName); - if (mapper != null) { - dialect = mapper.getDialectClass(dbMajorVer); - } else { - Dialect hbDialect = DialectFactory.determineDialect(dbProductName, dbMajorVer); - if (hbDialect != null) - dialect = hbDialect.getClass().getName(); - } + StandardDialectResolver dialectResolver = new StandardDialectResolver(); + dialect = dialectResolver.resolveDialect(metaData); + } } finally { conn.close();