[jbosstools-commits] JBoss Tools SVN: r22213 - in branches/hibernatetools-multiversion/hibernatetools/plugins: org.hibernate.mediator and 1 other directory.

Thursday, 20 May 2010


Author: vyemialyanchyk
Date: 2010-05-20 11:25:46 -0400 (Thu, 20 May 2010)
New Revision: 22213

Modified:
  
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java
  
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath
  
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-6070 - revert Hibernate 3.5 use to Hibernate 3.3

Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java	2010-05-20
15:16:51 UTC (rev 22212)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java	2010-05-20
15:25:46 UTC (rev 22213)
@@ -530,13 +530,13 @@
 	 * @param element
 	 * @return
 	 */
-	@SuppressWarnings("unchecked")
 	public static IFile searchInEjb3MappingFiles(ConsoleConfiguration consoleConfig, Object
element) {
 		IFile file = null;
     	if (consoleConfig == null) {
         	return file;
     	}
 		final ConsoleConfiguration cc2 = consoleConfig;
+		/** /
 		List<String> documentPaths = (List<String>)consoleConfig.execute(new
ExecutionContext.Command() {
 			public Object execute() {
 				return OpenMappingUtilsEjb3.enumDocuments(
@@ -544,6 +544,11 @@
 						cc2.getEntityResolver());
 			}
 		});
+		/**/
+		List<String> documentPaths = OpenMappingUtilsEjb3.enumDocuments(
+			cc2.getPreferences().getPersistenceUnitName(),
+			cc2.getEntityResolver());
+		/**/
     	if (documentPaths == null) {
         	return file;
     	}

Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath	2010-05-20
15:16:51 UTC (rev 22212)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath	2010-05-20
15:25:46 UTC (rev 22213)
@@ -3,30 +3,42 @@
 	<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib"
path="lib/_add/commons-logging-1.0.4.jar"/>
-	<classpathentry kind="lib" path="lib/_add/freemarker.jar"/>
-	<classpathentry kind="lib" path="lib/_add/hibernate-tools.jar"
sourcepath="C:/RHDS/hibernate/trunk/HibernateExt/tools/src"/>
-	<classpathentry kind="lib"
path="lib/_add/jtidy-r8-20060801.jar"/>
-	<classpathentry exported="true" kind="lib"
path="lib/_add/log4j-1.2.15.jar"/>
-	<classpathentry kind="lib"
path="lib/_add/slf4j-api-1.5.8.jar"/>
-	<classpathentry kind="lib"
path="lib/_add/slf4j-log4j12-1.5.8.jar"/>
-	<classpathentry exported="true" kind="lib"
path="lib/bytecode/cglib/cglib-2.2.jar"
sourcepath="D:/Temp/_hibernate/cglib-src-2.2.jar"/>
-	<classpathentry kind="lib"
path="lib/bytecode/javassist/javassist-3.9.0.GA.jar"/>
-	<classpathentry kind="lib"
path="lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar"/>
-	<classpathentry kind="lib"
path="lib/optional/c3p0/c3p0-0.9.1.jar"/>
-	<classpathentry kind="lib"
path="lib/optional/ehcache/ehcache-1.5.0.jar"/>
-	<classpathentry kind="lib"
path="lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar"/>
-	<classpathentry kind="lib"
path="lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar"/>
-	<classpathentry kind="lib"
path="lib/optional/oscache/oscache-2.1.jar"/>
-	<classpathentry kind="lib"
path="lib/optional/proxool/proxool-0.8.3.jar"/>
-	<classpathentry kind="lib"
path="lib/optional/swarmcache/swarmcache-1.0RC2.jar"/>
-	<classpathentry kind="lib"
path="lib/required/antlr-2.7.6.jar"/>
-	<classpathentry kind="lib"
path="lib/required/commons-collections-3.1.jar"/>
-	<classpathentry kind="lib"
path="lib/required/dom4j-1.6.1.jar"/>
-	<classpathentry kind="lib"
path="lib/required/javassist-3.9.0.GA.jar"/>
-	<classpathentry kind="lib" path="lib/required/jta-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/hibernate3.jar"
sourcepath="D:/Temp/_hibernate/hibernate-distribution-3.5.0-Final-dist.zip"/>
-	<classpathentry kind="lib"
path="lib/_add/bsh-core-2.0b4.jar"/>
-	<classpathentry exported="true" kind="lib"
path="lib/_add/asm-3.1.jar"/>
+	<classpathentry kind="lib"
path="lib/annotations/ejb3-persistence.jar"/>
+	<classpathentry kind="lib"
path="lib/annotations/hibernate-annotations.jar"/>
+	<classpathentry kind="lib"
path="lib/annotations/hibernate-commons-annotations.jar"/>
+	<classpathentry kind="lib"
path="lib/annotations/hibernate-entitymanager.jar"/>
+	<classpathentry kind="lib"
path="lib/annotations/hibernate-validator.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/antlr-2.7.6.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/asm-attrs.jar"/>
+	<classpathentry exported="true" kind="lib"
path="lib/hibernate/asm.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/c3p0-0.9.1.jar"/>
+	<classpathentry exported="true" kind="lib"
path="lib/hibernate/cglib-2.2.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/commons-collections-3.1.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/commons-logging-1.0.4.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/concurrent-1.3.2.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/connector.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/dom4j-1.6.1.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/ehcache-1.2.3.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/hibernate-jmx.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/hibernate3.jar"/>
+	<classpathentry kind="lib" path="lib/hibernate/jaas.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/javassist.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/jboss-cache.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/jboss-common.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/jboss-jmx.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/jboss-system.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/jdbc2_0-stdext.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/jgroups-2.2.8.jar"/>
+	<classpathentry kind="lib" path="lib/hibernate/jta.jar"/>
+	<classpathentry exported="true" kind="lib"
path="lib/hibernate/log4j-1.2.15.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/oscache-2.1.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/proxool-0.8.3.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/slf4j-api-1.5.8.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/slf4j-log4j12-1.5.8.jar"/>
+	<classpathentry kind="lib"
path="lib/hibernate/swarmcache-1.0rc2.jar"/>
+	<classpathentry kind="lib" path="lib/tools/freemarker.jar"/>
+	<classpathentry kind="lib"
path="lib/tools/hibernate-tools.jar"/>
+	<classpathentry kind="lib"
path="lib/tools/jtidy-r8-20060801.jar"/>
+	<classpathentry kind="lib" path="lib/bsh-core-2.0b4.jar"/>
 	<classpathentry kind="output" path="build/eclipse"/>
 </classpath>

Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties	2010-05-20
15:16:51 UTC (rev 22212)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties	2010-05-20
15:25:46 UTC (rev 22213)
@@ -1,6 +1,5 @@
 bin.includes = plugin.xml,\
                org.hibernate.mediator.jar,\
-               lib.new/,\
                META-INF/,\
                hibernate-log4j.properties,\
                about.html,\
@@ -9,46 +8,48 @@
                about.properties,\
                hibernate_icon.gif,\
                plugin.properties,\
-               lib.new/annotations/ejb3-persistence.jar,\
-               lib.new/annotations/hibernate-annotations.jar,\
-               lib.new/annotations/hibernate-commons-annotations.jar,\
-               lib.new/annotations/hibernate-entitymanager.jar,\
-               lib.new/annotations/hibernate-validator.jar,\
-               lib.new/hibernate/antlr-2.7.6.jar,\
-               lib.new/hibernate/asm-attrs.jar,\
-               lib.new/hibernate/asm.jar,\
-               lib.new/hibernate/c3p0-0.9.1.jar,\
-               lib.new/hibernate/cglib-2.2.jar,\
-               lib.new/hibernate/commons-collections-3.1.jar,\
-               lib.new/hibernate/commons-logging-1.0.4.jar,\
-               lib.new/hibernate/concurrent-1.3.2.jar,\
-               lib.new/hibernate/connector.jar,\
-               lib.new/hibernate/dom4j-1.6.1.jar,\
-               lib.new/hibernate/ehcache-1.2.3.jar,\
-               lib.new/hibernate/hibernate-jmx.jar,\
-               lib.new/hibernate/hibernate3.jar,\
-               lib.new/hibernate/jaas.jar,\
-               lib.new/hibernate/javassist.jar,\
-               lib.new/hibernate/jboss-cache.jar,\
-               lib.new/hibernate/jboss-common.jar,\
-               lib.new/hibernate/jboss-jmx.jar,\
-               lib.new/hibernate/jboss-system.jar,\
-               lib.new/hibernate/jdbc2_0-stdext.jar,\
-               lib.new/hibernate/jgroups-2.2.8.jar,\
-               lib.new/hibernate/jta.jar,\
-               lib.new/hibernate/log4j-1.2.15.jar,\
-               lib.new/hibernate/oscache-2.1.jar,\
-               lib.new/hibernate/proxool-0.8.3.jar,\
-               lib.new/hibernate/slf4j-api-1.5.8.jar,\
-               lib.new/hibernate/slf4j-log4j12-1.5.8.jar,\
-               lib.new/hibernate/swarmcache-1.0rc2.jar,\
-               lib.new/tools/freemarker.jar,\
-               lib.new/tools/hibernate-tools.jar,\
-               lib.new/tools/jtidy-r8-20060801.jar,\
-               lib.new/bsh-core-2.0b4.jar
+               lib/,\
+               lib/annotations/ejb3-persistence.jar,\
+               lib/annotations/hibernate-annotations.jar,\
+               lib/annotations/hibernate-commons-annotations.jar,\
+               lib/annotations/hibernate-entitymanager.jar,\
+               lib/annotations/hibernate-validator.jar,\
+               lib/hibernate/antlr-2.7.6.jar,\
+               lib/hibernate/asm-attrs.jar,\
+               lib/hibernate/asm.jar,\
+               lib/hibernate/c3p0-0.9.1.jar,\
+               lib/hibernate/cglib-2.2.jar,\
+               lib/hibernate/commons-collections-3.1.jar,\
+               lib/hibernate/commons-logging-1.0.4.jar,\
+               lib/hibernate/concurrent-1.3.2.jar,\
+               lib/hibernate/connector.jar,\
+               lib/hibernate/dom4j-1.6.1.jar,\
+               lib/hibernate/ehcache-1.2.3.jar,\
+               lib/hibernate/hibernate-jmx.jar,\
+               lib/hibernate/hibernate3.jar,\
+               lib/hibernate/jaas.jar,\
+               lib/hibernate/javassist.jar,\
+               lib/hibernate/jboss-cache.jar,\
+               lib/hibernate/jboss-common.jar,\
+               lib/hibernate/jboss-jmx.jar,\
+               lib/hibernate/jdbc2_0-stdext.jar,\
+               lib/hibernate/jboss-system.jar,\
+               lib/hibernate/jgroups-2.2.8.jar,\
+               lib/hibernate/jta.jar,\
+               lib/hibernate/log4j-1.2.15.jar,\
+               lib/hibernate/oscache-2.1.jar,\
+               lib/hibernate/proxool-0.8.3.jar,\
+               lib/hibernate/slf4j-api-1.5.8.jar,\
+               lib/hibernate/slf4j-log4j12-1.5.8.jar,\
+               lib/hibernate/swarmcache-1.0rc2.jar,\
+               lib/tools/freemarker.jar,\
+               lib/tools/hibernate-tools.jar,\
+               lib/tools/jtidy-r8-20060801.jar
 jars.compile.order = org.hibernate.mediator.jar
 source.org.hibernate.mediator.jar = src/
 output.org.hibernate.mediator.jar = bin/
 src.includes = src/,\
                about.html
-bin.excludes = lib.new/.cvsignore
+bin.excludes = lib/annotations/,\
+               lib/hibernate/,\
+               lib/tools/


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] JBoss Tools SVN: r22213 - in branches/hibernatetools-multiversion/hibernatetools/plugins: org.hibernate.mediator and 1 other directory.