You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mp...@apache.org on 2007/04/07 04:10:21 UTC
svn commit: r526347 -
/incubator/openjpa/trunk/openjpa-integration/tck/pom.xml
Author: mprudhom
Date: Fri Apr 6 19:10:20 2007
New Revision: 526347
URL: http://svn.apache.org/viewvc?view=rev&rev=526347
Log:
Use the authoritative JPA API jar for running the TCK to get around incompatibilities with the Geronimo JPA API.
Modified:
incubator/openjpa/trunk/openjpa-integration/tck/pom.xml
Modified: incubator/openjpa/trunk/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-integration/tck/pom.xml?view=diff&rev=526347&r1=526346&r2=526347
==============================================================================
--- incubator/openjpa/trunk/openjpa-integration/tck/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-integration/tck/pom.xml Fri Apr 6 19:10:20 2007
@@ -83,15 +83,21 @@
value="${basedir}/target/tck"/>
<property name="tck.dir" value="${tck.base}/jpatck"/>
+ <unzip overwrite="false"
+ src="${tck.zip}" dest="${tck.base}"/>
+
<path id="cp">
<path refid="maven.compile.classpath"/>
+
+ <!-- use official JPA API instead of GM's -->
+ <fileset dir="${tck.dir}/lib">
+ <include name="**/*.jar"/>
+ <exclude name="**/geronimo-jpa*"/>
+ </fileset>
<pathelement path="${java.class.path}"/>
</path>
<pathconvert property="cp.property" refid="cp"/>
- <unzip overwrite="false"
- src="${tck.zip}" dest="${tck.base}"/>
-
<property name="db.driver"
value="org.apache.derby.jdbc.EmbeddedDriver"/>
<property name="db.url"
@@ -103,6 +109,8 @@
<property name="jpatck.work.dir"
value="${tck.dir}/../work"/>
+ <property name="tck.log"
+ value="${tck.base}/openjpa-tck.log"/>
<property name="openjpa.properties"
value="${tck.dir}/openjpa-provier.properties"/>
@@ -167,7 +175,6 @@
<replacefilter token="-javaagent:${jpa.home}/lib/toplink-essentials-agent.jar" value="-javaagent:${agent} -Dopenjpa.MetaDataFactory=jpa(DefaultAccessType=PROPERTY)"/>
</replace>
-
<!-- make a macro for the TCK harness launcher -->
<macrodef name="tsant">
<attribute name="buildfile"/>
@@ -177,7 +184,8 @@
"org.apache.tools.ant.launch.Launcher"
fork="true" failonerror="true"
dir="${tck.dir}/src"
- output="${tck.dir}/openjpa-tck.log"
+ append="true"
+ output="${tck.log}"
timeout="7200000">
<arg value="-emacs"/>
<arg value="-buildfile"/>
@@ -200,18 +208,16 @@
value="${jpatck.pkg.dir}"/>
<classpath>
+ <path refid="cp"/>
<fileset dir="${tck.dir}/tools/ant/lib">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${tck.dir}/lib">
- <include name="**/*.jar"/>
- </fileset>
- <path refid="cp"/>
</classpath>
</java>
</sequential>
</macrodef>
+ <echo>Logging JPA TCK output to ${tck.log}</echo>
<!-- first initialize the database -->
<tsant buildfile="${tck.dir}/bin/initdb.xml"
@@ -233,6 +239,15 @@
substring="Completed test run: not ok"/>
</condition>
<fail if="jpatck.failed">Some tests failed</fail>
+
+ <echo>JPA TCK Passed 100%!</echo>
+
+ <property name="tck.results.archive"
+ value="${tck.base}/openjpa-tck-results.zip"/>
+ <zip destfile="${tck.results.archive}"
+ basedir="${jpatck.work.dir}"/>
+ <echo>Results archive at: ${tck.results.archive}</echo>
+
</tasks>
</configuration>
<goals>
@@ -246,10 +261,25 @@
</profile>
</profiles>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>Java.net Maven Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
+ <!-- use the authoritative javax.persistence API for testing -->
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0b</version>
+ </dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-all</artifactId>
+ <artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>