Author: vyemialyanchyk Date: 2010-02-09 09:08:05 -0500 (Tue, 09 Feb 2010) New Revision: 20197 Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java Log: https://jira.jboss.org/jira/browse/JBIDE-5817 - fixed - in trunk & in hibernate 3.3. branch 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-09 14:04:29 UTC (rev 20196) +++ branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-02-09 14:08:05 UTC (rev 20197) @@ -28,11 +28,12 @@ import java.io.InputStream; import java.lang.reflect.Method; import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.security.AccessController; import java.security.PrivilegedAction; import java.sql.Connection; -import java.sql.DatabaseMetaData; import java.sql.Driver; import java.sql.DriverManager; import java.sql.SQLException; @@ -640,6 +641,34 @@ public ConsoleConfigurationPreferences getPreferences() { return prefs; } + + public File getConfigXMLFile() { + File configXMLFile = null; + if (prefs != null) { + configXMLFile = prefs.getConfigXMLFile(); + } + if (configXMLFile == null && classLoader != null) { + URL url = classLoader.findResource("hibernate.cfg.xml"); //$NON-NLS-1$ + URI uri = null; + try { + uri = url.toURI(); + configXMLFile = new File(uri); + } catch (URISyntaxException e) { + // ignore + } + } + if (configXMLFile == null) { + URL url = Environment.class.getClassLoader().getResource("hibernate.cfg.xml"); //$NON-NLS-1$ + URI uri = null; + try { + uri = url.toURI(); + configXMLFile = new File(uri); + } catch (URISyntaxException e) { + // ignore + } + } + return configXMLFile; + } public String toString() { return getClass().getName() + ":" + getName(); //$NON-NLS-1$ Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java =================================================================== --- branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java 2010-02-09 14:04:29 UTC (rev 20196) +++ branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java 2010-02-09 14:08:05 UTC (rev 20197) @@ -448,7 +448,7 @@ if (consoleConfig == null) { return file; } - java.io.File configXMLFile = consoleConfig.getPreferences().getConfigXMLFile(); + java.io.File configXMLFile = consoleConfig.getConfigXMLFile(); EntityResolver entityResolver = consoleConfig.getConfiguration().getEntityResolver(); Document doc = getDocument(configXMLFile, entityResolver); if (doc == null) {