[hibernate-commits] Hibernate SVN: r18739 - in branches/Branch_3_2/HibernateExt/tools: src/java/org/hibernate/tool and 1 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue Feb 9 04:30:47 EST 2010
Author: max.andersen at jboss.com
Date: 2010-02-09 04:30:47 -0500 (Tue, 09 Feb 2010)
New Revision: 18739
Modified:
branches/Branch_3_2/HibernateExt/tools/.classpath
branches/Branch_3_2/HibernateExt/tools/build.xml
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/Version.java
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbmlint/detector/InstrumentationDetector.java
Log:
Fixed broken InstrumentationDetector.java which did not detect JavaAssist properly (which is default in 3.3.x)
Updated version info.
Modified: branches/Branch_3_2/HibernateExt/tools/.classpath
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/.classpath 2010-02-09 03:53:56 UTC (rev 18738)
+++ branches/Branch_3_2/HibernateExt/tools/.classpath 2010-02-09 09:30:47 UTC (rev 18739)
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/test"/>
- <classpathentry kind="src" path="src/testsupport"/>
- <classpathentry kind="src" path="src/templates"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="lib" path="lib/freemarker.jar"/>
- <classpathentry kind="lib" path="lib/jtidy-r8-20060801.jar"/>
- <classpathentry kind="lib" path="lib/org.eclipse.core.runtime_3.2.0.v20060603.jar"/>
- <classpathentry kind="lib" path="lib/org.eclipse.equinox.common_3.2.0.v20060603.jar"/>
- <classpathentry kind="lib" path="lib/org.eclipse.jdt.core_3.2.0.v_671.jar"/>
- <classpathentry kind="lib" path="lib/org.eclipse.text_3.2.0.v20060605-1400.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
- <classpathentry kind="lib" path="lib/testlibs/commons-collections-2.1.1.jar"/>
- <classpathentry kind="lib" path="lib/testlibs/commons-logging-1.0.4.jar"/>
- <classpathentry kind="lib" path="lib/testlibs/dom4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/testlibs/ejb3-persistence.jar"/>
- <classpathentry kind="lib" path="lib/testlibs/hibernate3.jar" sourcepath="/hibernate-3.2"/>
- <classpathentry kind="lib" path="lib/testlibs/hibernate-annotations.jar"/>
- <classpathentry kind="lib" path="lib/testlibs/hibernate-commons-annotations.jar"/>
- <classpathentry kind="lib" path="lib/testlibs/hibernate-entitymanager.jar"/>
- <classpathentry kind="lib" path="lib/testlibs/javassist.jar"/>
- <classpathentry kind="lib" path="lib/testlibs/jboss-annotations-ejb3.jar"/>
- <classpathentry kind="lib" path="lib/testlibs/jboss-archive-browsing.jar"/>
- <classpathentry kind="lib" path="lib/testlibs/jboss-ejb3x.jar"/>
- <classpathentry kind="lib" path="etc"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/antlr-2.7.6.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/ant-1.6.5.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/cglib-2.1.3.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/junit-3.8.1.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/jdbc/hsqldb.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/ant-antlr-1.6.5.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/ant-junit-1.6.5.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/ant-launcher-1.6.5.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/ant-swing-1.6.5.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/asm-attrs.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/asm.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/c3p0-0.9.1.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/checkstyle-all.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/cleanimports.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/commons-collections-2.1.1.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/commons-logging-1.0.4.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/concurrent-1.3.2.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/dom4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/ehcache-1.2.3.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/jaas.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/jacc-1_0-fr.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/javassist.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/jaxen-1.1-beta-7.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/jboss-cache.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/jboss-common.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/jboss-jmx.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/jboss-system.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/jgroups-2.2.8.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/jta.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/log4j-1.2.11.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/oscache-2.1.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/proxool-0.8.3.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/swarmcache-1.0rc2.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/syndiag2.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/versioncheck.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/xerces-2.6.2.jar"/>
- <classpathentry kind="lib" path="/hibernate-3.2/lib/xml-apis.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/hibernate-3.2"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/test"/>
+ <classpathentry kind="src" path="src/testsupport"/>
+ <classpathentry kind="src" path="src/templates"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="lib" path="lib/freemarker.jar"/>
+ <classpathentry kind="lib" path="lib/jtidy-r8-20060801.jar"/>
+ <classpathentry kind="lib" path="lib/org.eclipse.core.runtime_3.2.0.v20060603.jar"/>
+ <classpathentry kind="lib" path="lib/org.eclipse.equinox.common_3.2.0.v20060603.jar"/>
+ <classpathentry kind="lib" path="lib/org.eclipse.jdt.core_3.2.0.v_671.jar"/>
+ <classpathentry kind="lib" path="lib/org.eclipse.text_3.2.0.v20060605-1400.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+ <classpathentry kind="lib" path="lib/testlibs/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="lib" path="lib/testlibs/dom4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/testlibs/ejb3-persistence.jar"/>
+ <classpathentry kind="lib" path="lib/testlibs/hibernate-annotations.jar"/>
+ <classpathentry kind="lib" path="lib/testlibs/hibernate-commons-annotations.jar"/>
+ <classpathentry kind="lib" path="lib/testlibs/hibernate-entitymanager.jar"/>
+ <classpathentry kind="lib" path="lib/testlibs/javassist.jar"/>
+ <classpathentry kind="lib" path="lib/testlibs/jboss-annotations-ejb3.jar"/>
+ <classpathentry kind="lib" path="lib/testlibs/jboss-archive-browsing.jar"/>
+ <classpathentry kind="lib" path="lib/testlibs/jboss-ejb3x.jar"/>
+ <classpathentry kind="lib" path="etc"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/antlr-2.7.6.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/ant-1.6.5.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/cglib-2.1.3.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/junit-3.8.1.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/jdbc/hsqldb.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/ant-antlr-1.6.5.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/ant-junit-1.6.5.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/ant-launcher-1.6.5.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/ant-swing-1.6.5.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/asm-attrs.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/asm.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/c3p0-0.9.1.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/checkstyle-all.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/cleanimports.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/concurrent-1.3.2.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/dom4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/ehcache-1.2.3.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/jaas.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/jacc-1_0-fr.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/javassist.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/jaxen-1.1-beta-7.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/jboss-cache.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/jboss-jmx.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/jboss-system.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/jgroups-2.2.8.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/jta.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/log4j-1.2.11.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/oscache-2.1.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/proxool-0.8.3.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/swarmcache-1.0rc2.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/syndiag2.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/versioncheck.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/xerces-2.6.2.jar"/>
+ <classpathentry kind="lib" path="/hibernate-3.2/lib/xml-apis.jar"/>
+ <classpathentry kind="lib" path="C:/work/products/hibernate-distribution-3.3.2.GA/lib/required/slf4j-api-1.5.8.jar"/>
+ <classpathentry kind="lib" path="C:/work/products/slf4j-1.5.10/slf4j-log4j12-1.5.10.jar"/>
+ <classpathentry kind="lib" path="C:/work/products/hibernate-distribution-3.3.2.GA/lib/required/commons-collections-3.1.jar"/>
+ <classpathentry kind="lib" path="C:/work/products/hibernate-distribution-3.3.2.GA/hibernate3.jar" sourcepath="C:/work/products/hibernate-distribution-3.3.2.GA/project"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Modified: branches/Branch_3_2/HibernateExt/tools/build.xml
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/build.xml 2010-02-09 03:53:56 UTC (rev 18738)
+++ branches/Branch_3_2/HibernateExt/tools/build.xml 2010-02-09 09:30:47 UTC (rev 18739)
@@ -7,7 +7,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="Hibernate Tools"/>
<property name="name" value="hibernate-tools"/>
- <property name="version" value="3.2.5.GA"/>
+ <property name="version" value="3.2.6.CR1"/>
<property name="javadoc.packagenames" value="org.hibernate.tool"/>
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/Version.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/Version.java 2010-02-09 03:53:56 UTC (rev 18738)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/Version.java 2010-02-09 09:30:47 UTC (rev 18739)
@@ -5,7 +5,7 @@
final public class Version {
- public static final String VERSION = "3.2.5.Beta";
+ public static final String VERSION = "3.2.6.CR1";
private static final Version instance = new Version();
Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbmlint/detector/InstrumentationDetector.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbmlint/detector/InstrumentationDetector.java 2010-02-09 03:53:56 UTC (rev 18738)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbmlint/detector/InstrumentationDetector.java 2010-02-09 09:30:47 UTC (rev 18739)
@@ -25,7 +25,7 @@
if(Environment.getBytecodeProvider() instanceof BytecodeProviderImpl) {
cglibEnabled = true;
- } else if(Environment.getBytecodeProvider() instanceof BytecodeProviderImpl) {
+ } else if(Environment.getBytecodeProvider() instanceof org.hibernate.bytecode.javassist.BytecodeProviderImpl) {
javassistEnabled = true;
}
}
@@ -61,7 +61,7 @@
Class intface = interfaces[i];
if(intface.getName().equals( "net.sf.cglib.transform.impl.InterceptFieldEnabled" )) {
cglib = true;
- } else if(javassistEnabled && !intface.getName().equals( "org.hibernate.bytecode.javassist.FieldHandled" )) {
+ } else if(intface.getName().equals( "org.hibernate.bytecode.javassist.FieldHandled" )) {
javaassist = true;
}
}
More information about the hibernate-commits
mailing list