openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mprud...@apache.org
Subject svn commit: r526287 - in /incubator/openjpa/trunk: openjpa-integration/tck/pom.xml pom.xml
Date Fri, 06 Apr 2007 21:19:54 GMT
Author: mprudhom
Date: Fri Apr  6 14:19:53 2007
New Revision: 526287

URL: http://svn.apache.org/viewvc?view=rev&rev=526287
Log:
OPENJPA-193 Added 'tck-profile' profile flag that enables running the JPA TCK as part of the
integration-test phase

Modified:
    incubator/openjpa/trunk/openjpa-integration/tck/pom.xml
    incubator/openjpa/trunk/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=526287&r1=526286&r2=526287
==============================================================================
--- incubator/openjpa/trunk/openjpa-integration/tck/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-integration/tck/pom.xml Fri Apr  6 14:19:53 2007
@@ -19,16 +19,18 @@
     This build file is used to run the JPA TCK. It assumes that you have
     the TCK zip file located at:
 
-        ${user.home}/.m2/privaterepos/jpa-1_0a-tck.zip
+        ${user.home}/.m2/privaterepos/jpa-1_0b-tck.zip
 
     If you have that file in a different location, it can be specified with
     the "tck.zip" system property.
 
+    The TCK will only be run if you have the "tck-profile" enabled.
+
     To run a specific package of tests, use the "jpatck.pkg.dir" system
     property to specify the parent directory of the tests you want to run.
     E.g.:
 
-        mvn integration-test -Djpatck.pkg.dir=com/sun/ts/tests/ejb30/persistence/inheritance/mappedsc/descriptors
+        mvn integration-test -Ptck-profile -Djpatck.pkg.dir=com/sun/ts/tests/ejb30/persistence/inheritance/mappedsc/descriptors
 
     The TCK running process will do the following:
 
@@ -53,6 +55,9 @@
         <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
 
+    <profiles>
+    <profile>
+    <id>tck-profile</id>
     <build>
         <plugins>
             <plugin>
@@ -66,17 +71,10 @@
                         <echo>Running Sun JPA TCK</echo>
 
                         <property name="tck.zip" value=
-                            "${settings.localRepository}/../privaterepos/jpa-1_0a-tck.zip"/>
-                        <!-- patch from Anderson for mappedBy bug -->
-                        <property name="tck.patch" value=
-                            "${settings.localRepository}/../privaterepos/jpa-tck-inheritance-mappedBy.jar"/>
-
+                            "${settings.localRepository}/../privaterepos/jpa-1_0b-tck.zip"/>
                          <available property="tck.available" file="${tck.zip}"/>
                         <fail unless="tck.available">The TCK file ${tck.zip} does not
exist. This file must be downloaded separately in order to be able to run the JPA TCK</fail>
 
-                        <available property="tck.patch.available" file="${tck.patch}"/>
-                        <fail unless="tck.patch.available">The TCK patch ${tck.patch}
does not exist. This file must be downloaded separately in order to be able to run the JPA
TCK</fail>
-
 
                         <available property="tck.available" file="${tck.zip}"/>
                         <fail unless="tck.available">The TCK file specific in the "tck.zip"
system property (${tck.zip}) does not exist. This file must be downloaded separately in order
to be able to run the JPA TCK</fail>
@@ -94,10 +92,6 @@
                         <unzip overwrite="false"
                             src="${tck.zip}" dest="${tck.base}"/>
 
-                        <!-- unpack the patch over the TCK -->
-                        <unzip overwrite="true"
-                            src="${tck.patch}" dest="${tck.dir}"/>
-
                         <property name="db.driver"
                             value="org.apache.derby.jdbc.EmbeddedDriver"/>
                         <property name="db.url"
@@ -247,6 +241,9 @@
             </plugin>
         </plugins>
     </build>
+    </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>

Modified: incubator/openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/pom.xml?view=diff&rev=526287&r1=526286&r2=526287
==============================================================================
--- incubator/openjpa/trunk/pom.xml (original)
+++ incubator/openjpa/trunk/pom.xml Fri Apr  6 14:19:53 2007
@@ -103,6 +103,7 @@
         <module>openjpa-xmlstore</module>
         <module>openjpa-all</module>
         <module>openjpa-project</module>
+        <module>openjpa-integration</module>
     </modules>
     <profiles>
         <profile>



Mime
View raw message