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 mc...@apache.org on 2007/08/14 19:16:10 UTC
svn commit: r565841 [1/4] - in /db/jdo/trunk/tck2: ./ src/conf/
src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/
Author: mcaisse
Date: Tue Aug 14 10:16:06 2007
New Revision: 565841
URL: http://svn.apache.org/viewvc?view=rev&rev=565841
Log: (empty)
Added:
db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsFCConcrete.conf
db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPCConcrete.conf
db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPCPM.conf
db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPIPM.conf
db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsFCConcrete.conf
db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsPCConcrete.conf
db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsPCPM.conf
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java (with props)
db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.java (with props)
Modified:
db/jdo/trunk/tck2/project.properties
db/jdo/trunk/tck2/src/conf/configurations.list
Modified: db/jdo/trunk/tck2/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.properties?view=diff&rev=565841&r1=565840&r2=565841
==============================================================================
--- db/jdo/trunk/tck2/project.properties (original)
+++ db/jdo/trunk/tck2/project.properties Tue Aug 14 10:16:06 2007
@@ -131,6 +131,17 @@
org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMedicalInsurance.java \
org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPartTimeEmployee.java \
org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.java \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java \
@@ -153,6 +164,17 @@
org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.java \
org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java \
org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.java \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.java \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java \
@@ -324,6 +346,17 @@
org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMedicalInsurance.class \
org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPartTimeEmployee.class \
org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.class \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.class \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.class \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.class \
@@ -346,6 +379,17 @@
org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.class \
org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.class \
org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.class \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.class \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.class \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.class \
@@ -591,9 +635,6 @@
org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.class \
org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.class \
org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.class \
-
-#Add these when jpox support is ready:
- org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.class \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.class \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.class \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.class \
@@ -615,4 +656,31 @@
org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.class \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPartTimeEmployee.class \
org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.class \
+
+
+
+# These classes fail enhancement:
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.class \
+ org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.class \
+
Added: db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsFCConcrete.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsFCConcrete.conf?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsFCConcrete.conf (added)
+++ db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsFCConcrete.conf Tue Aug 14 10:16:06 2007
@@ -0,0 +1,22 @@
+# 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.
+
+jdo.tck.description = Completeness test with standard mapping, basic testdata with all relationships \
+and embedded objects, annotations.
+jdo.tck.mapping.companyfactory = org.apache.jdo.tck.pc.companyAnnotatedFC.CompanyFactoryAnnotatedFCConcreteDelegator
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyAllRelationships.xml
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
Added: db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPCConcrete.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPCConcrete.conf?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPCConcrete.conf (added)
+++ db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPCConcrete.conf Tue Aug 14 10:16:06 2007
@@ -0,0 +1,22 @@
+# 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.
+
+jdo.tck.description = Completeness test with standard mapping, basic testdata with all relationships \
+and embedded objects, annotations.
+jdo.tck.mapping.companyfactory = org.apache.jdo.tck.pc.companyAnnotatedPC.CompanyFactoryAnnotatedPCConcreteDelegator
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyAllRelationships.xml
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
Added: db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPCPM.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPCPM.conf?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPCPM.conf (added)
+++ db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPCPM.conf Tue Aug 14 10:16:06 2007
@@ -0,0 +1,22 @@
+# 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.
+
+jdo.tck.description = Completeness test with standard mapping, basic testdata with all relationships \
+and embedded objects, annotations.
+jdo.tck.mapping.companyfactory = org.apache.jdo.tck.pc.companyAnnotatedPC.CompanyFactoryAnnotatedPCPMDelegator
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyAllRelationships.xml
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
Added: db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPIPM.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPIPM.conf?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPIPM.conf (added)
+++ db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsPIPM.conf Tue Aug 14 10:16:06 2007
@@ -0,0 +1,21 @@
+# 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.
+
+jdo.tck.description = Completeness test with standard mapping, basic testdata with no relationships.
+jdo.tck.mapping.companyfactory = org.apache.jdo.tck.pc.companyAnnotatedPI.CompanyFactoryAnnotatedPIPMDelegator
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyAllRelationships.xml
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
Added: db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsFCConcrete.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsFCConcrete.conf?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsFCConcrete.conf (added)
+++ db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsFCConcrete.conf Tue Aug 14 10:16:06 2007
@@ -0,0 +1,21 @@
+# 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.
+
+jdo.tck.description = Completeness test with standard mapping, basic testdata with no relationships.
+jdo.tck.mapping.companyfactory = org.apache.jdo.tck.pc.companyAnnotatedFC.CompanyFactoryAnnotatedFCConcreteDelegator
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyNoRelationships.xml
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
Added: db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsPCConcrete.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsPCConcrete.conf?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsPCConcrete.conf (added)
+++ db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsPCConcrete.conf Tue Aug 14 10:16:06 2007
@@ -0,0 +1,21 @@
+# 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.
+
+jdo.tck.description = Completeness test with standard mapping, basic testdata with no relationships.
+jdo.tck.mapping.companyfactory = org.apache.jdo.tck.pc.companyAnnotatedPC.CompanyFactoryAnnotatedPCConcreteDelegator
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyNoRelationships.xml
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
Added: db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsPCPM.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsPCPM.conf?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsPCPM.conf (added)
+++ db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsPCPM.conf Tue Aug 14 10:16:06 2007
@@ -0,0 +1,21 @@
+# 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.
+
+jdo.tck.description = Completeness test with standard mapping, basic testdata with no relationships.
+jdo.tck.mapping.companyfactory = org.apache.jdo.tck.pc.companyAnnotatedPC.CompanyFactoryAnnotatedPCPMDelegator
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyNoRelationships.xml
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
Modified: db/jdo/trunk/tck2/src/conf/configurations.list
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/configurations.list?view=diff&rev=565841&r1=565840&r2=565841
==============================================================================
--- db/jdo/trunk/tck2/src/conf/configurations.list (original)
+++ db/jdo/trunk/tck2/src/conf/configurations.list Tue Aug 14 10:16:06 2007
@@ -38,13 +38,20 @@
companyListWithoutJoin.conf \
companyPMClass.conf \
companyPMInterface.conf \
- companyAnnotatedNoRelationshipsFCPM.conf \
companyAnnotated1-1RelationshipsFCPM.conf \
companyAnnotated1-MRelationshipsFCPM.conf \
- companyAnnotatedM-MRelationshipsFCPM.conf \
+ companyAnnotatedAllRelationshipsFCConcrete.conf \
companyAnnotatedAllRelationshipsFCPM.conf \
+ companyAnnotatedAllRelationshipsPCConcrete.conf \
+ companyAnnotatedAllRelationshipsPCPM.conf \
+ companyAnnotatedAllRelationshipsPIPM.conf \
companyAnnotatedEmbeddedFCPM.conf \
companyAnnotatedM-MRelationshipsFCConcrete.conf \
+ companyAnnotatedM-MRelationshipsFCPM.conf \
+ companyAnnotatedNoRelationshipsFCConcrete.conf \
+ companyAnnotatedNoRelationshipsFCPM.conf \
+ companyAnnotatedNoRelationshipsPCConcrete.conf \
+ companyAnnotatedNoRelationshipsPCPM.conf \
companyAnnotatedNoRelationshipsPIPM.conf \
inheritance1.conf \
inheritance2.conf \
Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java Tue Aug 14 10:16:06 2007
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+package org.apache.jdo.tck.pc.companyAnnotatedPC;
+
+import javax.jdo.PersistenceManager;
+import org.apache.jdo.tck.pc.company.*;
+
+/*
+ * CompanyFactoryAnnotatedPMFieldClass.java
+ *
+ * This class uses the PersistenceManager.newInstance method with the concrete
+ * class as a parameter.
+ */
+public class CompanyFactoryAnnotatedPCAppConcrete
+ implements CompanyFactoryNewInstance {
+
+ PersistenceManager pm = null;
+
+ /**
+ * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+ */
+ public CompanyFactoryAnnotatedPCAppConcrete(PersistenceManager pm) {
+ this.pm = pm;
+ }
+
+ public Class[] getTearDownClasses() {
+ return new Class[] {
+ PCAppDentalInsurance.class,
+ PCAppMedicalInsurance.class,
+ PCAppPartTimeEmployee.class,
+ PCAppFullTimeEmployee.class,
+ PCAppProject.class,
+ PCAppDepartment.class,
+ PCAppCompany.class,
+ PCAppAddress.class
+ };
+ }
+
+ public IAddress newAddress() {
+ return (IAddress) new PCAppAddress();
+ }
+
+ public ICompany newCompany() {
+ return (ICompany) new PCAppCompany();
+ }
+
+ public IDentalInsurance newDentalInsurance() {
+ return (IDentalInsurance) new PCAppDentalInsurance();
+ }
+
+ public IDepartment newDepartment() {
+ return (IDepartment) new PCAppDepartment();
+ }
+
+ public IFullTimeEmployee newFullTimeEmployee() {
+ return (IFullTimeEmployee) new PCAppFullTimeEmployee();
+ }
+
+ public IMedicalInsurance newMedicalInsurance() {
+ return (IMedicalInsurance) new PCAppMedicalInsurance();
+ }
+
+ public IPartTimeEmployee newPartTimeEmployee() {
+ return (IPartTimeEmployee) new PCAppPartTimeEmployee();
+ }
+
+ public IProject newProject() {
+ return (IProject) new PCAppProject();
+ }
+}
Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java
------------------------------------------------------------------------------
svn:eol-style = LF
Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java Tue Aug 14 10:16:06 2007
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+package org.apache.jdo.tck.pc.companyAnnotatedPC;
+
+import javax.jdo.PersistenceManager;
+import org.apache.jdo.tck.pc.company.*;
+
+/*
+ * CompanyFactoryAnnotatedPMFieldClass.java
+ *
+ * This class uses the PersistenceManager.newInstance method with the concrete
+ * class as a parameter.
+ */
+public class CompanyFactoryAnnotatedPCAppPM
+ implements CompanyFactoryNewInstance {
+
+ PersistenceManager pm = null;
+
+ /**
+ * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+ */
+ public CompanyFactoryAnnotatedPCAppPM(PersistenceManager pm) {
+ this.pm = pm;
+ }
+
+ public Class[] getTearDownClasses() {
+ return new Class[] {
+ PCAppDentalInsurance.class,
+ PCAppMedicalInsurance.class,
+ PCAppPartTimeEmployee.class,
+ PCAppFullTimeEmployee.class,
+ PCAppProject.class,
+ PCAppDepartment.class,
+ PCAppCompany.class,
+ PCAppAddress.class
+ };
+ }
+
+ public IAddress newAddress() {
+ return (IAddress)pm.newInstance(PCAppAddress.class);
+ }
+
+ public ICompany newCompany() {
+ return (ICompany)pm.newInstance(PCAppCompany.class);
+ }
+
+ public IDentalInsurance newDentalInsurance() {
+ return (IDentalInsurance)pm.newInstance(PCAppDentalInsurance.class);
+ }
+
+ public IDepartment newDepartment() {
+ return (IDepartment)pm.newInstance(PCAppDepartment.class);
+ }
+
+ public IFullTimeEmployee newFullTimeEmployee() {
+ return (IFullTimeEmployee)pm.newInstance(PCAppFullTimeEmployee.class);
+ }
+
+ public IMedicalInsurance newMedicalInsurance() {
+ return (IMedicalInsurance)pm.newInstance(PCAppMedicalInsurance.class);
+ }
+
+ public IPartTimeEmployee newPartTimeEmployee() {
+ return (IPartTimeEmployee)pm.newInstance(PCAppPartTimeEmployee.class);
+ }
+
+ public IProject newProject() {
+ return (IProject)pm.newInstance(PCAppProject.class);
+ }
+}
Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java
------------------------------------------------------------------------------
svn:eol-style = LF
Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java Tue Aug 14 10:16:06 2007
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package org.apache.jdo.tck.pc.companyAnnotatedPC;
+
+import javax.jdo.PersistenceManager;
+import org.apache.jdo.tck.pc.company.CompanyFactoryAnnotatedAbstractDelegator;
+
+/*
+ * CompanyFactoryAnnotatedPMFieldClass.java
+ *
+ * This class uses the PersistenceManager.newInstance method with the concrete
+ * class as a parameter.
+ */
+public class CompanyFactoryAnnotatedPCConcreteDelegator
+ extends CompanyFactoryAnnotatedAbstractDelegator {
+
+ /**
+ * Creates a new instance of CompanyFactory
+ */
+ public CompanyFactoryAnnotatedPCConcreteDelegator(PersistenceManager pm) {
+ super(pm);
+ if (isAppIdentity){
+ delegate = new CompanyFactoryAnnotatedPCAppConcrete(pm);
+ } else { //datastoreidentity
+ delegate = new CompanyFactoryAnnotatedPCDSConcrete(pm);
+ }
+ }
+
+}
Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java
------------------------------------------------------------------------------
svn:eol-style = LF
Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java Tue Aug 14 10:16:06 2007
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+package org.apache.jdo.tck.pc.companyAnnotatedPC;
+
+import javax.jdo.PersistenceManager;
+import org.apache.jdo.tck.pc.company.*;
+
+/*
+ * CompanyFactoryAnnotatedFCDSPM.java
+ *
+ * This class uses the PersistenceManager.newInstance method with the concrete
+ * class as a parameter.
+ */
+public class CompanyFactoryAnnotatedPCDSConcrete
+ implements CompanyFactoryNewInstance {
+
+ PersistenceManager pm = null;
+
+ /**
+ * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+ */
+ public CompanyFactoryAnnotatedPCDSConcrete(PersistenceManager pm) {
+ this.pm = pm;
+ }
+
+ public Class[] getTearDownClasses() {
+ return new Class[] {
+ PCDSDentalInsurance.class,
+ PCDSMedicalInsurance.class,
+ PCDSPartTimeEmployee.class,
+ PCDSFullTimeEmployee.class,
+ PCDSProject.class,
+ PCDSDepartment.class,
+ PCDSCompany.class,
+ PCDSAddress.class
+ };
+ }
+
+ public IAddress newAddress() {
+ return (IAddress) new PCDSAddress();
+ }
+
+ public ICompany newCompany() {
+ return (ICompany) new PCDSCompany();
+ }
+
+ public IDentalInsurance newDentalInsurance() {
+ return (IDentalInsurance) new PCDSDentalInsurance();
+ }
+
+ public IDepartment newDepartment() {
+ return (IDepartment) new PCDSDepartment();
+ }
+
+ public IFullTimeEmployee newFullTimeEmployee() {
+ return (IFullTimeEmployee) new PCDSFullTimeEmployee();
+ }
+
+ public IMedicalInsurance newMedicalInsurance() {
+ return (IMedicalInsurance) new PCDSMedicalInsurance();
+ }
+
+ public IPartTimeEmployee newPartTimeEmployee() {
+ return (IPartTimeEmployee) new PCDSPartTimeEmployee();
+ }
+
+ public IProject newProject() {
+ return (IProject) new PCDSProject();
+ }
+}
Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java
------------------------------------------------------------------------------
svn:eol-style = LF
Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java Tue Aug 14 10:16:06 2007
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+package org.apache.jdo.tck.pc.companyAnnotatedPC;
+
+import javax.jdo.PersistenceManager;
+import org.apache.jdo.tck.pc.company.*;
+
+/*
+ * CompanyFactoryAnnotatedPCDSPM.java
+ *
+ * This class uses the PersistenceManager.newInstance method with the concrete
+ * class as a parameter.
+ */
+public class CompanyFactoryAnnotatedPCDSPM
+ implements CompanyFactoryNewInstance {
+
+ PersistenceManager pm = null;
+
+ /**
+ * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+ */
+ public CompanyFactoryAnnotatedPCDSPM(PersistenceManager pm) {
+ this.pm = pm;
+ }
+
+ public Class[] getTearDownClasses() {
+ return new Class[] {
+ PCDSDentalInsurance.class,
+ PCDSMedicalInsurance.class,
+ PCDSPartTimeEmployee.class,
+ PCDSFullTimeEmployee.class,
+ PCDSProject.class,
+ PCDSDepartment.class,
+ PCDSCompany.class,
+ PCDSAddress.class
+ };
+ }
+
+ public IAddress newAddress() {
+ return (IAddress)pm.newInstance(PCDSAddress.class);
+ }
+
+ public ICompany newCompany() {
+ return (ICompany)pm.newInstance(PCDSCompany.class);
+ }
+
+ public IDentalInsurance newDentalInsurance() {
+ return (IDentalInsurance)pm.newInstance(PCDSDentalInsurance.class);
+ }
+
+ public IDepartment newDepartment() {
+ return (IDepartment)pm.newInstance(PCDSDepartment.class);
+ }
+
+ public IFullTimeEmployee newFullTimeEmployee() {
+ return (IFullTimeEmployee)pm.newInstance(PCDSFullTimeEmployee.class);
+ }
+
+ public IMedicalInsurance newMedicalInsurance() {
+ return (IMedicalInsurance)pm.newInstance(PCDSMedicalInsurance.class);
+ }
+
+ public IPartTimeEmployee newPartTimeEmployee() {
+ return (IPartTimeEmployee)pm.newInstance(PCDSPartTimeEmployee.class);
+ }
+
+ public IProject newProject() {
+ return (IProject)pm.newInstance(PCDSProject.class);
+ }
+}
Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java
------------------------------------------------------------------------------
svn:eol-style = LF
Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java Tue Aug 14 10:16:06 2007
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package org.apache.jdo.tck.pc.companyAnnotatedPC;
+
+import javax.jdo.PersistenceManager;
+import org.apache.jdo.tck.pc.company.CompanyFactoryAnnotatedAbstractDelegator;
+
+/*
+ * CompanyFactoryAnnotatedPMFieldClass.java
+ *
+ * This class uses the PersistenceManager.newInstance method with the concrete
+ * class as a parameter.
+ */
+public class CompanyFactoryAnnotatedPCPMDelegator
+ extends CompanyFactoryAnnotatedAbstractDelegator {
+
+ /**
+ * Creates a new instance of CompanyFactory
+ */
+ public CompanyFactoryAnnotatedPCPMDelegator(PersistenceManager pm) {
+ super(pm);
+ if (isAppIdentity){
+ delegate = new CompanyFactoryAnnotatedPCAppPM(pm);
+ } else { //datastoreidentity
+ delegate = new CompanyFactoryAnnotatedPCDSPM(pm);
+ }
+ }
+
+}
Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java
------------------------------------------------------------------------------
svn:eol-style = LF
Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java Tue Aug 14 10:16:06 2007
@@ -0,0 +1,349 @@
+/*
+ * 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.
+ */
+
+package org.apache.jdo.tck.pc.companyAnnotatedPC;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+import javax.jdo.annotations.*;
+
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.util.DeepEquality;
+import org.apache.jdo.tck.util.EqualityHelper;
+
+/**
+ * This class represents a postal address.
+ */
+@PersistenceCapable(embeddedOnly="true", requiresExtent="false")
+public class PCAppAddress
+ implements IAddress, Serializable, Comparable, Comparator, DeepEquality {
+
+ private long addrid;
+ private String street;
+ private String city;
+ private String state;
+ private String zipcode;
+ private String country;
+
+ /** This is the JDO-required no-args constructor. The TCK relies on
+ * this constructor for testing PersistenceManager.newInstance(PCClass).
+ */
+ public PCAppAddress() {}
+
+ /**
+ * This constructor initializes the <code>PCAppAddress</code> components.
+ *
+ *
+ *
+ * @param addrid The address ID.
+ * @param street The street address.
+ * @param city The city.
+ * @param state The state.
+ * @param zipcode The zip code.
+ * @param country The zip country.
+ */
+ public PCAppAddress(long addrid, String street, String city,
+ String state, String zipcode, String country)
+ {
+ this.addrid = addrid;
+ this.street = street;
+ this.city = city;
+ this.state = state;
+ this.zipcode = zipcode;
+ this.country = country;
+ }
+
+ /**
+ * Get the addrid associated with this object.
+ * @return the addrid.
+ */
+ public long getAddrid() {
+ return addrid;
+ }
+
+ /**
+ * Set the id associated with this object.
+ * @param id the id.
+ */
+ public void setAddrid(long id) {
+ if (this.addrid != 0)
+ throw new IllegalStateException("Id is already set.");
+ this.addrid = id;
+ }
+
+ /**
+ * Get the street component of the address.
+ * @return The street component of the address.
+ */
+ public String getStreet() {
+ return street;
+ }
+
+ /**
+ * Set the street component of the address.
+ * @param street The street component.
+ */
+ public void setStreet(String street) {
+ this.street = street;
+ }
+
+ /**
+ * Get the city.
+ * @return The city component of the address.
+ */
+ public String getCity() {
+ return city;
+ }
+
+ /**
+ * Set the city component of the address.
+ * @param city The city.
+ */
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ /**
+ * Get the state component of the address.
+ * @return The state.
+ */
+ public String getState() {
+ return state;
+ }
+
+ /**
+ * Set the state component of the address.
+ * @param state The state.
+ */
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ /**
+ * Get the zipcode component of the address.
+ * @return The zipcode.
+ */
+ public String getZipcode() {
+ return zipcode;
+ }
+
+ /**
+ * Set the zip code component of the address.
+ * @param zipcode The zipcode.
+ */
+ public void setZipcode(String zipcode) {
+ this.zipcode = zipcode;
+ }
+
+ /**
+ * Get the country component of the address.
+ * @return The country.
+ */
+ public String getCountry() {
+ return country;
+ }
+
+ /**
+ * Set the country component of the address.
+ * @param country The country.
+ */
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
+ /**
+ * Returns a String representation of a <code>Address</code> object.
+ * @return a String representation of a <code>Address</code> object.
+ */
+ public String toString() {
+ return "Address(" + getFieldRepr() + ")";
+ }
+
+ /**
+ * Returns a String representation of the non-relationship fields.
+ * @return a String representation of the non-relationship fields.
+ */
+ protected String getFieldRepr() {
+ StringBuffer rc = new StringBuffer();
+ rc.append(addrid);
+ rc.append(", street ").append(street);
+ rc.append(", city ").append(city);
+ rc.append(", state ").append(state);
+ rc.append(", zipcode ").append(zipcode);
+ rc.append(", country ").append(country);
+ return rc.toString();
+ }
+
+ /**
+ * Returns <code>true</code> if all the fields of this instance are
+ * deep equal to the coresponding fields of the specified Person.
+ * @param other the object with which to compare.
+ * @param helper EqualityHelper to keep track of instances that have
+ * already been processed.
+ * @return <code>true</code> if all the fields are deep equal;
+ * <code>false</code> otherwise.
+ * @throws ClassCastException if the specified instances' type prevents
+ * it from being compared to this instance.
+ */
+ public boolean deepCompareFields(Object other,
+ EqualityHelper helper) {
+ PCAppAddress otherAddress = (PCAppAddress)other;
+ String where = "Address<" + addrid + ">";
+ return
+ helper.equals(addrid, otherAddress.getAddrid(), where + ".addrid") &
+ helper.equals(street, otherAddress.getStreet(), where + ".street") &
+ helper.equals(city, otherAddress.getCity(), where + ".city") &
+ helper.equals(state, otherAddress.getState(), where + ".state") &
+ helper.equals(zipcode, otherAddress.getZipcode(), where + ".zipcode") &
+ helper.equals(country, otherAddress.getCountry(), where + ".country");
+ }
+
+ /**
+ * Compares this object with the specified object for order. Returns a
+ * negative integer, zero, or a positive integer as this object is less
+ * than, equal to, or greater than the specified object.
+ * @param o The Object to be compared.
+ * @return a negative integer, zero, or a positive integer as this
+ * object is less than, equal to, or greater than the specified object.
+ * @throws ClassCastException - if the specified object's type prevents
+ * it from being compared to this Object.
+ */
+ public int compareTo(Object o) {
+ return compareTo((PCAppAddress)o);
+ }
+
+ /**
+ * Compare two instances. This is a method in Comparator.
+ */
+ public int compare(Object o1, Object o2) {
+ return compare((PCAppAddress)o1, (PCAppAddress)o2);
+ }
+
+ /**
+ * Compares this object with the specified Address object for
+ * order. Returns a negative integer, zero, or a positive integer as
+ * this object is less than, equal to, or greater than the specified
+ * object.
+ * @param other The Address object to be compared.
+ * @return a negative integer, zero, or a positive integer as this
+ * object is less than, equal to, or greater than the specified Address
+ * object.
+ */
+ public int compareTo(PCAppAddress other) {
+ return compare(this, other);
+ }
+
+ /**
+ * Compares its two PCAppAddress arguments for order. Returns a negative
+ * integer, zero, or a positive integer as the first argument is less
+ * than, equal to, or greater than the second.
+ *
+ *
+ *
+ * @param o1 the first PCAppAddresss object to be compared.
+ * @param o2 the second FFCPIAddressobject to be compared.
+ * @return a negative integer, zero, or a positive integer as the first
+ * object is less than, equal to, or greater than the second object.
+ */
+ public static int compare(PCAppAddress o1, PCAppAddress o2) {
+ return EqualityHelper.compare(o1.getAddrid(), o2.getAddrid());
+ }
+
+ /**
+ * Indicates whether some other object is "equal to" this one.
+ * @param obj the object with which to compare.
+ * @return <code>true</code> if this object is the same as the obj
+ * argument; <code>false</code> otherwise.
+ */
+ public boolean equals(Object obj) {
+ if (obj instanceof PCAppAddress) {
+ return compareTo((PCAppAddress)obj) == 0;
+ }
+ return false;
+ }
+
+ /**
+ * Returns a hash code value for the object.
+ * @return a hash code value for this object.
+ */
+ public int hashCode() {
+ return (int)addrid;
+ }
+
+ /**
+ * This class is used to represent the application identifier
+ * for the <code>Address</code> class.
+ */
+ public static class Oid implements Serializable, Comparable {
+
+ /**
+ * This is the identifier field for <code>Address</code> and must
+ * correspond in type and name to the field in
+ * <code>Address</code>.
+ */
+ public long addrid;
+
+ /** The required public, no-arg constructor. */
+ public Oid()
+ {
+ addrid = 0;
+ }
+
+ /**
+ * A constructor to initialize the identifier field.
+ * @param addrid the id of the Address.
+ */
+ public Oid(long addrid) {
+ this.addrid = addrid;
+ }
+
+ public Oid(String s) { addrid = Long.parseLong(justTheId(s)); }
+
+ public String toString() { return this.getClass().getName() + ": " + addrid;}
+
+
+ /** */
+ public boolean equals(java.lang.Object obj) {
+ if( obj==null || !this.getClass().equals(obj.getClass()) )
+ return( false );
+ Oid o = (Oid) obj;
+ if( this.addrid != o.addrid ) return( false );
+ return( true );
+ }
+
+ /** */
+ public int hashCode() {
+ return( (int) addrid );
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
+
+ /** */
+ public int compareTo(Object obj) {
+ // may throw ClassCastException which the user must handle
+ Oid other = (Oid) obj;
+ if( addrid < other.addrid ) return -1;
+ if( addrid > other.addrid ) return 1;
+ return 0;
+ }
+
+ }
+
+}
Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java
------------------------------------------------------------------------------
svn:eol-style = LF
Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java Tue Aug 14 10:16:06 2007
@@ -0,0 +1,404 @@
+/*
+ * 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.
+ */
+
+package org.apache.jdo.tck.pc.companyAnnotatedPC;
+
+import javax.jdo.annotations.*;
+
+import java.io.Serializable;
+import java.io.ObjectInputStream;
+import java.io.IOException;
+
+import java.text.SimpleDateFormat;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Date;
+import org.apache.jdo.tck.pc.company.IAddress;
+
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.util.DeepEquality;
+import org.apache.jdo.tck.util.EqualityHelper;
+
+/**
+ * This class represents information about a company.
+ */
+@PersistenceCapable(identityType=IdentityType.APPLICATION,table="companies")
+@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
+ column="DISCRIMINATOR")
+ public class PCAppCompany
+ implements ICompany, Serializable, Comparable, Comparator, DeepEquality {
+
+ @NotPersistent()
+ private long _companyid;
+ @NotPersistent()
+ private String _name;
+ @NotPersistent()
+ private Date _founded;
+ @NotPersistent()
+ private PCAppAddress _address;
+ @NotPersistent()
+ private transient Set _departments = new HashSet();
+
+ protected static SimpleDateFormat formatter =
+ new SimpleDateFormat("d/MMM/yyyy");
+
+ /** This is the JDO-required no-args constructor. The TCK relies on
+ * this constructor for testing PersistenceManager.newInstance(PCClass).
+ */
+ public PCAppCompany() {}
+
+ /**
+ *
+ * Initialize the <code>PCAppCompany</code> instance.
+ *
+ *
+ * @param companyid The company id.
+ * @param name The company name.
+ * @param founded The date the company was founded.
+ */
+ public PCAppCompany(long companyid, String name, Date founded) {
+ this._companyid = companyid;
+ this._name = name;
+ this._founded = founded;
+ }
+
+ /**
+ * Initialize the <code>Company</code> instance.
+ * @param companyid The company id.
+ * @param name The company name.
+ * @param founded The date the company was founded.
+ * @param addr The company's address.
+ */
+ public PCAppCompany(long companyid, String name, Date founded, IAddress addr) {
+ this(companyid, name, founded);
+ this._address = (PCAppAddress)addr;
+ }
+
+ /**
+ * Get the company id.
+ * @return The company id.
+ */
+ @Persistent(primaryKey="true")
+ @Column(name="ID")
+ public long getCompanyid() {
+ return _companyid;
+ }
+
+ /**
+ * Set the id associated with this object.
+ * @param id the id.
+ */
+ public void setCompanyid(long id) {
+ if (this._companyid != 0)
+ throw new IllegalStateException("Id is already set.");
+ this._companyid = id;
+ }
+
+ /**
+ * Get the name of the company.
+ * @return The name of the company.
+ */
+ @Column(name="NAME", jdbcType="VARCHAR")
+ public String getName() {
+ return _name;
+ }
+
+ /**
+ * Set the name of the company.
+ * @param name The value to use for the name of the company.
+ */
+ public void setName(String name) {
+ this._name = name;
+ }
+
+ /**
+ * Get the date that the company was founded.
+ * @return The date the company was founded.
+ */
+ @Column(name="FOUNDEDDATE")
+ public Date getFounded() {
+ return _founded;
+ }
+
+ /**
+ * Set the date that the company was founded.
+ * @param founded The date to set that the company was founded.
+ */
+ public void setFounded(Date founded) {
+ this._founded = founded;
+ }
+
+ /**
+ * Get the address of the company.
+ * @return The primary address of the company.
+ */
+ @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
+ types=org.apache.jdo.tck.pc.companyAnnotatedPC.PCAppAddress.class)
+ @Embedded(nullIndicatorColumn="COUNTRY",
+ members={
+ @Persistent(name="addrid", columns=@Column(name="ADDRID")),
+ @Persistent(name="street", columns=@Column(name="STREET")),
+ @Persistent(name="city", columns=@Column(name="CITY")),
+ @Persistent(name="state", columns=@Column(name="STATE")),
+ @Persistent(name="zipcode", columns=@Column(name="ZIPCODE")),
+ @Persistent(name="country", columns=@Column(name="COUNTRY"))
+ })
+ public IAddress getAddress() {
+ return _address;
+ }
+
+ /**
+ * Set the primary address for the company.
+ * @param address The address to set for the company.
+ */
+ public void setAddress(IAddress address) {
+ this._address = (PCAppAddress)address;
+ }
+
+ /**
+ * Get the departments contained in the company.
+ *
+ *
+ * @return All the <code>PCAppDepartment</code>s of the company.
+ */
+
+ @Persistent(persistenceModifier=PersistenceModifier.PERSISTENT,
+ mappedBy="company")
+ @Element(types=org.apache.jdo.tck.pc.companyAnnotatedPC.PCAppDepartment.class)
+ public Set getDepartments() {
+ return _departments;
+ }
+
+ /**
+ * Add a <code>PCAppDepartment</code> instance to the company.
+ *
+ *
+ * @param dept The <code>PCAppDepartment</code> instance to add.
+ */
+ public void addDepartment(PCAppDepartment dept) {
+ _departments.add(dept);
+ }
+
+ /**
+ * Remove a <code>PCAppDepartment</code> instance from the company.
+ *
+ *
+ * @param dept The <code>PCAppDepartment</code> instance to remove.
+ */
+ public void removeDepartment(PCAppDepartment dept) {
+ _departments.remove(dept);
+ }
+
+ /**
+ * Initialize the set of <code>PCAppDepartment</code>s in the company to the
+ * parameter.
+ *
+ *
+ * @param departments The set of <code>PCAppDepartment</code>s for the
+ * company.
+ */
+ public void setDepartments(Set departments) {
+ // workaround: create a new HashSet, because fostore does not
+ // support LinkedHashSet
+ this._departments =
+ (departments != null) ? new HashSet(departments) : null;
+ }
+
+ /** Serialization support: initialize transient fields. */
+ private void readObject(ObjectInputStream in)
+ throws IOException, ClassNotFoundException {
+ in.defaultReadObject();
+ _departments = new HashSet();
+ }
+
+ /**
+ * Returns a String representation of a <code>Company</code> object.
+ * @return a String representation of a <code>Company</code> object.
+ */
+ public String toString() {
+ return "Company(" + getFieldRepr()+ ")";
+ }
+
+ /**
+ * Returns a String representation of the non-relationship fields.
+ * @return a String representation of the non-relationship fields.
+ */
+ protected String getFieldRepr() {
+ StringBuffer rc = new StringBuffer();
+ rc.append(_companyid);
+ rc.append(", name ").append(_name);
+ rc.append(", founded ").append(formatter.format(_founded));
+ return rc.toString();
+ }
+
+ /**
+ * Returns <code>true</code> if all the fields of this instance are
+ * deep equal to the coresponding fields of the specified Person.
+ * @param other the object with which to compare.
+ * @param helper EqualityHelper to keep track of instances that have
+ * already been processed.
+ * @return <code>true</code> if all the fields are deep equal;
+ * <code>false</code> otherwise.
+ * @throws ClassCastException if the specified instances' type prevents
+ * it from being compared to this instance.
+ */
+ public boolean deepCompareFields(Object other,
+ EqualityHelper helper) {
+ PCAppCompany otherCompany = (PCAppCompany)other;
+ String where = "Company<" + _companyid + ">";
+ return
+ helper.equals(_companyid, otherCompany.getCompanyid(), where + ".companyid") &
+ helper.equals(_name, otherCompany.getName(), where + ".name") &
+ helper.equals(_founded, otherCompany.getFounded(), where + ".founded") &
+ helper.deepEquals(_address, otherCompany.getAddress(), where + ".address") &
+ helper.deepEquals(_departments, otherCompany.getDepartments(), where + ".departments");
+ }
+
+ /**
+ * Compares this object with the specified object for order. Returns a
+ * negative integer, zero, or a positive integer as this object is less
+ * than, equal to, or greater than the specified object.
+ * @param o The Object to be compared.
+ * @return a negative integer, zero, or a positive integer as this
+ * object is less than, equal to, or greater than the specified object.
+ * @throws ClassCastException - if the specified object's type prevents
+ * it from being compared to this Object.
+ */
+ public int compareTo(Object o) {
+ return compareTo((PCAppCompany)o);
+ }
+
+ /**
+ * Compare two instances. This is a method in Comparator.
+ */
+ public int compare(Object o1, Object o2) {
+ return compare((PCAppCompany)o1, (PCAppCompany)o2);
+ }
+
+ /**
+ * Compares this object with the specified Company object for
+ * order. Returns a negative integer, zero, or a positive integer as
+ * this object is less than, equal to, or greater than the specified
+ * object.
+ * @param other The Company object to be compared.
+ * @return a negative integer, zero, or a positive integer as this
+ * object is less than, equal to, or greater than the specified Company
+ * object.
+ */
+ public int compareTo(PCAppCompany other) {
+ return compare(this, other);
+ }
+
+ /**
+ * Compares its two ICompany arguments for order. Returns a negative
+ * integer, zero, or a positive integer as the first argument is less
+ * than, equal to, or greater than the second.
+ * @param o1 the first ICompany object to be compared.
+ * @param o2 the second ICompany object to be compared.
+ * @return a negative integer, zero, or a positive integer as the first
+ * object is less than, equal to, or greater than the second object.
+ */
+ public static int compare(PCAppCompany o1, PCAppCompany o2) {
+ return EqualityHelper.compare(o1.getCompanyid(), o2.getCompanyid());
+ }
+
+ /**
+ * Indicates whether some other object is "equal to" this one.
+ * @param obj the object with which to compare.
+ * @return <code>true</code> if this object is the same as the obj
+ * argument; <code>false</code> otherwise.
+ */
+ public boolean equals(Object obj) {
+ if (obj instanceof PCAppCompany) {
+ return compareTo((PCAppCompany)obj) == 0;
+ }
+ return false;
+ }
+
+ /**
+ * Returns a hash code value for the object.
+ * @return a hash code value for this object.
+ */
+ public int hashCode() {
+ return (int)_companyid;
+ }
+
+ /**
+ * The class to be used as the application identifier
+ * for the <code>Company</code> class. It consists of both the company
+ * name and the date that the company was founded.
+ */
+ public static class Oid implements Serializable, Comparable {
+
+ /**
+ * This field is part of the identifier and should match in name
+ * and type with a field in the <code>Company</code> class.
+ */
+ public long companyid;
+
+ /** The required public no-arg constructor. */
+ public Oid() { }
+
+ /**
+ * Initialize the identifier.
+ * @param companyid The id of the company.
+ */
+ public Oid(long companyid) {
+ this.companyid = companyid;
+ }
+
+ public Oid(String s) { companyid = Long.parseLong(justTheId(s)); }
+
+ public String toString() { return this.getClass().getName() + ": " + companyid;}
+
+
+ /** */
+ public boolean equals(Object obj) {
+ if (obj==null || !this.getClass().equals(obj.getClass()))
+ return false;
+ Oid o = (Oid) obj;
+ if (this.companyid != o.companyid)
+ return false;
+ return true;
+ }
+
+ /** */
+ public int hashCode() {
+ return (int)companyid;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
+
+ /** */
+ public int compareTo(Object obj) {
+ // may throw ClassCastException which the user must handle
+ Oid other = (Oid) obj;
+ if( companyid < other.companyid ) return -1;
+ if( companyid > other.companyid ) return 1;
+ return 0;
+ }
+
+ }
+
+}
+
Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
------------------------------------------------------------------------------
svn:eol-style = LF
Added: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java?view=auto&rev=565841
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java (added)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java Tue Aug 14 10:16:06 2007
@@ -0,0 +1,131 @@
+/*
+ * 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.
+ */
+
+package org.apache.jdo.tck.pc.companyAnnotatedPC;
+
+import javax.jdo.annotations.*;
+
+import java.math.BigDecimal;
+
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IEmployee;
+import org.apache.jdo.tck.util.EqualityHelper;
+
+/**
+ * This class represents a dental insurance carrier selection for a
+ * particular <code>Employee</code>.
+ */
+@PersistenceCapable(identityType=IdentityType.APPLICATION)
+public class PCAppDentalInsurance extends PCAppInsurance implements IDentalInsurance {
+
+ @NotPersistent()
+ private BigDecimal _lifetimeOrthoBenefit;
+
+ /** This is the JDO-required no-args constructor. The TCK relies on
+ * this constructor for testing PersistenceManager.newInstance(PCClass).
+ */
+ public PCAppDentalInsurance() {}
+
+ /**
+ * Construct a <code>DentalInsurance</code> instance.
+ * @param insid The insurance instance identifier.
+ * @param carrier The insurance carrier.
+ * @param lifetimeOrthoBenefit The lifetimeOrthoBenefit.
+ */
+ public PCAppDentalInsurance(long insid, String carrier,
+ BigDecimal lifetimeOrthoBenefit) {
+ super(insid, carrier);
+ this._lifetimeOrthoBenefit = lifetimeOrthoBenefit;
+ }
+
+ /**
+ * Construct a <code>PCAppDentalInsurance</code> instance.
+ *
+ *
+ * @param insid The insurance instance identifier.
+ * @param carrier The insurance carrier.
+ * @param employee The employee associated with this insurance.
+ * @param lifetimeOrthoBenefit The lifetimeOrthoBenefit.
+ */
+ public PCAppDentalInsurance(long insid, String carrier, IEmployee employee,
+ BigDecimal lifetimeOrthoBenefit) {
+ super(insid, carrier, employee);
+ this._lifetimeOrthoBenefit = lifetimeOrthoBenefit;
+ }
+
+ /**
+ * Get the insurance lifetimeOrthoBenefit.
+ * @return The insurance lifetimeOrthoBenefit.
+ */
+ @Column(name="LIFETIME_ORTHO_BENEFIT")
+ public BigDecimal getLifetimeOrthoBenefit() {
+ return _lifetimeOrthoBenefit;
+ }
+
+ /**
+ * Set the insurance lifetimeOrthoBenefit.
+ * @param lifetimeOrthoBenefit The insurance lifetimeOrthoBenefit.
+ */
+ public void setLifetimeOrthoBenefit(BigDecimal lifetimeOrthoBenefit) {
+ this._lifetimeOrthoBenefit = lifetimeOrthoBenefit;
+ }
+
+ /**
+ * Returns a String representation of a <code>PCAppDentalInsurance</code>
+ * object.
+ *
+ *
+ * @return a String representation of a <code>PCAppDentalInsurance</code>
+ * object.
+ */
+ public String toString() {
+ return "FCDentalInsurance(" + getFieldRepr()+ ")";
+ }
+
+ /**
+ * Returns a String representation of the non-relationship fields.
+ * @return a String representation of the non-relationship fields.
+ */
+ protected String getFieldRepr() {
+ StringBuffer rc = new StringBuffer();
+ rc.append(super.getFieldRepr());
+ rc.append(", lifetimeOrthoBenefit ").append(_lifetimeOrthoBenefit);
+ return rc.toString();
+ }
+
+ /**
+ * Returns <code>true</code> if all the fields of this instance are
+ * deep equal to the coresponding fields of the other Object.
+ * @param other the object with which to compare.
+ * @param helper EqualityHelper to keep track of instances that have
+ * already been processed.
+ * @return <code>true</code> if all the fields are deep equal;
+ * <code>false</code> otherwise.
+ * @throws ClassCastException if the specified instances' type prevents
+ * it from being compared to this instance.
+ */
+ public boolean deepCompareFields(Object other,
+ EqualityHelper helper) {
+ PCAppDentalInsurance otherIns = (PCAppDentalInsurance)other;
+ String where = "FCDentalInsurance<" + getInsid() + ">";
+ return super.deepCompareFields(otherIns, helper) &
+ helper.equals(_lifetimeOrthoBenefit,
+ otherIns.getLifetimeOrthoBenefit(), where + ".lifetimeOrthoBenefit");
+ }
+
+}
+
Propchange: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java
------------------------------------------------------------------------------
svn:eol-style = LF