You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2006/03/11 21:58:00 UTC
svn commit: r385167 - in /db/jdo/trunk/tck20/src: conf/
java/org/apache/jdo/tck/pc/company/
Author: mbo
Date: Sat Mar 11 12:57:58 2006
New Revision: 385167
URL: http://svn.apache.org/viewcvs?rev=385167&view=rev
Log:
Fix completeness test failues due to missing property jdo.tck.mapping.companyfactory
Modified:
db/jdo/trunk/tck20/src/conf/company1-1Relationships.conf
db/jdo/trunk/tck20/src/conf/company1-MRelationships.conf
db/jdo/trunk/tck20/src/conf/companyAllRelationships.conf
db/jdo/trunk/tck20/src/conf/companyEmbedded.conf
db/jdo/trunk/tck20/src/conf/companyM-MRelationships.conf
db/jdo/trunk/tck20/src/conf/companyNoRelationships.conf
db/jdo/trunk/tck20/src/conf/detach.conf
db/jdo/trunk/tck20/src/conf/enhancement.conf
db/jdo/trunk/tck20/src/conf/extents.conf
db/jdo/trunk/tck20/src/conf/fetchplan.conf
db/jdo/trunk/tck20/src/conf/inheritance1.conf
db/jdo/trunk/tck20/src/conf/inheritance2.conf
db/jdo/trunk/tck20/src/conf/inheritance3.conf
db/jdo/trunk/tck20/src/conf/inheritance4.conf
db/jdo/trunk/tck20/src/conf/instancecallbacks.conf
db/jdo/trunk/tck20/src/conf/jdohelper.conf
db/jdo/trunk/tck20/src/conf/jdoql.conf
db/jdo/trunk/tck20/src/conf/lifecycle.conf
db/jdo/trunk/tck20/src/conf/models.conf
db/jdo/trunk/tck20/src/conf/pm.conf
db/jdo/trunk/tck20/src/conf/pmf.conf
db/jdo/trunk/tck20/src/conf/query.conf
db/jdo/trunk/tck20/src/conf/schemaAttributeClass.conf
db/jdo/trunk/tck20/src/conf/schemaAttributeOrm.conf
db/jdo/trunk/tck20/src/conf/schemaAttributePackage.conf
db/jdo/trunk/tck20/src/conf/transactions.conf
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryRegistry.java
Modified: db/jdo/trunk/tck20/src/conf/company1-1Relationships.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/company1-1Relationships.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/company1-1Relationships.conf (original)
+++ db/jdo/trunk/tck20/src/conf/company1-1Relationships.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
jdo.tck.description = Completeness test with standard mapping, basic testdata with 1-1 relationships.
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
jdo.tck.testdata = org/apache/jdo/tck/pc/company/company1-1Relationships.xml
jdo.tck.mapping = 0
Modified: db/jdo/trunk/tck20/src/conf/company1-MRelationships.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/company1-MRelationships.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/company1-MRelationships.conf (original)
+++ db/jdo/trunk/tck20/src/conf/company1-MRelationships.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
jdo.tck.description = Completeness test with standard mapping, basic testdata with 1-M relationships.
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
jdo.tck.testdata = org/apache/jdo/tck/pc/company/company1-MRelationships.xml
jdo.tck.mapping = 0
Modified: db/jdo/trunk/tck20/src/conf/companyAllRelationships.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/companyAllRelationships.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/companyAllRelationships.conf (original)
+++ db/jdo/trunk/tck20/src/conf/companyAllRelationships.conf Sat Mar 11 12:57:58 2006
@@ -1,5 +1,6 @@
jdo.tck.description = Completeness test with standard mapping, basic testdata with all relationships \
and embedded objects.
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyAllRelationships.xml
jdo.tck.mapping = 0
Modified: db/jdo/trunk/tck20/src/conf/companyEmbedded.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/companyEmbedded.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/companyEmbedded.conf (original)
+++ db/jdo/trunk/tck20/src/conf/companyEmbedded.conf Sat Mar 11 12:57:58 2006
@@ -1,5 +1,6 @@
jdo.tck.description = Completeness test with standard mapping, basic testdata with no relationships \
and embedded objects.
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyEmbedded.xml
jdo.tck.mapping = 0
Modified: db/jdo/trunk/tck20/src/conf/companyM-MRelationships.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/companyM-MRelationships.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/companyM-MRelationships.conf (original)
+++ db/jdo/trunk/tck20/src/conf/companyM-MRelationships.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
jdo.tck.description = Completeness test with standard mapping, basic testdata with M-M relationships.
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyM-MRelationships.xml
jdo.tck.mapping = 0
Modified: db/jdo/trunk/tck20/src/conf/companyNoRelationships.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/companyNoRelationships.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/companyNoRelationships.conf (original)
+++ db/jdo/trunk/tck20/src/conf/companyNoRelationships.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
jdo.tck.description = Completeness test with standard mapping, basic testdata with no relationships.
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyNoRelationships.xml
jdo.tck.mapping = 0
Modified: db/jdo/trunk/tck20/src/conf/detach.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/detach.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/detach.conf (original)
+++ db/jdo/trunk/tck20/src/conf/detach.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
jdo.tck.description = Detachment tests with standard mapping, no testdata.
+jdo.tck.mapping.companyfactory =
jdo.tck.testdata =
jdo.tck.standarddata =
jdo.tck.mapping = 8
Modified: db/jdo/trunk/tck20/src/conf/enhancement.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/enhancement.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/enhancement.conf (original)
+++ db/jdo/trunk/tck20/src/conf/enhancement.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
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
Modified: db/jdo/trunk/tck20/src/conf/extents.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/extents.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/extents.conf (original)
+++ db/jdo/trunk/tck20/src/conf/extents.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
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
Modified: db/jdo/trunk/tck20/src/conf/fetchplan.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/fetchplan.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/fetchplan.conf (original)
+++ db/jdo/trunk/tck20/src/conf/fetchplan.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
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
Modified: db/jdo/trunk/tck20/src/conf/inheritance1.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/inheritance1.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/inheritance1.conf (original)
+++ db/jdo/trunk/tck20/src/conf/inheritance1.conf Sat Mar 11 12:57:58 2006
@@ -2,6 +2,7 @@
Separate table for each class in the inheritance hierarchy. \
Each table contains columns for the declared fields. \
Inheritance strategy: new-table for all classes.
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyAllRelationships.xml
jdo.tck.mapping = 1
Modified: db/jdo/trunk/tck20/src/conf/inheritance2.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/inheritance2.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/inheritance2.conf (original)
+++ db/jdo/trunk/tck20/src/conf/inheritance2.conf Sat Mar 11 12:57:58 2006
@@ -9,6 +9,7 @@
Separate phone number type tables for persons, fulltime employees, \
and parttime employees. \
Inheritance strategy: new-table for all classes.
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyAllRelationships.xml
jdo.tck.mapping = 2
Modified: db/jdo/trunk/tck20/src/conf/inheritance3.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/inheritance3.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/inheritance3.conf (original)
+++ db/jdo/trunk/tck20/src/conf/inheritance3.conf Sat Mar 11 12:57:58 2006
@@ -4,6 +4,7 @@
PartTimeEmployee and FullTimeEmployee has inheritance strategy "new-table". \
Insurance has inheritance strategy "subclass-table". \
MedicalInsurance and DentalInsurance have inheritance strategy "new-table".
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyAllRelationships.xml
jdo.tck.mapping = 3
Modified: db/jdo/trunk/tck20/src/conf/inheritance4.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/inheritance4.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/inheritance4.conf (original)
+++ db/jdo/trunk/tck20/src/conf/inheritance4.conf Sat Mar 11 12:57:58 2006
@@ -2,6 +2,7 @@
Person, Employee, and Insurance have inheritance strategy "new-table". \
PartTimeEmployee, FullTimeEmployee, MedicalInsurance, and DentalInsurance \
have inheritance strategy "superclass-table".
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyAllRelationships.xml
jdo.tck.mapping = 4
Modified: db/jdo/trunk/tck20/src/conf/instancecallbacks.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/instancecallbacks.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/instancecallbacks.conf (original)
+++ db/jdo/trunk/tck20/src/conf/instancecallbacks.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
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
Modified: db/jdo/trunk/tck20/src/conf/jdohelper.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/jdohelper.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/jdohelper.conf (original)
+++ db/jdo/trunk/tck20/src/conf/jdohelper.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
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
Modified: db/jdo/trunk/tck20/src/conf/jdoql.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/jdoql.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/jdoql.conf (original)
+++ db/jdo/trunk/tck20/src/conf/jdoql.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
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
Modified: db/jdo/trunk/tck20/src/conf/lifecycle.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/lifecycle.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/lifecycle.conf (original)
+++ db/jdo/trunk/tck20/src/conf/lifecycle.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
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
Modified: db/jdo/trunk/tck20/src/conf/models.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/models.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/models.conf (original)
+++ db/jdo/trunk/tck20/src/conf/models.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
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
Modified: db/jdo/trunk/tck20/src/conf/pm.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/pm.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/pm.conf (original)
+++ db/jdo/trunk/tck20/src/conf/pm.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
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
Modified: db/jdo/trunk/tck20/src/conf/pmf.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/pmf.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/pmf.conf (original)
+++ db/jdo/trunk/tck20/src/conf/pmf.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
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
Modified: db/jdo/trunk/tck20/src/conf/query.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/query.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/query.conf (original)
+++ db/jdo/trunk/tck20/src/conf/query.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
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
Modified: db/jdo/trunk/tck20/src/conf/schemaAttributeClass.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/schemaAttributeClass.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/schemaAttributeClass.conf (original)
+++ db/jdo/trunk/tck20/src/conf/schemaAttributeClass.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
jdo.tck.description = MakePersistent test with schema name specified as class attribute in orm for PCPoint. Schema name derived from jdo.tck.mapping 1 is overriden in orm
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistent
jdo.tck.testdata =
jdo.tck.mapping = 7
Modified: db/jdo/trunk/tck20/src/conf/schemaAttributeOrm.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/schemaAttributeOrm.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/schemaAttributeOrm.conf (original)
+++ db/jdo/trunk/tck20/src/conf/schemaAttributeOrm.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
jdo.tck.description = MakePersistent test with schema name specified as orm attribute in orm for PCPoint. Schema name derived from jdo.tck.mapping 1 is overriden in orm
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistent
jdo.tck.testdata =
jdo.tck.mapping = 5
Modified: db/jdo/trunk/tck20/src/conf/schemaAttributePackage.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/schemaAttributePackage.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/schemaAttributePackage.conf (original)
+++ db/jdo/trunk/tck20/src/conf/schemaAttributePackage.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
jdo.tck.description = MakePersistent test with schema name specified as package attribute in orm for PCPoint. Schema name derived from jdo.tck.mapping 1 is overriden in orm
+jdo.tck.mapping.companyfactory =
jdo.tck.classes = org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistent
jdo.tck.testdata =
jdo.tck.mapping = 6
Modified: db/jdo/trunk/tck20/src/conf/transactions.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/conf/transactions.conf?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/conf/transactions.conf (original)
+++ db/jdo/trunk/tck20/src/conf/transactions.conf Sat Mar 11 12:57:58 2006
@@ -1,4 +1,5 @@
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
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryRegistry.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryRegistry.java?rev=385167&r1=385166&r2=385167&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryRegistry.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryRegistry.java Sat Mar 11 12:57:58 2006
@@ -54,8 +54,14 @@
/**
* The default factory class name
*/
- final static String FACTORY_CLASS_NAME =
- System.getProperty(FACTORY_PROPERTY_NAME, DEFAULT_FACTORY_CLASS_NAME);
+ final static String FACTORY_CLASS_NAME;
+
+ static {
+ String prop = System.getProperty(FACTORY_PROPERTY_NAME);
+ if ((prop == null) || (prop.length() == 0))
+ prop = DEFAULT_FACTORY_CLASS_NAME;
+ FACTORY_CLASS_NAME = prop;
+ }
/**
* This is the default company factory singleton. This is statically