Author: max.andersen(a)jboss.com Date: 2010-02-04 07:05:48 -0500 (Thu, 04 Feb 2010) New Revision: 20123 Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeTransactionManagerLookup.java Log: In branch to try fixing JBIDE-5706 and others. MANIFEST.MF added missing package, jmx not handled yet. Using DialectFactory in new package is fine because its just internally. FakeTransactionManagerLookup.java is worse, but since it is just a new method it should also work on previous hibernate jars - needs to be tested. Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF =================================================================== --- branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2010-02-04 11:39:53 UTC (rev 20122) +++ branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2010-02-04 12:05:48 UTC (rev 20123) @@ -306,6 +306,7 @@ org.hibernate.intercept.cglib, org.hibernate.intercept.javassist, org.hibernate.jdbc, + org.hibernate.jdbc.util, org.hibernate.jmx, org.hibernate.loader, org.hibernate.loader.collection, Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java =================================================================== --- branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-02-04 11:39:53 UTC (rev 20122) +++ branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-02-04 12:05:48 UTC (rev 20123) @@ -64,7 +64,7 @@ import org.hibernate.console.preferences.ConsoleConfigurationPreferences; import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode; import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.DialectFactory; +import org.hibernate.dialect.resolver.DialectFactory; import org.hibernate.util.ConfigHelper; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; @@ -370,11 +370,8 @@ Connection connection = null; try { connection = DriverManager.getConnection(url, user, pass); - DatabaseMetaData meta = connection.getMetaData(); - String databaseName = meta.getDatabaseProductName(); - int databaseMajorVersion = meta.getDatabaseMajorVersion(); //SQL Dialect: - Dialect dialect = DialectFactory.buildDialect( localCfg.getProperties(), databaseName, databaseMajorVersion ); + Dialect dialect = DialectFactory.buildDialect( localCfg.getProperties(), connection ); localCfg.setProperty(Environment.DIALECT, dialect.toString()); } catch (SQLException e) { //can't determine dialect Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeTransactionManagerLookup.java =================================================================== --- branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeTransactionManagerLookup.java 2010-02-04 11:39:53 UTC (rev 20122) +++ branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeTransactionManagerLookup.java 2010-02-04 12:05:48 UTC (rev 20123) @@ -37,6 +37,10 @@ return null; //throw new UnsupportedOperationException(); } + public Object getTransactionIdentifier(Transaction transaction) { + return transaction; + } + } class FakeTransactionManager implements TransactionManager {