Index: README.html =================================================================== --- README.html (revision 1849443) +++ README.html (working copy) @@ -127,9 +127,10 @@

Running the TCK on an Implementation Under Test

First build the from the top level TCK project as described above. -To run the JDO TCK on an Implementation Under Test, copy the jars needed by the implementation -to the top-level lib/iut directory, as well as log4j.properties and log4j-1.2.13.jar. -The log4j jar file may be copied from lib/jdori. +To run the JDO TCK on an Implementation Under Test, edit tck/pom.xml and add the iut dependencies to the +profile called iut. Also check the following files under tck/src/main/resources/conf and change the content +to the needs of the Implementation Under Test: + iut-jdoconfig.xml, iut-log4j.properties, iut-persistence.xml and iut-pmf.properties

Change to the "tck" directory of the branch you are working in (or trunk) and run @@ -161,7 +162,6 @@

-Djdo.tck.cfglist=configuration file list
Overrides the definition of jdo.tck.cfglist found in tck/src/conf/configuration.list by supplying one or more comma-separated test configuration files. Test configuration files typically have the .conf extension. To run a single test, create a .conf file (copy an existing file) and put the test into the jdo.tck.classes property.
-Djdo.tck.dblist=database list
Overrides the property value in project.properties by supplying one or more comma-separated database names. Currently only derby is supported.
-Djdo.tck.identitytypes=identity type list
Overrides the identity types to be run, supplying one or more comma-separated identity types ("applicationidentity" or "datastoreidentity") to use for this run. -
-Dproject.lib.iut.directory=
Location of implementation jar files. Default: ${basedir}/../lib/iut
-Djdo.tck.impl.logfile=
Location of implementation log file. Default: ${user.dir}/datanucleus.txt
-Djdo.tck.doInstallSchema=
Setting this parameter to false will bypass schema installation.
-Djdo.tck.doEnhance=
Setting this parameter to false will bypass enhancement. Index: pom.xml =================================================================== --- pom.xml (revision 1849443) +++ pom.xml (working copy) @@ -36,7 +36,6 @@ parent-pom api exectck - copyjdorijars tck Index: exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java =================================================================== --- exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java (revision 1849443) +++ exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java (working copy) @@ -17,10 +17,12 @@ import java.io.File; import java.io.FileInputStream; +import java.io.IOException; import java.util.Collection; import java.util.HashSet; import java.util.Properties; +import org.apache.commons.io.FileUtils; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -87,6 +89,31 @@ */ protected String dblist; + /** + * Implementation to be tested (jdori or iut). + * Any value other than "jdori" will test an appropriately configured IUT + * @parameter property="jdo.tck.impl" + * default-value="jdori" + * @required + */ + protected String impl; + + /** + * Location of implementation log file. + * @parameter property="jdo.tck.impl.logfile" + * default-value="${user.dir}/datanucleus.txt" + * @required + */ + protected String implLogFile; + + /** + * Classpath including the dependencies using : as separator between entries. + * @parameter property="jdo.tck.dependencyClasspath" + * default-value="" + * @required + */ + protected String dependencyClasspath; + protected Collection dbs = new HashSet(); /** @@ -119,4 +146,11 @@ "find 'src/main/resources/conf/configurations.list'"); } } + + protected void copyLog4jPropertiesFile () throws IOException { + File fromFile = new File(confDirectory + File.separator + impl + "-log4j.properties"); + File toFile = new File(buildDirectory + File.separator + "classes" + + File.separator + "log4j.properties"); + FileUtils.copyFile(fromFile, toFile); + } } Index: exectck/src/main/java/org/apache/jdo/exectck/Enhance.java =================================================================== --- exectck/src/main/java/org/apache/jdo/exectck/Enhance.java (revision 1849443) +++ exectck/src/main/java/org/apache/jdo/exectck/Enhance.java (working copy) @@ -43,7 +43,7 @@ * * @phase integration-test */ -public class Enhance extends AbstractMojo { +public class Enhance extends AbstractTCKMojo { private static final String[] PC_PKG_DIRS = { "org" + File.separator + "apache" + File.separator + "jdo" + File.separator + "tck" + File.separator + "api" + File.separator, @@ -64,50 +64,8 @@ * @required */ private String srcDirectory; + /** - * Location of the logs directory. - * @parameter property="project.log.directory" - * default-value="${project.build.directory}/logs" - * @required - */ - private File logsDirectory; - /** - * Location of TCK generated output. - * @parameter property="project.build.directory" - * default-value="${basedir}/target" - * @required - */ - private String buildDirectory; - /** - * Implementation to be tested (jdori or iut). - * Any value other than "jdori" will test an appropriately configured IUT - * @parameter property="jdo.tck.impl" - * default-value="jdori" - * @required - */ - private String impl; - /** - * Location of implementation log file. - * @parameter property="jdo.tck.impl.logfile" - * default-value="${user.dir}/datanucleus.txt" - * @required - */ - private String implLogFile; - /** - * Location of jar files for implementation under test. - * @parameter property="project.lib.iut.directory" - * default-value="${basedir}/../lib/iut" - * @required - */ - private String iutLibsDirectory; - /** - * Location of jar files for implementation under test. - * @parameter property="project.lib.iut.directory" - * default-value="${basedir}/../lib/jdori" - * @required - */ - private String jdoriLibsDirectory; - /** * List of identity types to be tested. * @parameter property="jdo.tck.identitytypes" * default-value="applicationidentity datastoreidentity" @@ -114,6 +72,7 @@ * @required */ private String identitytypes; + private Collection idtypes; @Override @@ -135,6 +94,12 @@ + enhancerLogsDir); } + try { + copyLog4jPropertiesFile(); + } catch (IOException ex) { + Logger.getLogger(Enhance.class.getName()).log(Level.SEVERE, null, ex); + } + // Create directory for enhanced classes String enhancedDirName = buildDirectory + File.separator + "enhanced" + File.separator + impl + File.separator; @@ -232,19 +197,8 @@ try { // Must add enhancedIdDirName first!! cpList1.add((new File(enhancedIdDirName)).toURI().toURL()); - String[] jars = {"jar"}; - if (impl.equals("jdori")) { - cpList1.add((new File(jdoriLibsDirectory)).toURI().toURL()); - fi = FileUtils.iterateFiles(new File(jdoriLibsDirectory), jars, true); - while (fi.hasNext()) { - cpList1.add(fi.next().toURI().toURL()); - } - } else { - cpList1.add((new File(iutLibsDirectory)).toURI().toURL()); - fi = FileUtils.iterateFiles(new File(iutLibsDirectory), jars, true); - while (fi.hasNext()) { - cpList1.add(fi.next().toURI().toURL()); - } + for (String dependency : this.dependencyClasspath.split(":")) { + cpList1.add(new File(dependency).toURI().toURL()); } enhancerLoader = new URLClassLoader(cpList1.toArray(classPathURLs1), getClass().getClassLoader()); @@ -257,17 +211,11 @@ // Context classloader for finding log4j.properties ClassLoader prevCl = Thread.currentThread().getContextClassLoader(); try { - URL implUrl; - if (impl.equals("jdori")) { - implUrl = (new File(jdoriLibsDirectory)).toURI().toURL(); - } else { - implUrl = (new File(iutLibsDirectory)).toURI().toURL(); - } URL enhancedClassesUrl = (new File(enhancedIdDirName)).toURI().toURL(); // Classes dir needed for org.apache.jdo.tck.util.TCKFileAppender URL classesUrl = (new File(classesDirName)).toURI().toURL(); ClassLoader loggingPropsCl = - URLClassLoader.newInstance(new URL[]{implUrl, + URLClassLoader.newInstance(new URL[]{ enhancedClassesUrl, classesUrl}, prevCl); Thread.currentThread().setContextClassLoader(loggingPropsCl); } catch (Exception e) { Index: exectck/src/main/java/org/apache/jdo/exectck/Help.java =================================================================== --- exectck/src/main/java/org/apache/jdo/exectck/Help.java (revision 1849443) +++ exectck/src/main/java/org/apache/jdo/exectck/Help.java (working copy) @@ -65,8 +65,6 @@ msg.append("* jdo.tck.identitytypes\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("* jdo.tck.impl.logfile\n"); msg.append(" Location of implementation log file. Default: ${user.dir}/datanucleus.txt\n"); msg.append("* jdo.tck.doInstallSchema\n"); @@ -84,7 +82,7 @@ + "\"logOnly\" will report failures to console and logs only but return 'SUCCESS' to the " + "Maven execution environment.\n"); msg.append("\n To run the TCK on an implementation under test, \n" - + " place all required jars and their dependencies in lib/iut\n" + + " edit the pom.xml in tck and add the iut dependencies to the iut profile\n" + " 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"); Index: exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java =================================================================== --- exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java (revision 1849443) +++ exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java (working copy) @@ -81,15 +81,6 @@ private boolean debugTCK; /** - * Implementation to be tested (jdori or iut). - * Any value other than "jdori" will test an appropriately configured IUT - * @parameter property="jdo.tck.impl" - * default-value="jdori" - * @required - */ - private String impl; - - /** * Location of third party libraries such as JNDI. * @parameter property="project.lib.ext.directory" * default-value="${basedir}/../lib/ext" @@ -106,20 +97,6 @@ private String implLogFile; /** - * Location of jar files for implementation under test. - * @parameter property="project.lib.iut.directory" - * default-value="${basedir}/../lib/iut" - * @required - */ - private String iutLibsDirectory; - /** - * Location of jar files for implementation under test. - * @parameter property="project.lib.iut.directory" - * default-value="${basedir}/../lib/jdori" - * @required - */ - private String jdoriLibsDirectory; - /** * Name of file in src/conf containing pmf properties. * @parameter property="jdo.tck.pmfproperties" * default-value="jdori-pmf.properties" @@ -199,7 +176,7 @@ /** * Helper method returning the trimmed value of the specified property. * @param props the Properties object - * @param ke the key of the property to be returned + * @param key the key of the property to be returned * @return the trimmed property value or the empty string if the property is not defined. + */ private String getTrimmedPropertyValue (Properties props, String key) { String value = props.getProperty(key); @@ -280,6 +257,12 @@ } propsString.add("-Djdo.tck.log.directory=" + thisLogDir); + try { + copyLog4jPropertiesFile(); + } catch (IOException ex) { + Logger.getLogger(RunTCK.class.getName()).log(Level.SEVERE, null, ex); + } + // Copy JDO config files to classes dir try { fromFile = new File(confDirectory + File.separator + impl + "-jdoconfig.xml"); @@ -342,18 +325,8 @@ 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()); - } - } else { - fi = FileUtils.iterateFiles( - new File(jdoriLibsDirectory), jars, true); - while (fi.hasNext()) { - cpList.add(fi.next().toURI().toURL()); - } + for (String dependency : this.dependencyClasspath.split(":")) { + cpList.add(new File(dependency).toURI().toURL()); } } catch (MalformedURLException ex) { ex.printStackTrace(); Index: tck/RunRules.html =================================================================== --- tck/RunRules.html (revision 1849443) +++ tck/RunRules.html (working copy) @@ -29,7 +29,7 @@

Running the JDO 3.2 Technology Compatibility Kit



-

7-March-2015

+

21-December-2018

Overview

In order to demonstrate compliance with the Java Data Objects specification, an implementation must successfully run all of the TCK @@ -50,7 +50,7 @@

You must test the IUT on all configurations that the IUT supports. This includes different hardware and operating systems, different versions of Java, and different datastores. The TCK supports Java -versions 1.5 to 1.6.

+version 1.8.

Installation

Download the jdo.3.x-src.zip or jdo.3.x-src.gz file from the distribution location. Unpack the archive file into a directory of your choice. Follow the instructions in the root level README.html file for building and running the JDO TCK. @@ -61,7 +61,7 @@

  • Maven configuration file "pom.xml" in the top level directory and subprojects. - These files must not be changed.

    + These files must not be changed with the exception of the one in tck (see below).

  • lib/ext - Copy the jar files fscontext.jar and providerutil.jar used by the JNDI tests into this directory. @@ -68,15 +68,10 @@ It is permitted to use a different JNDI implementation; see README.html for more information.

    -

  • lib/iut - this directory is where the JDO implementation - jars are installed. It is empty in the distribution. To use the - maven target runtck (required for an implementation to prove - compliance), copy the JDO implementation jar files into this - directory. Alternatively, update the build.properties file in the - TCK directory to refer to an existing location of the IUT jar - files.

  • the TCK directory, which contains:

      +

    • Maven configuration file "pom.xml". Please edit the file and add + the iut dependencies to the profile called iut.

    • assertions - contains the assertions file identifying the assertions tested by the tests. This is for reference.

    • target - this directory contains artifacts of compiling and @@ -102,14 +97,13 @@ (which is not used by the TCK).

    • java - this directory contains the source code to the TCK tests. These files must not be modified.

      -

    • conf - this directory contains the configuration - information for the test runs. The files iut-pmf.properties, - iut-jdoconfig.xml, and iut-persistence.xml in this directory - must be changed to provide properties for the IUT persistence - manager factory. The file jndi.properties may be changed - to use a different jndi provider. Other files must not be - modified, except to put a successfully challenged test case into - the trunk/tck20/test/conf/exclude.list. Please see below.

      +

    • conf - this directory contains the configuration information + for the test runs. The files iut-pmf.properties, iut-log4j.properties, + iut-jdoconfig.xml, and iut-persistence.xml in this directory must be + changed to provide properties for the IUT persistence manager factory. + The file jndi.properties may be changed to use a different jndi provider. + Other files must not be modified, except to put a successfully challenged + test case into the trunk/tck/test/conf/exclude.list. Please see below.

    Index: tck/pom.xml =================================================================== --- tck/pom.xml (revision 1849443) +++ tck/pom.xml (working copy) @@ -62,6 +62,22 @@ + + maven-dependency-plugin + 2.8 + + + generate-sources + + build-classpath + + + dependency.classpath + + + + + org.apache.jdo jdo-exectck 3.2-SNAPSHOT @@ -74,6 +90,10 @@ enhance runtck + + + ${dependency.classpath} + @@ -87,7 +107,7 @@ ${project.name} ${pom.currentVersion} - + org.apache.maven.plugins maven-deploy-plugin 2.6 @@ -106,16 +126,67 @@ iut + + + jdori true + + jdo.tck.impl + jdori + + + + org.datanucleus + datanucleus-core + 5.2.0-m2 + + + org.datanucleus + datanucleus-rdbms + 5.2.0-m2 + + + org.datanucleus + datanucleus-api-jdo + 5.2.0-m3-SNAPSHOT + + + org.datanucleus + datanucleus-jdo-query + 5.0.8 + + + org.datanucleus + datanucleus-api-jpa + 5.2.0-m2 + + + log4j + log4j + 1.2.16 + + + + + DataNucleus Nightly + http://www.datanucleus.org/downloads/maven2-nightly + + false + + + true + + + - + javax.jdo jdo-api @@ -124,24 +195,14 @@ junit - org.datanucleus - datanucleus-api-jdo - 5.2.0-m3-SNAPSHOT + commons-logging + commons-logging - org.datanucleus - datanucleus-jdo-query - 5.0.8 + javax.transaction + javax.transaction-api - commons-logging - commons-logging - - - javax.transaction - javax.transaction-api - - org.springframework spring-core @@ -186,4 +247,5 @@ + Index: tck/src/main/resources/conf/iut-jdoconfig.xml =================================================================== --- tck/src/main/resources/conf/iut-jdoconfig.xml (revision 1849443) +++ tck/src/main/resources/conf/iut-jdoconfig.xml (working copy) @@ -37,17 +37,15 @@ - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + - - /> @@ -213,17 +201,15 @@ - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + - - @@ -89,17 +87,15 @@ - - - - - - - + + + + + + + - - Index: tck/src/main/resources/conf/iut-pmf.properties =================================================================== --- tck/src/main/resources/conf/iut-pmf.properties (revision 1849443) +++ tck/src/main/resources/conf/iut-pmf.properties (working copy) @@ -30,18 +30,16 @@ javax.jdo.option.RetainValues=false javax.jdo.option.RestoreValues=false -datanucleus.metadata.validate=false -datanucleus.validateTables=false -datanucleus.validateConstraints=false -datanucleus.autoCreateSchema=false -datanucleus.autoCreateTables=false -datanucleus.autoCreateConstraints=false -datanucleus.autoCreateColumns=false +datanucleus.metadata.xml.validate=false +datanucleus.schema.validateTables=false +datanucleus.schema.validateConstraints=false +datanucleus.schema.autoCreateAll=false +datanucleus.schema.autoCreateTables=false +datanucleus.schema.autoCreateConstraints=false +datanucleus.schema.autoCreateColumns=false +datanucleus.autoStartMechanism=None +datanucleus.transaction.nontx.atomic=false + +datanucleus.connectionPool.maxStatements=20 datanucleus.rdbms.CheckExistTablesOrViews=false -datanucleus.autoStartMechanism=None -#datanucleus.initializePrimaryKeyColumnInfo=true -#datanucleus.connectionPoolingType=DBCP -datanucleus.connectionPoolingType=C3P0 -#datanucleus.connectionPool.maxStatements=20 -datanucleus.implementationCreatorName=asm datanucleus.rdbms.omitDatabaseMetaDataGetColumns=true Index: tck/src/main/resources/conf/jdori-log4j.properties =================================================================== Index: tck/src/main/resources/conf/log4j.properties =================================================================== --- tck/src/main/resources/conf/log4j.properties (revision 1849443) +++ tck/src/main/resources/conf/log4j.properties (nonexistent) @@ -1,93 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -############################# -# TCK loggers and appenders -############################# - -# Root logger -log4j.rootLogger = ERROR, TCK - -# TCK logger -log4j.logger.org.apache.jdo.tck = INFO, TCK -log4j.additivity.org.apache.jdo.tck = false - -# SpringFramework loggers -log4j.logger.org.springframework = ERROR, TCK -log4j.additivity.org.springframework = false -log4j.logger.org.apache.jdo.tck.pc.company.CompanyModelReader = ERROR, TCK -log4j.logger.org.apache.jdo.tck.pc.mylib.MylibReader = ERROR, TCK - -# TCK appenders -log4j.appender.TCK = org.apache.jdo.tck.util.TCKFileAppender -log4j.appender.TCK.File = tck.txt -log4j.appender.TCK.layout = org.apache.log4j.PatternLayout -log4j.appender.TCK.layout.ConversionPattern = %d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n - -############################################ -# JDO vendor specific loggers and appenders -############################################ - -#log4j.logger. = INFO -#log4j.additivity. = false - -#log4j.appender. = org.apache.jdo.tck.util.TCKFileAppender -#log4j.appender..File = .txt -#log4j.appender..layout = org.apache.log4j.PatternLayout -#log4j.appender..layout.ConversionPattern = %d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n - -################################### -# DataNucleus loggers and appenders -################################### - -# DataNucleus loggers -# For more details on DataNucleus logging see -# http://www.datanucleus.org/products/accessplatform/logging.html -log4j.logger.DataNucleus = INFO, DataNucleus -log4j.logger.DataNucleus.Enhancer = INFO, DataNucleus -log4j.additivity.DataNucleus = false -#log4j.logger.DataNucleus.JDO = INFO, DataNucleus -#log4j.logger.DataNucleus.Persistence = INFO, DataNucleus -#log4j.logger.DataNucleus.Query = INFO, DataNucleus -#log4j.logger.DataNucleus.Lifecycle = INFO, DataNucleus -#log4j.logger.DataNucleus.Reachability = INFO, DataNucleus -#log4j.logger.DataNucleus.Cache = INFO, DataNucleus -#log4j.logger.DataNucleus.ClassLoading = INFO, DataNucleus -#log4j.logger.DataNucleus.MetaData = DEBUG, DataNucleus -#log4j.logger.DataNucleus.Management = DEBUG, DataNucleus -#log4j.logger.DataNucleus.General = DEBUG, DataNucleus -#log4j.logger.DataNucleus.Connection = DEBUG, DataNucleus -#log4j.logger.DataNucleus.JCA = DEBUG, DataNucleus -#log4j.logger.DataNucleus.Transaction = INFO, DataNucleus -#log4j.logger.DataNucleus.Plugin = INFO, DataNucleus -#log4j.logger.DataNucleus.Store.Poid = INFO, DataNucleus -#log4j.logger.DataNucleus.Datastore = DEBUG, DataNucleus -#log4j.logger.DataNucleus.Datastore.Schema = INFO, DataNucleus -#log4j.logger.DataNucleus.Datastore.Persist = INFO, DataNucleus -#log4j.logger.DataNucleus.Datastore.Retrieve = DEBUG, DataNucleus -#log4j.logger.DataNucleus.SchemaTool = INFO, DataNucleus - -# C3P0 loggers -log4j.logger.com.mchange.v2 = INFO, DataNucleus -log4j.additivity.com.mchange.v2 = false - -# DataNucleus appenders -log4j.appender.DataNucleus = org.apache.jdo.tck.util.TCKFileAppender -#log4j.appender.DataNucleus = org.apache.log4j.FileAppender -log4j.appender.DataNucleus.Enhancer.File = datanucleus.txt -log4j.appender.DataNucleus.File = datanucleus.txt -log4j.appender.DataNucleus.layout = org.apache.log4j.PatternLayout -log4j.appender.DataNucleus.layout.ConversionPattern = %d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n Property changes on: tck/src/main/resources/conf/log4j.properties ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: copyjdorijars/pom.xml =================================================================== --- copyjdorijars/pom.xml (revision 1849443) +++ copyjdorijars/pom.xml (nonexistent) @@ -1,138 +0,0 @@ - - - - - - - org.apache.jdo - parent-pom - 3.2-SNAPSHOT - ../parent-pom - - - 4.0.0 - org.apache.jdo - copy-jdori-jars - JDO RI Jar Copy - 3.2-SNAPSHOT - The Java Data Objects (JDO) API is a standard interface-based Java model abstraction of persistence, developed as Java Specification Request 243 under the auspices of the Java Community Process. - - - scm:svn:http://svn.apache.org/repos/asf/db/jdo/trunk - scm:svn:https://svn.apache.org/repos/asf/db/jdo/trunk - http://svn.apache.org/viewvc/db/jdo - - - - src/main - - - ${basedir}/src/main/resources - ${basedir}/../lib/jdori - - - - - maven-clean-plugin - 2.5 - - - - ${basedir}/../lib/jdori - - * - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - package - - copy-dependencies - - - ${basedir}/../lib/jdori - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.6 - - true - - - - - - - - org.datanucleus - datanucleus-core - 5.2.0-m2 - - - org.datanucleus - datanucleus-rdbms - 5.2.0-m2 - - - org.datanucleus - datanucleus-api-jdo - 5.2.0-m3-SNAPSHOT - - - org.datanucleus - datanucleus-jdo-query - 5.0.8 - - - org.datanucleus - datanucleus-api-jpa - 5.2.0-m2 - - - log4j - log4j - 1.2.16 - - - - - - DataNucleus Nightly - http://www.datanucleus.org/downloads/maven2-nightly - - false - - - true - - - - - Index: copyjdorijars/src/main/resources/log4j.properties =================================================================== --- copyjdorijars/src/main/resources/log4j.properties (revision 1849443) +++ copyjdorijars/src/main/resources/log4j.properties (nonexistent) @@ -1,93 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -############################# -# TCK loggers and appenders -############################# - -# Root logger -log4j.rootLogger = ERROR, TCK - -# TCK logger -log4j.logger.org.apache.jdo.tck = INFO, TCK -log4j.additivity.org.apache.jdo.tck = false - -# SpringFramework loggers -log4j.logger.org.springframework = ERROR, TCK -log4j.additivity.org.springframework = false -log4j.logger.org.apache.jdo.tck.pc.company.CompanyModelReader = ERROR, TCK -log4j.logger.org.apache.jdo.tck.pc.mylib.MylibReader = ERROR, TCK - -# TCK appenders -log4j.appender.TCK = org.apache.jdo.tck.util.TCKFileAppender -log4j.appender.TCK.File = tck.txt -log4j.appender.TCK.layout = org.apache.log4j.PatternLayout -log4j.appender.TCK.layout.ConversionPattern = %d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n - -############################################ -# JDO vendor specific loggers and appenders -############################################ - -#log4j.logger. = INFO -#log4j.additivity. = false - -#log4j.appender. = org.apache.jdo.tck.util.TCKFileAppender -#log4j.appender..File = .txt -#log4j.appender..layout = org.apache.log4j.PatternLayout -#log4j.appender..layout.ConversionPattern = %d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n - -################################### -# DataNucleus loggers and appenders -################################### - -# DataNucleus loggers -# For more details on DataNucleus logging see -# http://www.datanucleus.org/products/accessplatform/logging.html -log4j.logger.DataNucleus = INFO, DataNucleus -log4j.logger.DataNucleus.Enhancer = INFO, DataNucleus -log4j.additivity.DataNucleus = false -#log4j.logger.DataNucleus.JDO = INFO, DataNucleus -#log4j.logger.DataNucleus.Persistence = INFO, DataNucleus -#log4j.logger.DataNucleus.Query = INFO, DataNucleus -#log4j.logger.DataNucleus.Lifecycle = INFO, DataNucleus -#log4j.logger.DataNucleus.Reachability = INFO, DataNucleus -#log4j.logger.DataNucleus.Cache = INFO, DataNucleus -#log4j.logger.DataNucleus.ClassLoading = INFO, DataNucleus -#log4j.logger.DataNucleus.MetaData = DEBUG, DataNucleus -#log4j.logger.DataNucleus.Management = DEBUG, DataNucleus -#log4j.logger.DataNucleus.General = DEBUG, DataNucleus -#log4j.logger.DataNucleus.Connection = DEBUG, DataNucleus -#log4j.logger.DataNucleus.JCA = DEBUG, DataNucleus -#log4j.logger.DataNucleus.Transaction = INFO, DataNucleus -#log4j.logger.DataNucleus.Plugin = INFO, DataNucleus -#log4j.logger.DataNucleus.Store.Poid = INFO, DataNucleus -#log4j.logger.DataNucleus.Datastore = DEBUG, DataNucleus -#log4j.logger.DataNucleus.Datastore.Schema = INFO, DataNucleus -#log4j.logger.DataNucleus.Datastore.Persist = INFO, DataNucleus -#log4j.logger.DataNucleus.Datastore.Retrieve = DEBUG, DataNucleus -#log4j.logger.DataNucleus.SchemaTool = INFO, DataNucleus - -# C3P0 loggers -log4j.logger.com.mchange.v2 = INFO, DataNucleus -log4j.additivity.com.mchange.v2 = false - -# DataNucleus appenders -log4j.appender.DataNucleus = org.apache.jdo.tck.util.TCKFileAppender -#log4j.appender.DataNucleus = org.apache.log4j.FileAppender -log4j.appender.DataNucleus.Enhancer.File = datanucleus.txt -log4j.appender.DataNucleus.File = datanucleus.txt -log4j.appender.DataNucleus.layout = org.apache.log4j.PatternLayout -log4j.appender.DataNucleus.layout.ConversionPattern = %d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n Index: lib/iut/iut-jdoconfig.xml =================================================================== --- lib/iut/iut-jdoconfig.xml (revision 1849443) +++ lib/iut/iut-jdoconfig.xml (nonexistent) @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /> - - - - - - - - - - - - - - - - - - - - - - - - - Property changes on: lib/iut/iut-jdoconfig.xml ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -LF \ No newline at end of property Index: lib/iut/iut-log4j.properties =================================================================== --- lib/iut/iut-log4j.properties (revision 1849443) +++ lib/iut/iut-log4j.properties (nonexistent) @@ -1,93 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -############################# -# TCK loggers and appenders -############################# - -# Root logger -log4j.rootLogger = ERROR, TCK - -# TCK logger -log4j.logger.org.apache.jdo.tck = INFO, TCK -log4j.additivity.org.apache.jdo.tck = false - -# SpringFramework loggers -log4j.logger.org.springframework = ERROR, TCK -log4j.additivity.org.springframework = false -log4j.logger.org.apache.jdo.tck.pc.company.CompanyModelReader = ERROR, TCK -log4j.logger.org.apache.jdo.tck.pc.mylib.MylibReader = ERROR, TCK - -# TCK appenders -#log4j.appender.TCK = org.apache.jdo.tck.util.TCKFileAppender -#log4j.appender.TCK.File = tck.txt -#log4j.appender.TCK.layout = org.apache.log4j.PatternLayout -#log4j.appender.TCK.layout.ConversionPattern = %d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n - -############################################ -# JDO vendor specific loggers and appenders -############################################ - -#log4j.logger. = INFO -#log4j.additivity. = false - -#log4j.appender. = org.apache.jdo.tck.util.TCKFileAppender -#log4j.appender..File = .txt -#log4j.appender..layout = org.apache.log4j.PatternLayout -#log4j.appender..layout.ConversionPattern = %d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n - -################################### -# DataNucleus loggers and appenders -################################### - -# DataNucleus loggers -# For more details on DataNucleus logging see -# http://www.datanucleus.org/products/accessplatform/logging.html -log4j.logger.DataNucleus = INFO, DataNucleus -log4j.logger.DataNucleus.Enhancer = INFO, DataNucleus -log4j.additivity.DataNucleus = false -#log4j.logger.DataNucleus.JDO = INFO, DataNucleus -#log4j.logger.DataNucleus.Persistence = INFO, DataNucleus -#log4j.logger.DataNucleus.Query = INFO, DataNucleus -#log4j.logger.DataNucleus.Lifecycle = INFO, DataNucleus -#log4j.logger.DataNucleus.Reachability = INFO, DataNucleus -#log4j.logger.DataNucleus.Cache = INFO, DataNucleus -#log4j.logger.DataNucleus.ClassLoading = INFO, DataNucleus -#log4j.logger.DataNucleus.MetaData = DEBUG, DataNucleus -#log4j.logger.DataNucleus.Management = DEBUG, DataNucleus -#log4j.logger.DataNucleus.General = DEBUG, DataNucleus -#log4j.logger.DataNucleus.Connection = DEBUG, DataNucleus -#log4j.logger.DataNucleus.JCA = DEBUG, DataNucleus -#log4j.logger.DataNucleus.Transaction = INFO, DataNucleus -#log4j.logger.DataNucleus.Plugin = INFO, DataNucleus -#log4j.logger.DataNucleus.Store.Poid = INFO, DataNucleus -#log4j.logger.DataNucleus.Datastore = DEBUG, DataNucleus -#log4j.logger.DataNucleus.Datastore.Schema = INFO, DataNucleus -#log4j.logger.DataNucleus.Datastore.Persist = INFO, DataNucleus -#log4j.logger.DataNucleus.Datastore.Retrieve = DEBUG, DataNucleus -#log4j.logger.DataNucleus.SchemaTool = INFO, DataNucleus - -# C3P0 loggers -log4j.logger.com.mchange.v2 = INFO, DataNucleus -log4j.additivity.com.mchange.v2 = false - -# DataNucleus appenders -#log4j.appender.DataNucleus = org.apache.jdo.tck.util.TCKFileAppender -log4j.appender.DataNucleus = org.apache.log4j.FileAppender -log4j.appender.DataNucleus.Enhancer.File = datanucleus.txt -log4j.appender.DataNucleus.File = datanucleus.txt -log4j.appender.DataNucleus.layout = org.apache.log4j.PatternLayout -log4j.appender.DataNucleus.layout.ConversionPattern = %d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n Index: lib/iut/iut-persistence.xml =================================================================== --- lib/iut/iut-persistence.xml (revision 1849443) +++ lib/iut/iut-persistence.xml (nonexistent) @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - relations.Deity - - - - - - - Property changes on: lib/iut/iut-persistence.xml ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -LF \ No newline at end of property Index: lib/iut/iut-pmf.properties =================================================================== --- lib/iut/iut-pmf.properties (revision 1849443) +++ lib/iut/iut-pmf.properties (nonexistent) @@ -1,47 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# ------------------------------------------------------------------- -# P R O J E C T P R O P E R T I E S -# ------------------------------------------------------------------- -# -# IUT PMF Properties -# Edit these properties for the Implementation Under Test -javax.jdo.PersistenceManagerFactoryClass=org.datanucleus.api.jdo.JDOPersistenceManagerFactory -javax.jdo.option.ConnectionDriverName=org.apache.derby.jdbc.EmbeddedDriver -javax.jdo.option.ConnectionURL=jdbc:derby:jdotckdb -javax.jdo.option.ConnectionUserName=tckuser -javax.jdo.option.ConnectionPassword=tckuser -javax.jdo.option.Optimistic=false -javax.jdo.option.NontransactionalWrite=false -javax.jdo.option.NontransactionalRead=false -javax.jdo.option.RetainValues=false -javax.jdo.option.RestoreValues=false - -datanucleus.metadata.validate=false -datanucleus.validateTables=false -datanucleus.validateConstraints=false -datanucleus.autoCreateSchema=false -datanucleus.autoCreateTables=false -datanucleus.autoCreateConstraints=false -datanucleus.autoCreateColumns=false -datanucleus.rdbms.CheckExistTablesOrViews=false -datanucleus.autoStartMechanism=None -#datanucleus.initializePrimaryKeyColumnInfo=true -#datanucleus.connectionPoolingType=DBCP -datanucleus.connectionPoolingType=C3P0 -#datanucleus.connectionPool.maxStatements=20 -datanucleus.implementationCreatorName=asm -datanucleus.rdbms.omitDatabaseMetaDataGetColumns=true Property changes on: lib/iut/iut-pmf.properties ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: lib/iut =================================================================== --- lib/iut (revision 1849443) +++ lib/iut (nonexistent) Property changes on: lib/iut ___________________________________________________________________ Deleted: svn:ignore ## -1,5 +0,0 ## -.project -.classpath -.settings -.externalToolBuilders -target Index: lib/jdori/README.txt =================================================================== --- lib/jdori/README.txt (revision 1849443) +++ lib/jdori/README.txt (nonexistent) @@ -1,3 +0,0 @@ -This directory is added to the classpath when running the JDO TCK. -It contains libraries that are not distributed as part of JDO. - Property changes on: lib/jdori/README.txt ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -LF \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property