Author: mcaisse
Date: Fri May 27 04:49:02 2011
New Revision: 1128148
URL: http://svn.apache.org/viewvc?rev=1128148&view=rev
Log:
JDO-647 - clean-up, run iut
Added:
db/jdo/trunk/lib/iut/
Modified:
db/jdo/trunk/ (props changed)
db/jdo/trunk/exectck/ (props changed)
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/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java
db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Utilities.java
db/jdo/trunk/pom.xml
db/jdo/trunk/tck/pom.xml
db/jdo/trunk/tck/src/conf/ (props changed)
Propchange: db/jdo/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 27 04:49:02 2011
@@ -0,0 +1 @@
+target
Propchange: db/jdo/trunk/exectck/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 27 04:49:02 2011
@@ -1 +1,2 @@
.RunTCK.java.sav.swp
+target
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=1128148&r1=1128147&r2=1128148&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 May 27 04:49:02
2011
@@ -66,6 +66,13 @@ public class Enhance extends AbstractMoj
*/
private String impl;
/**
+ * Location of jar files for implementation under test.
+ * @parameter expression="${project.lib.iut.directory}"
+ * default-value="${basedir}/../lib/iut"
+ * @required
+ */
+ private String iutLibsDirectory;
+ /**
* List of identity types to be tested.
* @parameter expression="${jdo.tck.identitytypes}"
* default-value="applicationidentity datastoreidentity"
@@ -78,7 +85,7 @@ public class Enhance extends AbstractMoj
public void execute() throws MojoExecutionException, MojoFailureException {
if (!doEnhance) {
- System.out.println("Skipping Enhance!");
+ System.out.println("Skipping Enhance goal!");
return;
}
@@ -129,20 +136,17 @@ public class Enhance extends AbstractMoj
try {
fromFile = fi.next();
fromFileName = fromFile.toString();
-// System.out.println("Copying " + fromFileName);
if ((startIdx = fromFileName.indexOf(idtype + File.separator)) >
-1) {
// fully specified name of file (idtype + package + filename)
pkgName = fromFileName.substring(startIdx);
toFile = new File(enhancedDirName + File.separator
+ pkgName);
-// System.out.println("Copy from source dir to " + toFile.toString());
FileUtils.copyFile(fromFile, toFile);
} else if (srcDir.equals("testdata")) {
startIdx = fromFileName.indexOf("org" + File.separator);
pkgName = fromFileName.substring(startIdx);
toFile = new File(enhancedDirName + File.separator
+ idtype + File.separator + pkgName);
- System.out.println("Copy from " + fromFile.toString() + " to
" + toFile.toString());
FileUtils.copyFile(fromFile, toFile);
} else {
continue; // idtype not in pathname, do not copy
@@ -184,19 +188,21 @@ public class Enhance extends AbstractMoj
// Enhance classes
URL[] classPathURLs = new URL[2];
+ ArrayList<URL> cpList = new ArrayList<URL>();
ClassLoader loader = null;
try {
- classPathURLs[0] = (new File(enhancedIdDirName)).toURI().toURL();
- classPathURLs[1] = (new File(fromDirName)).toURI().toURL();
- loader = new URLClassLoader(classPathURLs, getClass().getClassLoader());
-// Utilities.printClasspath(loader);
- // debugging
-// Class cls = null;
-// try {
-// cls = loader.loadClass("org.apache.jdo.tck.pc.companyListWithoutJoin.CompanyModelReader");
-// } catch (ClassNotFoundException ex) {
-// Logger.getLogger(Enhance.class.getName()).log(Level.SEVERE, null, ex);
-// }
+ cpList.add((new File(enhancedIdDirName)).toURI().toURL());
+ cpList.add((new File(fromDirName)).toURI().toURL());
+ String[] jars = {"jar"};
+ if (impl.equals("iut")) {
+ fi = FileUtils.iterateFiles(
+ new File(iutLibsDirectory), jars, true);
+ while (fi.hasNext()) {
+ cpList.add(fi.next().toURI().toURL());
+ }
+ }
+ loader = new URLClassLoader(cpList.toArray(classPathURLs),
+ getClass().getClassLoader());
} catch (MalformedURLException ex) {
Logger.getLogger(Enhance.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -205,7 +211,8 @@ public class Enhance extends AbstractMoj
String[] classArr = classes.toArray(classArray);
enhancer.addClasses(classArr);
enhancer.setClassLoader(loader);
- System.out.println("Enhancing classes");
+ 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=1128148&r1=1128147&r2=1128148&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 May 27 04:49:02
2011
@@ -29,28 +29,39 @@ public class Help extends AbstractMojo{
msg.append("against the Reference Implementation (RI) or an implementation under
test (IUT).\n\n");
msg.append("- To display this help text, type \"mvn jdo-exectck:help\"\n");
msg.append("- To run the entire TCK type \"mvn integration-test\" or \"mvn install\"\n");
- msg.append("- To run individual goals as \"mvn jdo-exectck:<goal>\"\n");
- msg.append(" or specify command line parameters to configure the test.\n");
+ msg.append("- To run individual goals type \"mvn jdo-exectck:<goal>\"\n");
+ msg.append(" Specify command line parameters, described below, to configure the
test.\n");
msg.append("\nGOALS\n");
msg.append("* installSchema\n");
msg.append(" Installs all of the database schemas required to execute tests\n");
msg.append(" in the current test configurations.\n");
msg.append("* enhance\n");
- msg.append(" Not yet implemented\n");
+ msg.append(" Enhances classes.\n");
msg.append("* runTCK\n");
- msg.append(" Not yet implemented\n");
+ msg.append(" Runs the JDO Technology Compatibility Kit\n");
msg.append("\nPARAMETERS\n");
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("* jdo.tck.cfglist\n");
msg.append(" List of configuration files, each describing a test configuration.\n");
- msg.append(" Default is all configurations.\n");
+ msg.append(" Default is all configurations.\n");
msg.append("* jdo.tck.dblist\n");
- msg.append(" List of databases to run tests under.\n");
- msg.append(" Currently only derby is supported\n");
+ msg.append(" List of databases to run tests under.\n");
+ msg.append(" Currently only derby is supported\n");
msg.append("* jdo.tck.identitytype\n");
- msg.append(" List of identity types to be tested\n");
- msg.append(" Default value is \"applicationidentity datastoreidentity\"\n");
+ msg.append(" List of identity types to be tested\n");
+ msg.append(" Default value is \"applicationidentity datastoreidentity\"\n");
+ msg.append("* project.lib.iut.directory\n");
+ msg.append(" Location of implementation jar files. Default: ${basedir}/../lib/iut\n");
+ msg.append("* doInstallSchema\n");
+ msg.append(" Setting this parameter to false will bypass schema installation.\n");
+ msg.append("* doEnhance\n");
+ 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 END EXECTCK HELP INFORMATION\n");
System.out.println(msg.toString());
}
Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java?rev=1128148&r1=1128147&r2=1128148&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java Fri May 27
04:49:02 2011
@@ -127,7 +127,7 @@ public class InstallSchema
throws MojoExecutionException {
if (!doInstallSchema) {
- System.out.println("Skipping InstallSchema!");
+ System.out.println("Skipping InstallSchema goal!");
return;
}
Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java?rev=1128148&r1=1128147&r2=1128148&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java Fri May 27 04:49:02
2011
@@ -97,6 +97,13 @@ public class RunTCK extends AbstractMojo
*/
private String extLibsDirectory;
/**
+ * Location of jar files for implementation under test.
+ * @parameter expression="${project.lib.iut.directory}"
+ * default-value="${basedir}/../lib/iut"
+ * @required
+ */
+ private String iutLibsDirectory;
+ /**
* List of configuration files, each describing a test configuration.
* Note: Collection can only be configured in pom.xml. Using multi-valued
* type because long String cannot be broken across lines in pom.xml.
@@ -115,6 +122,7 @@ public class RunTCK extends AbstractMojo
/**
* Name of file in src/conf containing pmf properties.
* @parameter expression="${jdo.tck.pmfproperties}"
+ * default-value-"jdori-pmf.properties"
* @optional
*/
private String pmfProperties;
@@ -123,7 +131,7 @@ public class RunTCK extends AbstractMojo
* whose value is a list of files to be excluded from testing.
* @parameter expression="${jdo.tck.excludefile}"
* default-value="exclude.list"
- * @optional
+ * @required
*/
private String exclude;
/**
@@ -220,7 +228,7 @@ public class RunTCK extends AbstractMojo
public void execute() throws MojoExecutionException, MojoFailureException {
if (!doRunTCK) {
- System.out.println("Skipping RunTCK!");
+ System.out.println("Skipping RunTCK goal!");
return;
}
@@ -237,6 +245,9 @@ public class RunTCK extends AbstractMojo
File fromFile = null;
File toFile = null;
+ if (impl.equals("iut")) {
+ pmfProperties="iut-pmf.properties";
+ }
if (cfgs != null) {
// System.out.println("Configurations specified in cfgs are " + cfgs.toString());
} else if (cfgList != null) {
@@ -286,12 +297,12 @@ public class RunTCK extends AbstractMojo
fromFile = new File(confDirectory + File.separator + impl + "-jdoconfig.xml");
toFile = new File(buildDirectory + File.separator + "classes" +
File.separator + "META-INF" + File.separator + "jdoconfig.xml");
- System.out.println("Copying from " + fromFile + " to " + toFile);
+// System.out.println("Copying from " + fromFile + " to " + toFile);
FileUtils.copyFile(fromFile, toFile);
fromFile = new File(confDirectory + File.separator + impl + "-persistence.xml");
toFile = new File(buildDirectory + File.separator + "classes" +
File.separator + "META-INF" + File.separator + "persistence.xml");
- System.out.println("Copying from " + fromFile + " to " + toFile);
+// System.out.println("Copying from " + fromFile + " to " + toFile);
FileUtils.copyFile(fromFile, toFile);
} catch (IOException ex) {
Logger.getLogger(RunTCK.class.getName()).log(Level.SEVERE, null, ex);
@@ -339,7 +350,13 @@ public class RunTCK extends AbstractMojo
while (fi.hasNext()) {
cpList.add(fi.next().toURI().toURL());
}
-
+ if (impl.equals("iut")) {
+ fi = FileUtils.iterateFiles(
+ new File(iutLibsDirectory), jars, true);
+ while (fi.hasNext()) {
+ cpList.add(fi.next().toURI().toURL());
+ }
+ }
} catch (MalformedURLException ex) {
ex.printStackTrace();
Logger.getLogger(RunTCK.class.getName()).log(Level.SEVERE, null, ex);
@@ -372,10 +389,18 @@ public class RunTCK extends AbstractMojo
"Could not find mapping value in conf file: " + cfg);
}
String classes = getTrimmedPropertyValue(props, "jdo.tck.classes");
+ String excludeList = getTrimmedPropertyValue(
+ PropertyUtils.getProperties(excludeFile), "jdo.tck.exclude");
if (classes == null) {
throw new MojoExecutionException(
"Could not find classes value in conf file: " + cfg);
}
+ classes = Utilities.removeSubstrs(classes, excludeList);
+ if (classes.equals("")) {
+ System.out.println("Skipping configuration " + cfg +
+ ": classes excluded");
+ continue;
+ }
List<String> classesList = Arrays.asList(classes.split(" "));
@@ -475,13 +500,13 @@ public class RunTCK extends AbstractMojo
try {
fromFile = fi.next();
fromFileName = fromFile.toString();
- System.out.println("Copying " + fromFileName);
+// System.out.println("Copying " + fromFileName);
if ((startIdx = fromFileName.indexOf(idtype + File.separator)) > -1)
{
// fully specified name of file (idtype + package + filename)
pkgName = fromFileName.substring(startIdx);
toFile = new File(cfgDirName + File.separator
+ pkgName);
- System.out.println("Copy from source dir to " + toFile.toString());
+// System.out.println("Copy from source dir to " + toFile.toString());
FileUtils.copyFile(fromFile, toFile);
}
} catch (IOException ex) {
Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Utilities.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Utilities.java?rev=1128148&r1=1128147&r2=1128148&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Utilities.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Utilities.java Fri May 27 04:49:02
2011
@@ -47,6 +47,15 @@ public class Utilities {
return cp.toString();
}
+ public static String removeSubstrs(String master, String exclude) {
+ String [] deleteThese = exclude.split(" ");
+ String filtered = master;
+ for (String sub: deleteThese) {
+ filtered = filtered.replaceAll(sub.trim(), "");
+ }
+ return filtered.trim();
+ }
+
public static void printClasspath(ClassLoader loader) {
//Get the URLs
@@ -56,19 +65,6 @@ public class Utilities {
for (int i = 0; i < urls.length; i++) {
System.out.println(" " + urls[i].getFile());
}
-
-// //Get the Context Classloader
-// loader = Thread.currentThread().getContextClassLoader();
-//
-// //Get the URLs
-// urls = ((URLClassLoader)loader).getURLs();
-//
-// System.out.println(urls.length + "URLs for loader: ");
-// for(int i=0; i< urls.length; i++)
-// {
-// System.out.println(" " + urls[i].getFile());
-// }
-
}
public void printClasspath() {
Modified: db/jdo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/pom.xml?rev=1128148&r1=1128147&r2=1128148&view=diff
==============================================================================
--- db/jdo/trunk/pom.xml (original)
+++ db/jdo/trunk/pom.xml Fri May 27 04:49:02 2011
@@ -92,27 +92,27 @@ Requests (JSR 12 and 243) under the ausp
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
- <version>3.0.0-m2</version>
+ <version>3.0.0-m3</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-rdbms</artifactId>
- <version>3.0.0-m2</version>
+ <version>3.0.0-m3</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-enhancer</artifactId>
- <version>3.0.0-m2</version>
+ <version>3.0.0-m3</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jdo</artifactId>
- <version>3.0.0-m2</version>
+ <version>3.0.0-m3</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jpa</artifactId>
- <version>3.0.0-m2</version>
+ <version>3.0.0-m3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: db/jdo/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/pom.xml?rev=1128148&r1=1128147&r2=1128148&view=diff
==============================================================================
--- db/jdo/trunk/tck/pom.xml (original)
+++ db/jdo/trunk/tck/pom.xml Fri May 27 04:49:02 2011
@@ -17,210 +17,9 @@
The JDO TCK is a test suite designed to test implementations of the Java Data Objects
specification. In order to claim compatibility with JDO, an implementation must pass all relevant
tests of the JDOTCK.
- NOTE!! There are no unit tests in this project.</description>
+ NOTE!! There are no unit tests in this project.
+ </description>
- <profiles>
- <profile>
- <id>jdori</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.jdo</groupId>
- <artifactId>jdo-exectck</artifactId>
- <version>1.0-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <goals>
- <goal>help</goal>
- <goal>installSchema</goal>
- <goal>enhance</goal>
- <goal>runtck</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doInstallSchema>true</doInstallSchema>
- <doEnhance>true</doEnhance>
- <doRunTCK>true</doRunTCK>
- <impl>jdori</impl>
- <pmfProperties>jdori-pmf.properties</pmfProperties>
- <verbose>true</verbose>
- <runtckVerbose>false</runtckVerbose>
- <debugTCK>false</debugTCK>
- <cleanupaftertest>true</cleanupaftertest>
- <identitytypes>applicationidentity datastoreidentity</identitytypes>
- <dbproperties>-Dderby.system.home=${basedir}/target/database/derby</dbproperties>
- <signaturefile>${basedir}/src/conf/jdo-3_1-signatures.txt</signaturefile>
- <cfgs>
- <cfg>company1-1Relationships.conf</cfg>
- <cfg>company1-MRelationships.conf</cfg>
- <cfg>companyAllRelationships.conf</cfg>
- <cfg>companyAnnotated1-1RelationshipsFCPM.conf</cfg>
- <cfg>companyAnnotated1-MRelationshipsFCPM.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsFCConcrete.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsFCPM.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsJPAConcrete.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsJPAPM.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsPCConcrete.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsPCPM.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsPIPM.conf</cfg>
- <cfg>companyAnnotatedEmbeddedFCPM.conf</cfg>
- <cfg>companyAnnotatedEmbeddedJPAConcrete.conf</cfg>
- <cfg>companyAnnotatedEmbeddedJPAPM.conf</cfg>
- <cfg>companyAnnotatedM-MRelationshipsFCConcrete.conf</cfg>
- <cfg>companyAnnotatedM-MRelationshipsFCPM.conf</cfg>
- <cfg>companyAnnotatedNoRelationshipsFCConcrete.conf</cfg>
- <cfg>companyAnnotatedNoRelationshipsFCPM.conf</cfg>
- <cfg>companyAnnotatedNoRelationshipsPCConcrete.conf</cfg>
- <cfg>companyAnnotatedNoRelationshipsPCPM.conf</cfg>
- <cfg>companyAnnotatedNoRelationshipsPIPM.conf</cfg>
- <cfg>companyEmbedded.conf</cfg>
- <cfg>companyListWithoutJoin.conf</cfg>
- <cfg>companyMapWithoutJoin.conf</cfg>
- <cfg>companyM-MRelationships.conf</cfg>
- <cfg>companyNoRelationships.conf</cfg>
- <cfg>companyOverrideAnnotatedAllRelationshipsFCPM.conf</cfg>
- <cfg>companyPMClass.conf</cfg>
- <cfg>companyPMInterface.conf</cfg>
- <cfg>compoundIdentity.conf</cfg>
- <cfg>detach.conf</cfg>
- <cfg>enhancement.conf</cfg>
- <cfg>extents.conf</cfg>
- <cfg>fetchgroup.conf</cfg>
- <cfg>fetchplan.conf</cfg>
- <cfg>inheritance1.conf</cfg>
- <cfg>inheritance2.conf</cfg>
- <cfg>inheritance3.conf</cfg>
- <cfg>inheritance4.conf</cfg>
- <cfg>instancecallbacks.conf</cfg>
- <cfg>jdohelper.conf</cfg>
- <cfg>jdoql.conf</cfg>
- <cfg>lifecycle.conf</cfg>
- <cfg>models1.conf</cfg>
- <cfg>models.conf</cfg>
- <cfg>pm.conf</cfg>
- <cfg>pmf.conf</cfg>
- <cfg>query.conf</cfg>
- <cfg>relationshipAllRelationships.conf</cfg>
- <cfg>relationshipNoRelationships.conf</cfg>
- <cfg>runonce.conf</cfg>
- <cfg>schemaAttributeClass.conf</cfg>
- <cfg>schemaAttributeOrm.conf</cfg>
- <cfg>schemaAttributePackage.conf</cfg>
- <cfg>security.conf</cfg>
- <cfg>transactions.conf</cfg>
- </cfgs>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>iut</id>
- <activation>
- <property>
- <name>iut</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.jdo</groupId>
- <artifactId>jdo-exectck</artifactId>
- <version>1.0-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <goals>
- <goal>help</goal>
- <goal>installSchema</goal>
- <goal>enhance</goal>
- <goal>runtck</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doInstallSchema>true</doInstallSchema>
- <doEnhance>true</doEnhance>
- <doRunTCK>true</doRunTCK>
- <impl>jdori</impl>
- <pmfProperties>jdori-pmf.properties</pmfProperties>
- <verbose>true</verbose>
- <runtckVerbose>false</runtckVerbose>
- <debugTCK>false</debugTCK>
- <cleanupaftertest>true</cleanupaftertest>
- <identitytypes>applicationidentity datastoreidentity</identitytypes>
- <dbproperties>-Dderby.system.home=${basedir}/target/database/derby</dbproperties>
- <signaturefile>${basedir}/src/conf/jdo-3_1-signatures.txt</signaturefile>
- <cfgs>
- <cfg>company1-1Relationships.conf</cfg>
- <cfg>company1-MRelationships.conf</cfg>
- <cfg>companyAllRelationships.conf</cfg>
- <cfg>companyAnnotated1-1RelationshipsFCPM.conf</cfg>
- <cfg>companyAnnotated1-MRelationshipsFCPM.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsFCConcrete.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsFCPM.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsJPAConcrete.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsJPAPM.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsPCConcrete.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsPCPM.conf</cfg>
- <cfg>companyAnnotatedAllRelationshipsPIPM.conf</cfg>
- <cfg>companyAnnotatedEmbeddedFCPM.conf</cfg>
- <cfg>companyAnnotatedEmbeddedJPAConcrete.conf</cfg>
- <cfg>companyAnnotatedEmbeddedJPAPM.conf</cfg>
- <cfg>companyAnnotatedM-MRelationshipsFCConcrete.conf</cfg>
- <cfg>companyAnnotatedM-MRelationshipsFCPM.conf</cfg>
- <cfg>companyAnnotatedNoRelationshipsFCConcrete.conf</cfg>
- <cfg>companyAnnotatedNoRelationshipsFCPM.conf</cfg>
- <cfg>companyAnnotatedNoRelationshipsPCConcrete.conf</cfg>
- <cfg>companyAnnotatedNoRelationshipsPCPM.conf</cfg>
- <cfg>companyAnnotatedNoRelationshipsPIPM.conf</cfg>
- <cfg>companyEmbedded.conf</cfg>
- <cfg>companyListWithoutJoin.conf</cfg>
- <cfg>companyMapWithoutJoin.conf</cfg>
- <cfg>companyM-MRelationships.conf</cfg>
- <cfg>companyNoRelationships.conf</cfg>
- <cfg>companyOverrideAnnotatedAllRelationshipsFCPM.conf</cfg>
- <cfg>companyPMClass.conf</cfg>
- <cfg>companyPMInterface.conf</cfg>
- <cfg>compoundIdentity.conf</cfg>
- <cfg>detach.conf</cfg>
- <cfg>enhancement.conf</cfg>
- <cfg>extents.conf</cfg>
- <cfg>fetchgroup.conf</cfg>
- <cfg>fetchplan.conf</cfg>
- <cfg>inheritance1.conf</cfg>
- <cfg>inheritance2.conf</cfg>
- <cfg>inheritance3.conf</cfg>
- <cfg>inheritance4.conf</cfg>
- <cfg>instancecallbacks.conf</cfg>
- <cfg>jdohelper.conf</cfg>
- <cfg>jdoql.conf</cfg>
- <cfg>lifecycle.conf</cfg>
- <cfg>models1.conf</cfg>
- <cfg>models.conf</cfg>
- <cfg>pm.conf</cfg>
- <cfg>pmf.conf</cfg>
- <cfg>query.conf</cfg>
- <cfg>relationshipAllRelationships.conf</cfg>
- <cfg>relationshipNoRelationships.conf</cfg>
- <cfg>runonce.conf</cfg>
- <cfg>schemaAttributeClass.conf</cfg>
- <cfg>schemaAttributeOrm.conf</cfg>
- <cfg>schemaAttributePackage.conf</cfg>
- <cfg>security.conf</cfg>
- <cfg>transactions.conf</cfg>
- </cfgs>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
<build>
<sourceDirectory>src/java</sourceDirectory>
<resources>
@@ -249,6 +48,95 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.jdo</groupId>
+ <artifactId>jdo-exectck</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>help</goal>
+ <goal>installSchema</goal>
+ <goal>enhance</goal>
+ <goal>runtck</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doInstallSchema>false</doInstallSchema>
+ <doEnhance>true</doEnhance>
+ <doRunTCK>true</doRunTCK>
+ <impl>jdori</impl>
+ <pmfProperties>jdori-pmf.properties</pmfProperties>
+ <verbose>true</verbose>
+ <runtckVerbose>false</runtckVerbose>
+ <debugTCK>false</debugTCK>
+ <cleanupaftertest>true</cleanupaftertest>
+ <identitytypes>applicationidentity datastoreidentity</identitytypes>
+ <dbproperties>-Dderby.system.home=${basedir}/target/database/derby</dbproperties>
+ <signaturefile>${basedir}/src/conf/jdo-3_1-signatures.txt</signaturefile>
+ <cfgs>
+ <cfg>company1-1Relationships.conf</cfg>
+ <cfg>company1-MRelationships.conf</cfg>
+ <cfg>companyAllRelationships.conf</cfg>
+ <cfg>companyAnnotated1-1RelationshipsFCPM.conf</cfg>
+ <cfg>companyAnnotated1-MRelationshipsFCPM.conf</cfg>
+ <cfg>companyAnnotatedAllRelationshipsFCConcrete.conf</cfg>
+ <cfg>companyAnnotatedAllRelationshipsFCPM.conf</cfg>
+ <cfg>companyAnnotatedAllRelationshipsJPAConcrete.conf</cfg>
+ <cfg>companyAnnotatedAllRelationshipsJPAPM.conf</cfg>
+ <cfg>companyAnnotatedAllRelationshipsPCConcrete.conf</cfg>
+ <cfg>companyAnnotatedAllRelationshipsPCPM.conf</cfg>
+ <cfg>companyAnnotatedAllRelationshipsPIPM.conf</cfg>
+ <cfg>companyAnnotatedEmbeddedFCPM.conf</cfg>
+ <cfg>companyAnnotatedEmbeddedJPAConcrete.conf</cfg>
+ <cfg>companyAnnotatedEmbeddedJPAPM.conf</cfg>
+ <cfg>companyAnnotatedM-MRelationshipsFCConcrete.conf</cfg>
+ <cfg>companyAnnotatedM-MRelationshipsFCPM.conf</cfg>
+ <cfg>companyAnnotatedNoRelationshipsFCConcrete.conf</cfg>
+ <cfg>companyAnnotatedNoRelationshipsFCPM.conf</cfg>
+ <cfg>companyAnnotatedNoRelationshipsPCConcrete.conf</cfg>
+ <cfg>companyAnnotatedNoRelationshipsPCPM.conf</cfg>
+ <cfg>companyAnnotatedNoRelationshipsPIPM.conf</cfg>
+ <cfg>companyEmbedded.conf</cfg>
+ <cfg>companyListWithoutJoin.conf</cfg>
+ <cfg>companyMapWithoutJoin.conf</cfg>
+ <cfg>companyM-MRelationships.conf</cfg>
+ <cfg>companyNoRelationships.conf</cfg>
+ <cfg>companyOverrideAnnotatedAllRelationshipsFCPM.conf</cfg>
+ <cfg>companyPMClass.conf</cfg>
+ <cfg>companyPMInterface.conf</cfg>
+ <cfg>compoundIdentity.conf</cfg>
+ <cfg>detach.conf</cfg>
+ <cfg>enhancement.conf</cfg>
+ <cfg>extents.conf</cfg>
+ <cfg>fetchgroup.conf</cfg>
+ <cfg>fetchplan.conf</cfg>
+ <cfg>inheritance1.conf</cfg>
+ <cfg>inheritance2.conf</cfg>
+ <cfg>inheritance3.conf</cfg>
+ <cfg>inheritance4.conf</cfg>
+ <cfg>instancecallbacks.conf</cfg>
+ <cfg>jdohelper.conf</cfg>
+ <cfg>jdoql.conf</cfg>
+ <cfg>lifecycle.conf</cfg>
+ <cfg>models1.conf</cfg>
+ <cfg>models.conf</cfg>
+ <cfg>pm.conf</cfg>
+ <cfg>pmf.conf</cfg>
+ <cfg>query.conf</cfg>
+ <cfg>relationshipAllRelationships.conf</cfg>
+ <cfg>relationshipNoRelationships.conf</cfg>
+ <cfg>runonce.conf</cfg>
+ <cfg>schemaAttributeClass.conf</cfg>
+ <cfg>schemaAttributeOrm.conf</cfg>
+ <cfg>schemaAttributePackage.conf</cfg>
+ <cfg>security.conf</cfg>
+ <cfg>transactions.conf</cfg>
+ </cfgs>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
Propchange: db/jdo/trunk/tck/src/conf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 27 04:49:02 2011
@@ -0,0 +1 @@
+.exclude.list.swp
|