Author: vyemialyanchyk Date: 2010-11-15 14:41:34 -0500 (Mon, 15 Nov 2010) New Revision: 26584 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java Log: https://jira.jboss.org/browse/JBIDE-7604 - fixed Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2010-11-15 19:39:14 UTC (rev 26583) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2010-11-15 19:41:34 UTC (rev 26584) @@ -43,6 +43,7 @@ import org.eclipse.datatools.connectivity.IConnectionProfile; import org.eclipse.datatools.connectivity.ProfileManager; import org.eclipse.datatools.connectivity.drivers.DriverInstance; +import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants; import org.eclipse.osgi.util.NLS; import org.hibernate.HibernateException; import org.hibernate.MappingException; @@ -63,6 +64,8 @@ public class ConfigurationFactory { + public static final String FAKE_TM_LOOKUP = "org.hibernate.console.FakeTransactionManagerLookup"; //$NON-NLS-1$ + private ConsoleConfigurationPreferences prefs; private Map<String, FakeDelegatingDriver> fakeDrivers; @@ -82,11 +85,9 @@ if (properties != null) { // in case the transaction manager is empty then we need to inject a faketm since // hibernate will still try and instantiate it. - String str = properties.getProperty("hibernate.transaction.manager_lookup_class"); //$NON-NLS-1$ + String str = properties.getProperty(Environment.TRANSACTION_MANAGER_STRATEGY); if (str != null && StringHelper.isEmpty(str)) { - properties - .setProperty( - "hibernate.transaction.manager_lookup_class", "org.hibernate.console.FakeTransactionManagerLookup"); //$NON-NLS-1$ //$NON-NLS-2$ + properties.setProperty(Environment.TRANSACTION_MANAGER_STRATEGY, FAKE_TM_LOOKUP); // properties.setProperty( "hibernate.transaction.factory_class", ""); } } @@ -382,22 +383,22 @@ localCfg.setProperties(invokeProperties); // seems we should not setup dialect here // String dialect = - // "org.hibernate.dialect.HSQLDialect";//cpProperties.getProperty("org.eclipse.datatools.connectivity.db.driverClass"); + // "org.hibernate.dialect.HSQLDialect";//cpProperties.getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID); // invoke.setProperty(Environment.DIALECT, dialect); String driverClass = driverInstance != null ? - driverInstance.getProperty("org.eclipse.datatools.connectivity.db.driverClass") : ""; //$NON-NLS-1$ //$NON-NLS-2$ + driverInstance.getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID) : ""; //$NON-NLS-1$ localCfg.setProperty(Environment.DRIVER, driverClass); //String driverJarPath = driverInstance != null ? // driverInstance.getJarList() : ""; //$NON-NLS-1$ - String url = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.URL"); //$NON-NLS-1$ + String url = cpProperties.getProperty(IJDBCDriverDefinitionConstants.URL_PROP_ID); // url += "/";// + - // cpProperties.getProperty("org.eclipse.datatools.connectivity.db.databaseName"); + // cpProperties.getProperty(IJDBCDriverDefinitionConstants.DATABASE_NAME_PROP_ID); localCfg.setProperty(Environment.URL, url); - String user = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.username"); //$NON-NLS-1$ + String user = cpProperties.getProperty(IJDBCDriverDefinitionConstants.USERNAME_PROP_ID); if (null != user && user.length() > 0) { localCfg.setProperty(Environment.USER, user); } - String pass = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.password"); //$NON-NLS-1$ + String pass = cpProperties.getProperty(IJDBCDriverDefinitionConstants.PASSWORD_PROP_ID); if (null != pass && pass.length() > 0) { localCfg.setProperty(Environment.PASS, pass); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2010-11-15 19:39:14 UTC (rev 26583) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2010-11-15 19:41:34 UTC (rev 26584) @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.datatools.connectivity.IConnectionProfile; import org.eclipse.datatools.connectivity.ProfileManager; +import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.jpt.core.JpaDataSource; @@ -208,10 +209,10 @@ public String getDialectName() { String dialect = getAttribute( IConsoleConfigurationLaunchConstants.DIALECT, null ); // determine dialect when connection profile is used - if (dialect == null && getConnectionProfileName() != null && getConnectionProfileName() != null) { + if (dialect == null && getConnectionProfileName() != null) { IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName()); if (profile == null) return null; - String driver = profile.getProperties(profile.getProviderId()).getProperty("org.eclipse.datatools.connectivity.db.driverClass"); //$NON-NLS-1$ + String driver = profile.getProperties(profile.getProviderId()).getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID); dialect = new DriverClassHelpers().getDialect(driver); } return dialect; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-11-15 19:39:14 UTC (rev 26583) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-11-15 19:41:34 UTC (rev 26584) @@ -34,8 +34,10 @@ import org.eclipse.datatools.connectivity.IConnectionProfile; import org.eclipse.datatools.connectivity.ProfileManager; import org.eclipse.datatools.connectivity.drivers.DriverInstance; +import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants; import org.eclipse.debug.core.ILaunchConfiguration; import org.hibernate.cfg.Environment; +import org.hibernate.console.ConfigurationFactory; import org.hibernate.console.ConfigurationXMLStrings; import org.hibernate.console.ConfigurationXMLFactory; import org.hibernate.console.ConnectionProfileUtil; @@ -166,19 +168,19 @@ String connProfileName = consoleConfigPrefs == null ? null : consoleConfigPrefs.getConnectionProfileName(); IConnectionProfile profile = getConnectionProfile(connProfileName); - if (profile != null) { - StringBuilder propFileContent = new StringBuilder(); - String driverClass = getDriverClass(connProfileName); - final Properties cpProperties = profile.getProperties(profile.getProviderId()); - // - String url = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.URL"); //$NON-NLS-1$ - // - String user = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.username"); //$NON-NLS-1$ - // - String pass = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.password"); //$NON-NLS-1$ - // - String dialectName = consoleConfigPrefs.getDialectName(); - // + boolean bPropFile = profile != null; + // update property with fake tm + Properties propsTmp = null; + if (consoleConfigPrefs != null && consoleConfigPrefs.getPropertyFile() != null) { + propsTmp = consoleConfigPrefs.getProperties(); + String tmStrategy = propsTmp.getProperty(Environment.TRANSACTION_MANAGER_STRATEGY); + if (tmStrategy != null && StringHelper.isEmpty(tmStrategy)) { + propsTmp.setProperty(Environment.TRANSACTION_MANAGER_STRATEGY, + ConfigurationFactory.FAKE_TM_LOOKUP); + bPropFile = true; + } + } + if (bPropFile) { Set<String> specialProps = new TreeSet<String>(); specialProps.add(Environment.DRIVER); specialProps.add(Environment.URL); @@ -186,19 +188,29 @@ specialProps.add(Environment.PASS); specialProps.add(Environment.DIALECT); // - Properties propsTmp = null; - if (consoleConfigPrefs.getPropertyFile() != null) { - propsTmp = consoleConfigPrefs.getProperties(); - } if (propsTmp == null) { propsTmp = new Properties(); } - propsTmp.setProperty(Environment.DRIVER, driverClass); - propsTmp.setProperty(Environment.URL, url); - propsTmp.setProperty(Environment.USER, user); - propsTmp.setProperty(Environment.PASS, pass); - if (StringHelper.isNotEmpty(dialectName)) { - propsTmp.setProperty(Environment.DIALECT, dialectName); + StringBuilder propFileContent = new StringBuilder(); + String driverClass = getDriverClass(connProfileName); + if (profile != null) { + final Properties cpProperties = profile.getProperties(profile.getProviderId()); + // + String url = cpProperties.getProperty(IJDBCDriverDefinitionConstants.URL_PROP_ID); + // + String user = cpProperties.getProperty(IJDBCDriverDefinitionConstants.USERNAME_PROP_ID); + // + String pass = cpProperties.getProperty(IJDBCDriverDefinitionConstants.PASSWORD_PROP_ID); + // + String dialectName = consoleConfigPrefs.getDialectName(); + // + propsTmp.setProperty(Environment.DRIVER, driverClass); + propsTmp.setProperty(Environment.URL, url); + propsTmp.setProperty(Environment.USER, user); + propsTmp.setProperty(Environment.PASS, pass); + if (StringHelper.isNotEmpty(dialectName)) { + propsTmp.setProperty(Environment.DIALECT, dialectName); + } } // output keys in sort order Object[] keys = propsTmp.keySet().toArray(); @@ -415,7 +427,7 @@ public String getDriverClass(String connProfileName) { DriverInstance driverInstance = getDriverInstance(connProfileName); String driverClass = driverInstance != null ? - driverInstance.getProperty("org.eclipse.datatools.connectivity.db.driverClass") : ""; //$NON-NLS-1$ //$NON-NLS-2$ + driverInstance.getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID) : ""; //$NON-NLS-1$ return driverClass; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2010-11-15 19:39:14 UTC (rev 26583) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2010-11-15 19:41:34 UTC (rev 26584) @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.datatools.connectivity.IConnectionProfile; import org.eclipse.datatools.connectivity.ProfileManager; +import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.jdt.core.IPackageFragmentRoot; @@ -340,7 +341,7 @@ } if (!selectMethod.getSelection()){ IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName()); - String driver = profile.getProperties(profile.getProviderId()).getProperty("org.eclipse.datatools.connectivity.db.driverClass"); //$NON-NLS-1$ + String driver = profile.getProperties(profile.getProviderId()).getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID); return helper.getDialect(driver); } return null;