[jbosstools-commits] JBoss Tools SVN: r22208 - in branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator: src/org/hibernate/mediator/stubs/util and 2 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu May 20 10:15:16 EDT 2010
Author: vyemialyanchyk
Date: 2010-05-20 10:15:14 -0400 (Thu, 20 May 2010)
New Revision: 22208
Added:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib.new/
Removed:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib/
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties
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/packaging/Filter.java
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.mediator/build.properties
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties 2010-05-20 13:38:02 UTC (rev 22207)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/build.properties 2010-05-20 14:15:14 UTC (rev 22208)
@@ -1,6 +1,6 @@
bin.includes = plugin.xml,\
org.hibernate.mediator.jar,\
- lib/,\
+ lib.new/,\
META-INF/,\
hibernate-log4j.properties,\
about.html,\
@@ -9,35 +9,46 @@
about.properties,\
hibernate_icon.gif,\
plugin.properties,\
- 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
+ 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
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/.cvsignore
+bin.excludes = lib.new/.cvsignore
Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib.new (from rev 22175, branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/lib)
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-20 13:38:02 UTC (rev 22207)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java 2010-05-20 14:15:14 UTC (rev 22208)
@@ -16,7 +16,6 @@
import javax.persistence.mediator.x.MappedSuperclass;
import javax.persistence.mediator.x.spi.PersistenceUnitTransactionType;
-import org.hibernate.mediator.x.ejb.Ejb3Configuration;
import org.hibernate.mediator.x.ejb.HibernatePersistence;
import org.hibernate.mediator.x.ejb.packaging.ClassFilter;
import org.hibernate.mediator.x.ejb.packaging.Entry;
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-20 13:38:02 UTC (rev 22207)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java 2010-05-20 14:15:14 UTC (rev 22208)
@@ -136,7 +136,6 @@
public HibernateMappingExporter createHibernateMappingExporter(File folder2Gen, final IExporterNewOutputDir enod) {
return HibernateMappingExporter.newInstance(this, folder2Gen, new HibernateMappingExporter.IExportPOJOInterceptor() {
- @SuppressWarnings("unchecked")
public Object exportPOJO(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable {
HibernateMappingExporter hme = HibernateMappingExporter.newInstance(obj);
POJOClass element = POJOClass.newInstance(args[1]);
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/ejb/packaging/Filter.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/ejb/packaging/Filter.java 2010-05-20 13:38:02 UTC (rev 22207)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/ejb/packaging/Filter.java 2010-05-20 14:15:14 UTC (rev 22208)
@@ -6,7 +6,7 @@
import net.sf.cglib.proxy.CallbackFilter;
import net.sf.cglib.proxy.Enhancer;
import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.NoOp;
+import net.sf.cglib.proxy.MethodProxy;
import org.hibernate.mediator.base.HObject;
@@ -39,7 +39,12 @@
public static Enhancer createEnhancer(Class<?> clazz, MethodInterceptor mi) {
Enhancer e = new Enhancer();
e.setSuperclass(clazz);
- e.setCallbacks(new Callback[] { NoOp.INSTANCE, mi });
+ 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(baseNodeFilter);
return e;
}
More information about the jbosstools-commits
mailing list