Clean up README.md

README.md

@@ -144,14 +144,9 @@ The *jdo-exectck* Maven plugin has the following options
 
 ### Examples
 
-Example 1 : Installs the database schema for datastore identity for all supported databases.
+This example runs the test configurations specified in `alltests.conf` and `cfg1.conf` on the JDORI, using all supported identity types and databases.
 
-    mvn -Djdo.tck.identitytypes=datastoreidentity jdo-exectck:installSchema
-
-
-Example 2 : Runs the test configurations specified in `alltests.conf` and `cfg1.conf` on the JDORI, using all supported identity types and databases.
-
-    mvn -Djdo.tck.cfglist="alltests.conf cfg1.conf" jdo-exectck:runtck
+    mvn -Djdo.tck.cfglist="alltests.conf cfg1.conf" install
 
 
 
@@ -164,7 +159,6 @@ While running the TCK, maven uses the following configuration files in src/conf:
     * jdo.tck.testdescription : An optional string describing the purpose of these tests
     * jdo.tck.classes : A list of one or more test classes (required)
     * jdo.tck.testdata : The fully qualified file name of the xml test data file(optional)
-    * jdo.tck.standarddata : The fully qualified file name of the xml test data file(optional)
     * jdo.tck.mapping : The file designator that maven.xml uses to build a javax.jdo.option.Mapping value and corresponding schema name (required)
 * exclude.list  : A list of test classes NOT to execute during a TCK test run
 

exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java

@@ -461,8 +461,6 @@ private List<String> getCfgProps(
     List<String> cfgPropsString = new ArrayList<>();
     cfgPropsString.addAll(idPropsString);
     cfgPropsString.add("-Djdo.tck.testdata=" + getTrimmedPropertyValue(props, "jdo.tck.testdata"));
-    cfgPropsString.add(
-        "-Djdo.tck.standarddata=" + getTrimmedPropertyValue(props, "jdo.tck.standarddata"));
     cfgPropsString.add(
         "-Djdo.tck.mapping.companyfactory="
             + getTrimmedPropertyValue(props, "jdo.tck.mapping.companyfactory"));

tck/src/main/resources/conf/cancel.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All query tests with standard mapping, no testdata.
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata =
-jdo.tck.standarddata =
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/companyListWithoutJoin.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = Completeness test with companyListWithoutJoin model. 
 jdo.tck.mapping.companyfactory = org.apache.jdo.tck.pc.companyListWithoutJoin.CompanyFactoryPMClass
 jdo.tck.testdata =  org/apache/jdo/tck/pc/companyListWithoutJoin/companyListWithoutJoin.xml
-jdo.tck.standarddata = 
 jdo.tck.mapping = 10
 jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTestList
 jdo.tck.requiredOptions =

tck/src/main/resources/conf/companyMapWithoutJoin.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = Completeness test with companyMapWithoutJoin model. 
 jdo.tck.mapping.companyfactory = org.apache.jdo.tck.pc.companyMapWithoutJoin.CompanyFactoryPMClass
 jdo.tck.testdata =  org/apache/jdo/tck/pc/companyMapWithoutJoin/companyMapWithoutJoin.xml
-jdo.tck.standarddata = 
 jdo.tck.mapping = 9
 jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTestMap
 jdo.tck.requiredOptions =

tck/src/main/resources/conf/converter.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = Converter test, standard mapping, no testdata.
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata =
-jdo.tck.standarddata =
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/detach.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = Detachment tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 8
 jdo.tck.classes = \
     org.apache.jdo.tck.api.jdohelper.IsDetached \

tck/src/main/resources/conf/embeddedInheritance.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = Detachment tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 12
 jdo.tck.classes = \
     org.apache.jdo.tck.models.embedded.EmbeddedInheritance

tck/src/main/resources/conf/enhancement.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All enhancement, persistencecapable tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/extents.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All extent tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/fetchgroup.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = FetchGroup test.
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/fetchplan.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All pm tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/instancecallbacks.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All instancecallback tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/jdohelper.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All jdohelper tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/jdoql.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All jdoql tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/jdoql1.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = Special jdoql test with mapping 1 which maps Enums to integer columns
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 1
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/lifecycle.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All lifecycle tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/models.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All model tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/models1.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All model tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 1
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/pm.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All pm tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/pmf.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All pmf tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/query.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All query tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/runonce.conf

@@ -15,7 +15,6 @@
 
 jdo.tck.description = Verification of the JDO API classes and interfaces
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 # The runOnce flag must only be set in this configuration and no others

tck/src/main/resources/conf/security.conf

@@ -17,7 +17,6 @@ jdo.tck.security = true
 jdo.tck.description = All pmf tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \

tck/src/main/resources/conf/transactions.conf

@@ -16,7 +16,6 @@
 jdo.tck.description = All transaction tests with standard mapping, no testdata. 
 jdo.tck.mapping.companyfactory =
 jdo.tck.testdata = 
-jdo.tck.standarddata = 
 jdo.tck.mapping = 0
 jdo.tck.requiredOptions =
 jdo.tck.classes = \