Author: vyemialyanchyk Date: 2009-02-20 14:19:21 -0500 (Fri, 20 Feb 2009) New Revision: 13711 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java Log: JBIDE-3787 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2009-02-20 18:28:12 UTC (rev 13710) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2009-02-20 19:19:21 UTC (rev 13711) @@ -279,18 +279,23 @@ XMLHelper xmlHelper = new XMLHelper(); InputStream stream = null; String resourceName = "<unknown>"; //$NON-NLS-1$ - try { - if(configXMLFile!=null) { - resourceName = configXMLFile.toString(); + if(configXMLFile!=null) { + resourceName = configXMLFile.toString(); + try { stream = new FileInputStream( configXMLFile ); - } else { - resourceName = "/hibernate.cfg.xml"; //$NON-NLS-1$ + } + catch (FileNotFoundException e1) { + throw new HibernateConsoleRuntimeException(ConsoleMessages.ConsoleConfiguration_could_not_access + configXMLFile, e1); + } + } else { + resourceName = "/hibernate.cfg.xml"; //$NON-NLS-1$ + if (checkHibernateResoureExistence(resourceName)) { stream = ConfigHelper.getResourceAsStream( resourceName ); // simulate hibernate's default look up } + else { + return localCfg; + } } - catch (FileNotFoundException e1) { - throw new HibernateConsoleRuntimeException(ConsoleMessages.ConsoleConfiguration_could_not_access + configXMLFile, e1); - } try { List errors = new ArrayList(); @@ -334,10 +339,24 @@ if(configXMLFile!=null) { return localCfg.configure(configXMLFile); } else { - return localCfg.configure(); + Configuration resultCfg = localCfg; + if (checkHibernateResoureExistence("/hibernate.cfg.xml")) { //$NON-NLS-1$ + resultCfg = localCfg.configure(); + } + return resultCfg; } } } + + protected boolean checkHibernateResoureExistence(String resource) { + InputStream is = null; + try { + is = ConfigHelper.getResourceAsStream(resource); + } catch(HibernateException e) { + // just ignore + } + return( is != null ); + } /** * DriverManager checks what classloader a class is loaded from thus @@ -581,7 +600,7 @@ // replace dialect if it is set in preferences if(StringHelper.isNotEmpty( prefs.getDialectName())) { - localCfg.setProperty("hibernate.dialect", prefs.getDialectName()); + localCfg.setProperty("hibernate.dialect", prefs.getDialectName()); //$NON-NLS-1$ } return localCfg;