You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by an...@apache.org on 2007/11/14 07:50:29 UTC
svn commit: r594787 - in /db/jdo/trunk/tck2: build.properties maven.xml
project.properties project.xml src/conf/jdori-pmf.properties
Author: andyj
Date: Tue Nov 13 22:50:28 2007
New Revision: 594787
URL: http://svn.apache.org/viewvc?rev=594787&view=rev
Log:
JDO-551 Swap to using ASM instead of BCEL for JPOX enhancement
Modified:
db/jdo/trunk/tck2/build.properties
db/jdo/trunk/tck2/maven.xml
db/jdo/trunk/tck2/project.properties
db/jdo/trunk/tck2/project.xml
db/jdo/trunk/tck2/src/conf/jdori-pmf.properties
Modified: db/jdo/trunk/tck2/build.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/build.properties?rev=594787&r1=594786&r2=594787&view=diff
==============================================================================
--- db/jdo/trunk/tck2/build.properties (original)
+++ db/jdo/trunk/tck2/build.properties Tue Nov 13 22:50:28 2007
@@ -29,7 +29,7 @@
# Properties for the execution of the TCK
#
iut.runtck.sysproperties = -Xmx512m
-iut.runtck.classpath = ${jpox.jdori.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}${path.separator}${jpox.dbcp.jarfile}${path.separator}${jpox.c3p0.jarfile}
+iut.runtck.classpath = ${jpox.jdori.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${asm.jarfile}${path.separator}${jpox.dbcp.jarfile}${path.separator}${jpox.c3p0.jarfile}
##
# Properties for the execution of the IUT enhancer
@@ -42,7 +42,7 @@
iut.enhancer.options = -v -d "${enhanced.dir}"
iut.enhancer.args = ${jdo.tck.jdometadata.files}
iut.enhancer.sysproperties =
-iut.enhancer.cp = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}
+iut.enhancer.cp = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${asm.jarfile}
##
# Properties for the datastore
Modified: db/jdo/trunk/tck2/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/maven.xml?rev=594787&r1=594786&r2=594787&view=diff
==============================================================================
--- db/jdo/trunk/tck2/maven.xml (original)
+++ db/jdo/trunk/tck2/maven.xml Tue Nov 13 22:50:28 2007
@@ -686,7 +686,7 @@
<pathelement location="${jpox.javafive.jarfile}" />
<pathelement location="${jta.jarfile}" />
<pathelement location="${xmlparser}" />
- <pathelement location="${bcel.jarfile}" />
+ <pathelement location="${asm.jarfile}" />
<pathelement location="${log4j.jarfile}" />
<pathelement location="${jpox.dbcp.jarfile}" />
<pathelement location="${jpox.c3p0.jarfile}" />
Modified: db/jdo/trunk/tck2/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.properties?rev=594787&r1=594786&r2=594787&view=diff
==============================================================================
--- db/jdo/trunk/tck2/project.properties (original)
+++ db/jdo/trunk/tck2/project.properties Tue Nov 13 22:50:28 2007
@@ -59,7 +59,7 @@
jpox.jdori.jarfile = ${pom.getDependencyPath('jpox:jpox-core')}
jpox.enhancer.jarfile = ${pom.getDependencyPath('jpox:jpox-enhancer')}
jpox.javafive.jarfile = ${pom.getDependencyPath('jpox:jpox-java5')}
-bcel.jarfile = ${pom.getDependencyPath('org.apache.bcel:bcel')}
+asm.jarfile = ${pom.getDependencyPath('asm:asm')}
junit.jarfile = ${pom.getDependencyPath('junit:junit')}
jta.jarfile = ${pom.getDependencyPath('javax.transaction:transaction-api')}
springcore.jarfile = ${pom.getDependencyPath('org.springframework:spring-core')}
@@ -77,7 +77,7 @@
# JDORI enhancer
jdori.enhanced.dir = ${maven.build.dir}/enhanced/jdori
jdori.enhancer.main = org.jpox.enhancer.JPOXEnhancer
-jdori.enhancer.options = -v -d "${enhanced.dir}"
+jdori.enhancer.options = -enhancerName asm -v -d "${enhanced.dir}"
jdori.enhancer.args = ${jdo.tck.jdometadata.files}
# connection pooling dependencies
@@ -260,6 +260,7 @@
org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java \
org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java \
org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java \
+ org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java \
org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java \
org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java \
org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java \
@@ -485,6 +486,7 @@
org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.class \
org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.class \
org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.class \
+ org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.class \
org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.class \
org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.class \
org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.class \
@@ -616,6 +618,7 @@
org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo \
org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo \
org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo \
+ org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo \
org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo \
org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo \
org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo \
@@ -720,4 +723,5 @@
org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.class \
org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.class \
org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.class \
+ org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.class \
Modified: db/jdo/trunk/tck2/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.xml?rev=594787&r1=594786&r2=594787&view=diff
==============================================================================
--- db/jdo/trunk/tck2/project.xml (original)
+++ db/jdo/trunk/tck2/project.xml Tue Nov 13 22:50:28 2007
@@ -90,10 +90,10 @@
<version>3.8.1</version>
</dependency>
<dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
- <version>5.2</version>
- <url>http://jakarta.apache.org/bcel/</url>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.0</version>
+ <url>http://maven.objectweb.org/maven2/asm/asm/3.0/</url>
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified: db/jdo/trunk/tck2/src/conf/jdori-pmf.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/jdori-pmf.properties?rev=594787&r1=594786&r2=594787&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/conf/jdori-pmf.properties (original)
+++ db/jdo/trunk/tck2/src/conf/jdori-pmf.properties Tue Nov 13 22:50:28 2007
@@ -40,3 +40,4 @@
#org.jpox.initializePrimaryKeyColumnInfo=true
#org.jpox.connectionPoolingType=DBCP
org.jpox.connectionPoolingType=C3P0
+org.jpox.implementationCreatorName=asm