Author: vyemialyanchyk Date: 2010-05-18 11:12:36 -0400 (Tue, 18 May 2010) New Revision: 22173 Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/asm-3.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/bsh-core-2.0b4.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/commons-logging-1.0.4.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/freemarker.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/hibernate-tools.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/jtidy-r8-20060801.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/log4j-1.2.15.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/slf4j-api-1.5.8.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/slf4j-log4j12-1.5.8.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/cglib/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/cglib/cglib-2.2.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/javassist/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/javassist/javassist-3.9.0.GA.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/hibernate3.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/jpa/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/c3p0/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/c3p0/c3p0-0.9.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/ehcache/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/ehcache/ehcache-1.5.0.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/infinispan/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/jbosscache/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/oscache/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/oscache/oscache-2.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/proxool/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/proxool/proxool-0.8.3.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/swarmcache/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/swarmcache/swarmcache-1.0RC2.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/antlr-2.7.6.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/commons-collections-3.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/dom4j-1.6.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/javassist-3.9.0.GA.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/jta-1.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/slf4j-api-1.5.8.jar Removed: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bsh-core-2.0b4.jar Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/META-INF/MANIFEST.MF branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/base/HObject.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClassFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SingleTableSubclass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/HibernateMappingExporter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/pojo/POJOClass.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - use Hibernate 3.5 and Hibernate Tools compatiable libs, fix issues with hbm exporter Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -65,6 +65,7 @@ import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.RootClass; import org.hibernate.mediator.x.mapping.SimpleValue; +import org.hibernate.mediator.x.mapping.SingleTableSubclass; import org.hibernate.mediator.x.mapping.Subclass; import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.ToOne; @@ -178,7 +179,7 @@ Subclass subclass = null; if (pc != null){ if (pc.isAbstract()){ - subclass = (Subclass)PersistentClassFactory.createPersistentClassStub(pc); + subclass = SingleTableSubclass.newInstance(pc); if (pc instanceof RootClass && pc.getDiscriminator() == null){ SimpleValue discr = SimpleValue.newInstance(); discr.setTypeName("string"); //$NON-NLS-1$ Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/.classpath 2010-05-18 15:12:36 UTC (rev 22173) @@ -3,42 +3,30 @@ <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 exported="true" kind="lib" path="lib/hibernate/cglib-2.2.jar"/> - <classpathentry exported="true" kind="lib" path="lib/hibernate/log4j-1.2.15.jar"/> - <classpathentry kind="lib" path="lib/bsh-core-2.0b4.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/commons-logging-1.0.4.jar"/> - <classpathentry kind="lib" path="lib/hibernate/antlr-2.7.6.jar"/> - <classpathentry kind="lib" path="lib/hibernate/hibernate3.jar" sourcepath="D:/Temp/_hibernate/hibernate-core-3.3.2.GA-sources.jar "/> - <classpathentry kind="lib" path="lib/hibernate/dom4j-1.6.1.jar" sourcepath="D:/Temp/_hibernate/dom4j-1.6.1-sources.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/asm-attrs.jar"/> - <classpathentry kind="lib" path="lib/hibernate/asm.jar"/> - <classpathentry kind="lib" path="lib/hibernate/c3p0-0.9.1.jar"/> - <classpathentry kind="lib" path="lib/hibernate/commons-collections-3.1.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/ehcache-1.2.3.jar"/> - <classpathentry kind="lib" path="lib/hibernate/hibernate-jmx.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 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/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/_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="output" path="build/eclipse"/> </classpath> Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/META-INF/MANIFEST.MF =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/META-INF/MANIFEST.MF 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/META-INF/MANIFEST.MF 2010-05-18 15:12:36 UTC (rev 22173) @@ -4,48 +4,32 @@ Bundle-SymbolicName: org.hibernate.mediator;singleton:=true Bundle-Version: 3.3.0.qualifier Bundle-ClassPath: org.hibernate.mediator.jar, - lib/hibernate/asm.jar, - lib/hibernate/asm-attrs.jar, - lib/hibernate/commons-collections-2.1.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/hibernate3.jar, - lib/hibernate/jboss-cache.jar, - lib/hibernate/jboss-common.jar, - lib/hibernate/jboss-jmx.jar, - lib/hibernate/jboss-system.jar, - lib/hibernate/jdbc2_0-stdext.jar, - lib/hibernate/jta.jar, - lib/hibernate/jaas.jar, - lib/hibernate/oscache-2.1.jar, - lib/hibernate/proxool-0.8.3.jar, - lib/hibernate/swarmcache-1.0rc2.jar, - lib/tools/hibernate-tools.jar, - lib/tools/bsh-2.0b1.jar, - lib/tools/freemarker.jar, - lib/bsh-core-2.0b4.jar, - lib/annotations/ejb3-persistence.jar, - lib/annotations/hibernate-annotations.jar, - lib/hibernate/cglib-2.1.3.jar, - lib/hibernate/jgroups-2.2.8.jar, - lib/hibernate/antlr-2.7.6.jar, - lib/tools/jtidy-r8-20060801.jar, - lib/annotations/hibernate-entitymanager.jar, - lib/hibernate/javassist.jar, - lib/hibernate/ehcache-1.2.3.jar, - lib/hibernate/c3p0-0.9.1.jar, - lib/annotations/hibernate-commons-annotations.jar, - lib/annotations/hibernate-validator.jar, - lib/annotations/hibernate-search.jar, - lib/annotations/lucene-core-2.2.0.jar, - lib/hibernate/log4j-1.2.15.jar, - lib/hibernate/cglib-2.2.jar, - lib/hibernate/commons-collections-3.1.jar, - lib/hibernate/hibernate-jmx.jar, - lib/hibernate/slf4j-api-1.5.8.jar, - lib/hibernate/slf4j-log4j12-1.5.8.jar + lib/_add/bsh-core-2.0b4.jar, + lib/_add/commons-logging-1.0.4.jar, + lib/_add/freemarker.jar, + lib/_add/hibernate-tools.jar, + lib/_add/jtidy-r8-20060801.jar, + lib/_add/log4j-1.2.15.jar, + lib/_add/slf4j-api-1.5.8.jar, + lib/_add/slf4j-log4j12-1.5.8.jar, + lib/bytecode/cglib/cglib-2.2.jar, + lib/bytecode/javassist/javassist-3.9.0.GA.jar, + lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar, + lib/optional/c3p0/c3p0-0.9.1.jar, + lib/optional/ehcache/ehcache-1.5.0.jar, + lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar, + lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar, + lib/optional/oscache/oscache-2.1.jar, + lib/optional/proxool/proxool-0.8.3.jar, + lib/optional/swarmcache/swarmcache-1.0RC2.jar, + lib/required/antlr-2.7.6.jar, + lib/required/commons-collections-3.1.jar, + lib/required/dom4j-1.6.1.jar, + lib/required/javassist-3.9.0.GA.jar, + lib/required/jta-1.1.jar, + lib/required/slf4j-api-1.5.8.jar, + lib/hibernate3.jar, + lib/_add/asm-3.1.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Export-Package: org.hibernate.mediator, @@ -75,6 +59,8 @@ org.hibernate.mediator.x.util, org.dom4j.mediator.x, org.dom4j.mediator.x.io, + org.objectweb.asm, + org.objectweb.asm.signature, net.sf.cglib.core, net.sf.cglib.proxy, net.sf.cglib.reflect Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties 2010-05-18 15:12:36 UTC (rev 22173) @@ -4,24 +4,37 @@ META-INF/,\ hibernate-log4j.properties,\ about.html,\ - lib/tools/jtidy-r8-20060801.jar,\ - lib/annotations/hibernate-entitymanager.jar,\ - lib/hibernate/javassist.jar,\ - lib/hibernate/ehcache-1.2.3.jar,\ - lib/hibernate/c3p0-0.9.1.jar,\ - lib/annotations/hibernate-commons-annotations.jar,\ - lib/annotations/hibernate-validator.jar,\ - lib/hibernate/log4j-1.2.15.jar,\ - lib/hibernate/slf4j-api-1.5.8.jar,\ - lib/hibernate/slf4j-log4j12-1.5.8.jar,\ about.ini,\ about.mappings,\ about.properties,\ hibernate_icon.gif,\ plugin.properties,\ - lib/hibernate/cglib-2.2.jar,\ - lib/hibernate/commons-collections-3.1.jar,\ - lib/hibernate/hibernate-jmx.jar + lib/_add/asm-3.1.jar,\ + lib/_add/bsh-core-2.0b4.jar,\ + lib/_add/commons-logging-1.0.4.jar,\ + lib/_add/freemarker.jar,\ + lib/_add/hibernate-tools.jar,\ + lib/_add/jtidy-r8-20060801.jar,\ + lib/_add/log4j-1.2.15.jar,\ + lib/_add/slf4j-api-1.5.8.jar,\ + lib/_add/slf4j-log4j12-1.5.8.jar,\ + lib/bytecode/cglib/cglib-2.2.jar,\ + lib/bytecode/javassist/javassist-3.9.0.GA.jar,\ + lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar,\ + lib/optional/c3p0/c3p0-0.9.1.jar,\ + lib/optional/ehcache/ehcache-1.5.0.jar,\ + lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar,\ + lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar,\ + lib/optional/oscache/oscache-2.1.jar,\ + lib/optional/proxool/proxool-0.8.3.jar,\ + lib/optional/swarmcache/swarmcache-1.0RC2.jar,\ + lib/required/antlr-2.7.6.jar,\ + lib/required/commons-collections-3.1.jar,\ + lib/required/dom4j-1.6.1.jar,\ + lib/required/javassist-3.9.0.GA.jar,\ + lib/required/jta-1.1.jar,\ + lib/required/slf4j-api-1.5.8.jar,\ + lib/hibernate3.jar jars.compile.order = org.hibernate.mediator.jar source.org.hibernate.mediator.jar = src/ output.org.hibernate.mediator.jar = bin/ Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/asm-3.1.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/asm-3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/bsh-core-2.0b4.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/bsh-core-2.0b4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/commons-logging-1.0.4.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/commons-logging-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/freemarker.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/freemarker.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/hibernate-tools.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/hibernate-tools.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/jtidy-r8-20060801.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/jtidy-r8-20060801.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/log4j-1.2.15.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/log4j-1.2.15.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/slf4j-api-1.5.8.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/slf4j-api-1.5.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/slf4j-log4j12-1.5.8.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/_add/slf4j-log4j12-1.5.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bsh-core-2.0b4.jar =================================================================== (Binary files differ) Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/cglib/cglib-2.2.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/cglib/cglib-2.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/javassist/javassist-3.9.0.GA.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/bytecode/javassist/javassist-3.9.0.GA.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/hibernate3.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/hibernate3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/c3p0/c3p0-0.9.1.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/c3p0/c3p0-0.9.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/ehcache/ehcache-1.5.0.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/ehcache/ehcache-1.5.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/oscache/oscache-2.1.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/oscache/oscache-2.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/proxool/proxool-0.8.3.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/proxool/proxool-0.8.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/swarmcache/swarmcache-1.0RC2.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/optional/swarmcache/swarmcache-1.0RC2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/antlr-2.7.6.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/antlr-2.7.6.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/commons-collections-3.1.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/commons-collections-3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/dom4j-1.6.1.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/dom4j-1.6.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/javassist-3.9.0.GA.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/javassist-3.9.0.GA.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/jta-1.1.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/jta-1.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/slf4j-api-1.5.8.jar =================================================================== (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/required/slf4j-api-1.5.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/base/HObject.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/base/HObject.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/base/HObject.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -266,4 +266,28 @@ throw new HibernateConsoleRuntimeException(e); } } + + public static final Object readStaticFieldValueNoException(final String className, String fieldName) { + Class<?> clazz; + try { + clazz = ReflectHelper.classForName(className); + } catch (ClassNotFoundException e) { + return null; + } + Field fld; + try { + fld = clazz.getDeclaredField(fieldName); + } catch (SecurityException e) { + return null; + } catch (NoSuchFieldException e) { + return null; + } + try { + return fld.get(null); + } catch (IllegalArgumentException e) { + return null; + } catch (IllegalAccessException e) { + return null; + } + } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -203,10 +203,10 @@ //result[0] - detect classes //result[1] - detect hbm boolean[] result = { false, false }; - String detect = overridenProperties != null ? + String detect = overridenProperties != null && HibernatePersistence.AUTODETECTION != null ? (String) overridenProperties.get(HibernatePersistence.AUTODETECTION) : null; - detect = detect == null ? - properties.getProperty( HibernatePersistence.AUTODETECTION) : detect; + detect = detect == null && HibernatePersistence.AUTODETECTION != null ? + properties.getProperty(HibernatePersistence.AUTODETECTION) : detect; if (detect == null && excludeIfNotOverriden) { //not overridden through HibernatePersistence.AUTODETECTION so we comply with the spec excludeUnlistedClasses return result; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -1,6 +1,7 @@ package org.hibernate.mediator.x.cfg; import java.io.File; +import java.lang.reflect.Method; import java.sql.Driver; import java.sql.DriverManager; import java.sql.SQLException; @@ -10,6 +11,8 @@ import java.util.Map; import java.util.Properties; +import net.sf.cglib.proxy.MethodProxy; + import org.eclipse.osgi.util.NLS; import org.hibernate.mediator.HibernateConsoleRuntimeException; import org.hibernate.mediator.Messages; @@ -132,19 +135,22 @@ } public HibernateMappingExporter createHibernateMappingExporter(File folder2Gen, final IExporterNewOutputDir enod) { - return new HibernateMappingExporter(this, folder2Gen) { + return HibernateMappingExporter.newInstance(this, folder2Gen, new HibernateMappingExporter.IExportPOJOInterceptor() { @SuppressWarnings("unchecked") - protected void exportPOJO(Map additionalContext, POJOClass element) { - File outputdir4FileOld = getOutputDirectory(); + public Object exportPOJO(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable { + HibernateMappingExporter hme = HibernateMappingExporter.newInstance(obj); + POJOClass element = POJOClass.newInstance(args[1]); + File outputdir4FileOld = hme.getOutputDirectory(); File outputdir4FileNew = enod.getNewOutputDir(element, outputdir4FileOld); if (!outputdir4FileNew.exists()) { outputdir4FileNew.mkdirs(); } - setOutputDirectory(outputdir4FileNew); - super.exportPOJO(additionalContext, element); - setOutputDirectory(outputdir4FileOld); + hme.setOutputDirectory(outputdir4FileNew); + Object res = proxy.invokeSuper(obj, args); + hme.setOutputDirectory(outputdir4FileOld); + return res; } - }; + }); } @SuppressWarnings("unchecked") Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -10,6 +10,6 @@ super(hibernatePersistence, CL); } - public static final String AUTODETECTION = (String)HObject.readStaticFieldValue(CL, "AUTODETECTION"); //$NON-NLS-1$ + public static final String AUTODETECTION = (String)HObject.readStaticFieldValueNoException(CL, "AUTODETECTION"); //$NON-NLS-1$ } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClassFactory.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClassFactory.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClassFactory.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -1,6 +1,8 @@ package org.hibernate.mediator.x.mapping; +import org.hibernate.mediator.stubs.util.ClassHelper; + public class PersistentClassFactory { @SuppressWarnings("unchecked") public static PersistentClass createPersistentClassStub(Object value) { @@ -8,18 +10,16 @@ return null; } final Class cl = value.getClass(); - if (0 == RootClass.CL.compareTo(cl.getName())) { - return new RootClass(value); - //} else if (0 == PersistentClassStub.CL.compareTo(cl.getName())) { - // return new PersistentClassStub(value); - } else if (0 == Subclass.CL.compareTo(cl.getName())) { - return new Subclass(value); - } else if (0 == JoinedSubclass.CL.compareTo(cl.getName())) { + if (ClassHelper.isClassOrOffspring(cl, JoinedSubclass.CL)) { return new JoinedSubclass(value); - } else if (0 == SingleTableSubclass.CL.compareTo(cl.getName())) { + } else if (ClassHelper.isClassOrOffspring(cl, SingleTableSubclass.CL)) { return new SingleTableSubclass(value); - } else if (0 == UnionSubclass.CL.compareTo(cl.getName())) { + } else if (ClassHelper.isClassOrOffspring(cl, UnionSubclass.CL)) { return new UnionSubclass(value); + } else if (ClassHelper.isClassOrOffspring(cl, Subclass.CL)) { + return new Subclass(value); + } else if (ClassHelper.isClassOrOffspring(cl, RootClass.CL)) { + return new RootClass(value); } return null; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SingleTableSubclass.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SingleTableSubclass.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SingleTableSubclass.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -7,4 +7,8 @@ protected SingleTableSubclass(Object singleTableSubclass) { super(singleTableSubclass, CL); } + + public static SingleTableSubclass newInstance(PersistentClass superclass) { + return new SingleTableSubclass(newInstance(CL, superclass)); + } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/HibernateMappingExporter.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/HibernateMappingExporter.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/HibernateMappingExporter.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -5,18 +5,78 @@ import java.lang.reflect.Method; import java.util.Map; +import net.sf.cglib.proxy.Callback; +import net.sf.cglib.proxy.CallbackFilter; +import net.sf.cglib.proxy.Enhancer; +import net.sf.cglib.proxy.MethodInterceptor; +import net.sf.cglib.proxy.MethodProxy; + import org.hibernate.mediator.HibernateConsoleRuntimeException; import org.hibernate.mediator.base.HObject; +import org.hibernate.mediator.stubs.util.ReflectHelper; import org.hibernate.mediator.x.cfg.Configuration; import org.hibernate.mediator.x.tool.hbm2x.pojo.POJOClass; public class HibernateMappingExporter extends HObject { public static final String CL = "org.hibernate.tool.hbm2x.HibernateMappingExporter"; //$NON-NLS-1$ + + public interface IExportPOJOInterceptor { + public Object exportPOJO(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable; + } - protected HibernateMappingExporter(Configuration cfg, File outputdir) { - super(HObject.newInstance(CL, cfg, outputdir), CL); + protected HibernateMappingExporter(Object hibernateMappingExporter) { + super(hibernateMappingExporter, CL); } + public static HibernateMappingExporter newInstance(Object hibernateMappingExporter) { + return new HibernateMappingExporter(hibernateMappingExporter); + } + + public static HibernateMappingExporter newInstance(Configuration cfg, File outputdir, final IExportPOJOInterceptor exportPOJOInterceptor) { + Class<?> clazz; + try { + clazz = ReflectHelper.classForName(CL); + } catch (ClassNotFoundException ex) { + throw new HibernateConsoleRuntimeException(ex); + } + MethodInterceptor mi = new MethodInterceptor() { + public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable { + return exportPOJOInterceptor.exportPOJO(obj, method, args, proxy); + } + }; + Enhancer e = createEnhancer(clazz, mi); + try { + clazz = ReflectHelper.classForName(Configuration.CL); + } catch (ClassNotFoundException ex) { + throw new HibernateConsoleRuntimeException(ex); + } + Object hibernateMappingExporter = e.create(new Class[] { clazz, File.class }, + new Object[] { cfg.Obj(), outputdir } ); + return new HibernateMappingExporter(hibernateMappingExporter); + } + + private static final CallbackFilter baseExportPOJO = new CallbackFilter() { + public int accept(Method method) { + if ("exportPOJO".equals(method.getName() ) ) { + return 1; + } + return 0; + } + }; + + public static Enhancer createEnhancer(Class<?> clazz, MethodInterceptor mi) { + Enhancer e = new Enhancer(); + e.setSuperclass(clazz); + MethodInterceptor miDef = new MethodInterceptor() { + public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable { + return proxy.invokeSuper(obj, args); + } + }; + e.setCallbacks(new Callback[] { miDef, mi }); + e.setCallbackFilter(baseExportPOJO); + return e; + } + public void setGlobalSettings(HibernateMappingGlobalSettings hmgs) { invoke(mn(), hmgs); } @@ -25,16 +85,16 @@ invoke(mn()); } - protected File getOutputDirectory() { + public File getOutputDirectory() { return (File)invoke(mn()); } - protected void setOutputDirectory(File outputdir) { + public void setOutputDirectory(File outputdir) { invoke(mn(), outputdir); } @SuppressWarnings("unchecked") - protected void exportPOJO(Map additionalContext, POJOClass element) { + public void exportPOJO(Map additionalContext, POJOClass element) { // protected -> call via reflection Method m = null; try { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/pojo/POJOClass.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/pojo/POJOClass.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/pojo/POJOClass.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -9,6 +9,10 @@ super(pojoClass, CL); } + public static POJOClass newInstance(Object pojoClass) { + return new POJOClass(pojoClass); + } + public String getQualifiedDeclarationName() { return (String)invoke(mn()); }