Author: dgeraskov Date: 2011-10-04 06:05:08 -0400 (Tue, 04 Oct 2011) New Revision: 35318 Removed: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeDelegatingDriver.java Modified: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/HibernateExtensionDefinition.java Log: Move FakeDelegatingDriver to the plugins with Libraries. This make it loaded by correct plugin and DriverManager is happy Modified: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2011-10-04 10:05:01 UTC (rev 35317) +++ branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2011-10-04 10:05:08 UTC (rev 35318) @@ -53,6 +53,7 @@ import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.resolver.DialectFactory; +import org.hibernate.eclipse.libs.FakeDelegatingDriver; import org.hibernate.util.ConfigHelper; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; Modified: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2011-10-04 10:05:01 UTC (rev 35317) +++ branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2011-10-04 10:05:08 UTC (rev 35318) @@ -49,6 +49,7 @@ import org.hibernate.console.ext.HibernateExtensionDefinition; import org.hibernate.console.preferences.ConsoleConfigurationPreferences; import org.hibernate.console.preferences.PreferencesClassPathUtils; +import org.hibernate.eclipse.libs.FakeDelegatingDriver; import org.hibernate.tool.hbm2x.StringUtils; public class ConsoleConfiguration implements ExecutionContextHolder { Deleted: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeDelegatingDriver.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeDelegatingDriver.java 2011-10-04 10:05:01 UTC (rev 35317) +++ branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeDelegatingDriver.java 2011-10-04 10:05:08 UTC (rev 35318) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.hibernate.console; - -import java.sql.Connection; -import java.sql.Driver; -import java.sql.DriverPropertyInfo; -import java.sql.SQLException; -import java.util.Properties; - -public class FakeDelegatingDriver implements Driver { - private Driver driver; - - public FakeDelegatingDriver(Driver d) { - this.driver = d; - } - public boolean acceptsURL(String u) throws SQLException { - return this.driver.acceptsURL(u); - } - public Connection connect(String u, Properties p) throws SQLException { - return this.driver.connect(u, p); - } - public int getMajorVersion() { - return this.driver.getMajorVersion(); - } - public int getMinorVersion() { - return this.driver.getMinorVersion(); - } - public DriverPropertyInfo[] getPropertyInfo(String u, Properties p) - throws SQLException { - return this.driver.getPropertyInfo(u, p); - } - public boolean jdbcCompliant() { - return this.driver.jdbcCompliant(); - } -} \ No newline at end of file Modified: branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/HibernateExtensionDefinition.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/HibernateExtensionDefinition.java 2011-10-04 10:05:01 UTC (rev 35317) +++ branches/dead/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/HibernateExtensionDefinition.java 2011-10-04 10:05:08 UTC (rev 35318) @@ -12,9 +12,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.osgi.util.NLS; -import org.hibernate.console.HibernateConsoleRuntimeException; -import org.hibernate.util.ReflectHelper; /** * @author Dmitry Geraskov