[jbosstools-commits] JBoss Tools SVN: r21142 - in branches/hibernatetools-multiversion/hibernatetools/plugins: org.hibernate.mediator and 2 other directories.

Author: vyemialyanchyk Date: 2010-03-30 13:25:57 -0400 (Tue, 30 Mar 2010) New Revision: 21142 Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/ConsoleConfigClassLoader.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStub.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStubFactory.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - update Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-03-30 16:04:15 UTC (rev 21141) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-03-30 17:25:57 UTC (rev 21142) @@ -225,9 +225,11 @@ } protected ClassLoader getParentClassLoader() { + return ConfigurationStub.class.getClassLoader(); + //return this.getClass().getClassLoader(); //return ClassLoader.getSystemClassLoader(); //return Thread.currentThread().getContextClassLoader().getParent().getParent(); - return Thread.currentThread().getContextClassLoader(); + //return Thread.currentThread().getContextClassLoader(); } public ConfigurationStub getConfiguration() { return configStub; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath 2010-03-30 16:04:15 UTC (rev 21141) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath 2010-03-30 17:25:57 UTC (rev 21142) @@ -21,7 +21,7 @@ <classpathentry kind="lib" path="lib/hibernate/antlr-2.7.6.jar"/> <classpathentry kind="lib" path="lib/annotations/hibernate-entitymanager.jar" sourcepath="D:/Temp/_hibernate/hibernate-entitymanager-3.4.0.GA-sources.jar"/> <classpathentry kind="lib" path="lib/hibernate/javassist.jar"/> - <classpathentry kind="lib" path="lib/annotations/hibernate-validator.jar"/> + <classpathentry kind="lib" path="lib/annotations/hibernate-validator.jar" sourcepath="D:/Temp/_hibernate/hibernate-validator-3.1.0.GA-sources.jar "/> <classpathentry kind="lib" path="lib/hibernate/log4j-1.2.15.jar" sourcepath="D:/Temp/_hibernate/log4j-1.2.15-sources.jar "/> <classpathentry kind="lib" path="lib/hibernate/hibernate-jmx.jar" sourcepath="D:/Temp/_hibernate/hibernate-jmx-3.3.2.GA-sources.jar "/> <classpathentry kind="lib" path="lib/hibernate/commons-collections-3.1.jar"/> Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/ConsoleConfigClassLoader.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/ConsoleConfigClassLoader.java 2010-03-30 16:04:15 UTC (rev 21141) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/ConsoleConfigClassLoader.java 2010-03-30 17:25:57 UTC (rev 21142) @@ -49,8 +49,7 @@ * cleanup jar file factory cache */ @SuppressWarnings({ "nls", "unchecked" }) - public boolean cleanupJarFileFactory() - { + public boolean cleanupJarFileFactory() { boolean res = false; Class classJarURLConnection = null; try { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStub.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStub.java 2010-03-30 16:04:15 UTC (rev 21141) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStub.java 2010-03-30 17:25:57 UTC (rev 21142) @@ -55,7 +55,6 @@ configuration.buildMappings(); } - // TODO: temporary should be protected and/or SettingsStub? public SettingsStub buildSettings() { return new SettingsStub(configuration.buildSettings()); } @@ -72,7 +71,6 @@ return new IHQLCodeAssistStub(new HQLCodeAssist(configuration)); } - // TODO: temporary should be protected and/or NamingStrategyStub? public NamingStrategyStub getNamingStrategy() { return new NamingStrategyStub(configuration.getNamingStrategy()); } @@ -91,17 +89,14 @@ return arr.iterator(); } - // TODO: temporary should be protected and/or PersistentClassStub? public PersistentClassStub getClassMapping(String entityName) { return PersistentClassStubFactory.createPersistentClassStub(configuration.getClassMapping(entityName)); } - // TODO: temporary should be protected and/or MappingsStub? public MappingsStub createMappings() { return new MappingsStub(configuration.createMappings()); } - // TODO: temporary should be protected and/or MappingsStub? public MappingStub buildMapping() { return new MappingStub(configuration.buildMapping()); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStubFactory.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStubFactory.java 2010-03-30 16:04:15 UTC (rev 21141) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/ConfigurationStubFactory.java 2010-03-30 17:25:57 UTC (rev 21142) @@ -109,7 +109,7 @@ private Configuration buildAnnotationConfiguration() throws ClassNotFoundException, InstantiationException, IllegalAccessException { Class<?> clazz = ReflectHelper - .classForName("org.hibernate.cfg.AnnotationConfiguration", Object.class); //$NON-NLS-1$ + .classForName("org.hibernate.cfg.AnnotationConfiguration", Configuration.class); //$NON-NLS-1$ Configuration annotationConfig = (Configuration)clazz.newInstance(); return annotationConfig; } @@ -134,7 +134,7 @@ overrides.put("hibernate.archive.autodetection", "none"); //$NON-NLS-1$//$NON-NLS-2$ } Class<?> clazz = ReflectHelper.classForName( - "org.hibernate.ejb.Ejb3Configuration", Object.class); //$NON-NLS-1$ + "org.hibernate.ejb.Ejb3Configuration", Configuration.class); //$NON-NLS-1$ Object ejb3cfg = clazz.newInstance(); if (StringHelper.isNotEmpty(entityResolver)) {