Author: vyemialyanchyk Date: 2010-11-16 13:49:18 -0500 (Tue, 16 Nov 2010) New Revision: 26636 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.hibernate.eclipse/src/org/hibernate/console/ConnectionProfileUtil.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-7619 - 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-16 18:41:31 UTC (rev 26635) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2010-11-16 18:49:18 UTC (rev 26636) @@ -42,7 +42,6 @@ import org.dom4j.io.DOMWriter; 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; @@ -375,18 +374,15 @@ IConnectionProfile profile = ProfileManager.getInstance().getProfileByName( connProfileName); if (profile != null) { - DriverInstance driverInstance = ConnectionProfileUtil.getDriverDefinition(connProfileName); final Properties cpProperties = profile.getProperties(profile.getProviderId()); final Properties invokeProperties = localCfg.getProperties(); // set this property to null! invokeProperties.remove(Environment.DATASOURCE); localCfg.setProperties(invokeProperties); // seems we should not setup dialect here - // String dialect = - // "org.hibernate.dialect.HSQLDialect";//cpProperties.getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID); - // invoke.setProperty(Environment.DIALECT, dialect); - String driverClass = driverInstance != null ? - driverInstance.getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID) : ""; //$NON-NLS-1$ + //String dialect = "org.hibernate.dialect.HSQLDialect"; + //invoke.setProperty(Environment.DIALECT, dialect); + String driverClass = ConnectionProfileUtil.getDriverClass(connProfileName); localCfg.setProperty(Environment.DRIVER, driverClass); //String driverJarPath = driverInstance != null ? // driverInstance.getJarList() : ""; //$NON-NLS-1$ Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConnectionProfileUtil.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConnectionProfileUtil.java 2010-11-16 18:41:31 UTC (rev 26635) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConnectionProfileUtil.java 2010-11-16 18:49:18 UTC (rev 26636) @@ -25,6 +25,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; /** * @author Vitali Yemialyanchyk @@ -64,4 +65,10 @@ return di.getJarList(); } + public static String getDriverClass(String connectionProfile) { + DriverInstance di = getDriverDefinition(connectionProfile); + String driverClass = di != null ? + di.getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID) : ""; //$NON-NLS-1$ + return driverClass; + } } 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-16 18:41:31 UTC (rev 26635) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2010-11-16 18:49:18 UTC (rev 26636) @@ -15,14 +15,12 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; 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; import org.eclipse.jpt.core.JpaProject; import org.eclipse.osgi.util.NLS; +import org.hibernate.console.ConnectionProfileUtil; import org.hibernate.console.HibernateConsoleRuntimeException; import org.hibernate.console.preferences.ConsoleConfigurationPreferences; import org.hibernate.eclipse.console.utils.ClassLoaderHelper; @@ -210,9 +208,7 @@ String dialect = getAttribute( IConsoleConfigurationLaunchConstants.DIALECT, null ); // determine dialect when connection profile is used if (dialect == null && getConnectionProfileName() != null) { - IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName()); - if (profile == null) return null; - String driver = profile.getProperties(profile.getProviderId()).getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID); + String driver = ConnectionProfileUtil.getDriverClass(getConnectionProfileName()); dialect = new DriverClassHelpers().getDialect(driver); } return dialect; @@ -232,10 +228,10 @@ JpaProject jpaProject = (JpaProject) project.getAdapter(JpaProject.class); if (jpaProject != null) { if (jpaProject.getUserOverrideDefaultCatalog() != null){ - prop.put("hibernate.default_catalog", jpaProject.getUserOverrideDefaultCatalog()); + prop.put("hibernate.default_catalog", jpaProject.getUserOverrideDefaultCatalog()); //$NON-NLS-1$ } if (jpaProject.getUserOverrideDefaultSchema() != null){ - prop.put("hibernate.default_schema", jpaProject.getUserOverrideDefaultSchema()); + prop.put("hibernate.default_schema", jpaProject.getUserOverrideDefaultSchema()); //$NON-NLS-1$ } } 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-16 18:41:31 UTC (rev 26635) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-11-16 18:49:18 UTC (rev 26636) @@ -33,7 +33,6 @@ import org.eclipse.core.runtime.Path; 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; @@ -415,20 +414,9 @@ } return profile; } - - public DriverInstance getDriverInstance(String connProfileName) { - DriverInstance driverInstance = null; - if (!isEmpty(connProfileName)) { - driverInstance = ConnectionProfileUtil.getDriverDefinition(connProfileName); - } - return driverInstance; - } public String getDriverClass(String connProfileName) { - DriverInstance driverInstance = getDriverInstance(connProfileName); - String driverClass = driverInstance != null ? - driverInstance.getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID) : ""; //$NON-NLS-1$ - return driverClass; + return ConnectionProfileUtil.getDriverClass(connProfileName); } public String getVar(String str) { 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-16 18:41:31 UTC (rev 26635) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2010-11-16 18:49:18 UTC (rev 26636) @@ -40,6 +40,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; +import org.hibernate.console.ConnectionProfileUtil; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; import org.hibernate.console.preferences.ConsoleConfigurationPreferences; @@ -340,8 +341,7 @@ return helper.getDialectClass(dialectName.getText()); } if (!selectMethod.getSelection()){ - IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName()); - String driver = profile.getProperties(profile.getProviderId()).getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID); + String driver = ConnectionProfileUtil.getDriverClass(getConnectionProfileName()); return helper.getDialect(driver); } return null;