db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r1134184 - in /db/jdo/trunk: exectck/pom.xml exectck/src/main/java/org/apache/jdo/exectck/Enhance.java exectck/src/main/java/org/apache/jdo/exectck/Help.java tck/pom.xml
Date Fri, 10 Jun 2011 04:01:57 GMT
Author: mcaisse
Date: Fri Jun 10 04:01:56 2011
New Revision: 1134184

URL: http://svn.apache.org/viewvc?rev=1134184&view=rev
Log:
JDO-647 - Can now run iut. Help goal updated.

Modified:
    db/jdo/trunk/exectck/pom.xml
    db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
    db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Help.java
    db/jdo/trunk/tck/pom.xml

Modified: db/jdo/trunk/exectck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/pom.xml?rev=1134184&r1=1134183&r2=1134184&view=diff
==============================================================================
--- db/jdo/trunk/exectck/pom.xml (original)
+++ db/jdo/trunk/exectck/pom.xml Fri Jun 10 04:01:56 2011
@@ -1,10 +1,11 @@
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-      <groupId>javax.jdo</groupId>
-      <artifactId>root</artifactId>
-      <version>3.1-SNAPSHOT</version>
-      <relativePath>../pom.xml</relativePath>
+        <groupId>javax.jdo</groupId>
+        <artifactId>root</artifactId>
+        <version>3.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -27,6 +28,45 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>iut</id>
+            <activation>
+                <property>
+                    <name>jdo.tck.impl</name>
+                    <value>iut</value>
+                </property>
+            </activation>
+        </profile>
+        <profile>
+            <id>jdori</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-core</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-rdbms</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-enhancer</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jdo</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jpa</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
     <dependencies>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -53,26 +93,6 @@
             <artifactId>jdo-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-rdbms</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-enhancer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-api-jdo</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-api-jpa</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
         </dependency>

Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java?rev=1134184&r1=1134183&r2=1134184&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java Fri Jun 10 04:01:56
2011
@@ -209,9 +209,9 @@ public class Enhance extends AbstractMoj
                 }
                 JDOEnhancer enhancer = JDOHelper.getEnhancer(loader);
                 enhancer.setVerbose(true);
+                enhancer.setClassLoader(loader);
                 String[] classArr = classes.toArray(classArray);
                 enhancer.addClasses(classArr);
-                enhancer.setClassLoader(loader);
                 System.out.println("Enhancing classes in " +
                         srcDirectory + File.separator + srcDir);
                 enhancer.enhance();

Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Help.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Help.java?rev=1134184&r1=1134183&r2=1134184&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Help.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Help.java Fri Jun 10 04:01:56
2011
@@ -43,7 +43,7 @@ public class Help extends AbstractMojo{
         msg.append("To set parameters from the command line, \n  use the -D option and the
parameter name.\n");
         msg.append("  For example, \"mvn -Djdo.tck.identitytype=applicationidentity\"\n");
         msg.append("* jdo.tck.impl\n");
-        msg.append("  jdori (reference implementation) or iut (mplementation under test");
+        msg.append("  jdori (reference implementation) or iut (mplementation under test\n");
         msg.append("* jdo.tck.cfglist\n");
         msg.append("  List of configuration files, each describing a test configuration.\n");
         msg.append("  Default is all configurations.\n");
@@ -61,6 +61,10 @@ public class Help extends AbstractMojo{
         msg.append("  Setting this parameter to false will bypass enhancement.\n");
         msg.append("* doRunTCK\n");
         msg.append("  Setting this parameter to false will bypass running the TCK.\n");
+        msg.append("\n  To run the TCK on an implementation under test, \n"
+                + "      place all required jars and their dependencies in lib/iut"
+                + "      and set jdo.tck.impl to iut:\n");
+        msg.append("     mvn integration-test -D jdo.tck.impl=\"iut\"\n\n");
         msg.append("\n END EXECTCK HELP INFORMATION\n");
 
         System.out.println(msg.toString());

Modified: db/jdo/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/pom.xml?rev=1134184&r1=1134183&r2=1134184&view=diff
==============================================================================
--- db/jdo/trunk/tck/pom.xml (original)
+++ db/jdo/trunk/tck/pom.xml Fri Jun 10 04:01:56 2011
@@ -66,10 +66,9 @@
                     <doInstallSchema>true</doInstallSchema>
                     <doEnhance>true</doEnhance>
                     <doRunTCK>true</doRunTCK>
-                    <impl>jdori</impl>
                     <pmfProperties>jdori-pmf.properties</pmfProperties>
                     <verbose>true</verbose>
-                    <runtckVerbose>false</runtckVerbose>
+                    <runtckVerbose>true</runtckVerbose>
                     <debugTCK>false</debugTCK>
                     <cleanupaftertest>true</cleanupaftertest>
                     <identitytypes>applicationidentity datastoreidentity</identitytypes>
@@ -160,6 +159,23 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>iut</id>
+            <activation>
+                <property>
+                    <name>jdo.tck.impl</name>
+                    <value>iut</value>
+                </property>
+            </activation>
+        </profile>
+        <profile>
+            <id>jdori</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+    </profiles>
     <dependencies>
         <dependency>
             <groupId>javax.jdo</groupId>



Mime
View raw message