db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r582075 - in /db/jdo/trunk/tck2: ./ src/conf/ src/sql/derby/applicationidentity/
Date Fri, 05 Oct 2007 04:27:34 GMT
Author: mcaisse
Date: Thu Oct  4 21:27:22 2007
New Revision: 582075

URL: http://svn.apache.org/viewvc?rev=582075&view=rev
Log:
JDO-503 Tests for JPA annotations

Added:
    db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsJPAConcrete.conf
    db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsJPAConcrete.conf
Modified:
    db/jdo/trunk/tck2/maven.xml
    db/jdo/trunk/tck2/project.properties
    db/jdo/trunk/tck2/src/conf/configurations.list
    db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql

Modified: db/jdo/trunk/tck2/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/maven.xml?rev=582075&r1=582074&r2=582075&view=diff
==============================================================================
--- db/jdo/trunk/tck2/maven.xml (original)
+++ db/jdo/trunk/tck2/maven.xml Thu Oct  4 21:27:22 2007
@@ -558,13 +558,19 @@
             <fileset dir="${basedir}/src/jdo/${jdo.tck.identitytype}"
                      includes="**/*.jdo, **/*.jdoquery, **/jdoTest.properties"/>
         </copy>
-        <!-- compile pc and pa classes -->
+        <!-- copy pc and pa classes -->
+        <copy todir="${enhanced.dir}">
+            <fileset dir="${basedir}/target/classes"
+                includes="${jdo.tck.pcclasses.files}
+                        ${jdo.tck.paclasses.files}" />
+        </copy>
+        <!-- compile pc and pa classes 
         <javac srcdir="${basedir}/src/java"
            includes="${jdo.tck.pcclasses.sources} ${jdo.tck.paclasses.sources}"
            destdir="${enhanced.dir}"
            debug="on"
            classpathref="jdo.tck.enhancer.classpath">
-        </javac>
+        </javac>-->
     </goal>
 
     <goal name="doEnhance.iut">
@@ -712,6 +718,8 @@
         <pathelement location="${logging.jarfile}"/>
         <!-- Java 1.5 jar file -->
         <pathelement location="${jpox.javafive.jarfile}" />
+        <!-- JPA jar file -->
+        <pathelement location="${jpa.jarfile}" />
     </path>
 
     <!-- Common TCK execution classpath -->
@@ -723,6 +731,8 @@
         <!-- Commons logging jar file  -->
         <pathelement location="${logging.jarfile}"/>
         <pathelement location="${jta.jarfile}" />
+        <!-- JPA jar file -->
+        <pathelement location="${jpa.jarfile}" />
         <!-- JUnit jar file -->
         <pathelement location="${junit.jarfile}"/>
         <!-- Spring jar files -->

Modified: db/jdo/trunk/tck2/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.properties?rev=582075&r1=582074&r2=582075&view=diff
==============================================================================
--- db/jdo/trunk/tck2/project.properties (original)
+++ db/jdo/trunk/tck2/project.properties Thu Oct  4 21:27:22 2007
@@ -71,6 +71,7 @@
 util20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-util')}
 model20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-model')}
 enhancer20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-enhancer')}
+jpa.jarfile = ${pom.getDependencyPath('org.apache.geronimo.specs:geronimo-jpa_3.0_spec')}
 xmlparser =
 
 # JDORI enhancer
@@ -186,6 +187,17 @@
     org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java \
     org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPartTimeEmployee.java \
     org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.java \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.java \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.java \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.java \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.java \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.java \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.java \
     org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java \
     org/apache/jdo/tck/pc/companyMapWithoutJoin/Department.java \
     org/apache/jdo/tck/pc/companyMapWithoutJoin/Person.java \
@@ -401,6 +413,17 @@
     org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.class \
     org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPartTimeEmployee.class \
     org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.class \
     org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.class \
     org/apache/jdo/tck/pc/companyMapWithoutJoin/Department.class \
     org/apache/jdo/tck/pc/companyMapWithoutJoin/Person.class \
@@ -678,5 +701,14 @@
     org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.class \
     org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.class \
     org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.class \
-
-
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.class \
+    org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.class \

Added: db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsJPAConcrete.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsJPAConcrete.conf?rev=582075&view=auto
==============================================================================
--- db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsJPAConcrete.conf (added)
+++ db/jdo/trunk/tck2/src/conf/companyAnnotatedAllRelationshipsJPAConcrete.conf Thu Oct  4
21:27:22 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 M-M relationships,
annotations. 
+jdo.tck.mapping.companyfactory = org.apache.jdo.tck.pc.companyAnnotatedJPA.CompanyFactoryAnnotatedJPAAppConcrete
+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/companyAnnotatedNoRelationshipsJPAConcrete.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsJPAConcrete.conf?rev=582075&view=auto
==============================================================================
--- db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsJPAConcrete.conf (added)
+++ db/jdo/trunk/tck2/src/conf/companyAnnotatedNoRelationshipsJPAConcrete.conf Thu Oct  4
21:27:22 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.companyAnnotatedJPA.CompanyFactoryAnnotatedJPAAppConcrete
+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?rev=582075&r1=582074&r2=582075&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/conf/configurations.list (original)
+++ db/jdo/trunk/tck2/src/conf/configurations.list Thu Oct  4 21:27:22 2007
@@ -43,6 +43,7 @@
                  companyAnnotatedAllRelationshipsFCConcrete.conf \
                  companyAnnotatedAllRelationshipsFCPM.conf \
                  companyAnnotatedAllRelationshipsPCConcrete.conf \
+                 companyAnnotatedAllRelationshipsJPAConcrete.conf \
                  companyAnnotatedAllRelationshipsPCPM.conf \
                  companyAnnotatedAllRelationshipsPIPM.conf \
                  companyAnnotatedEmbeddedFCPM.conf \
@@ -51,6 +52,7 @@
                  companyAnnotatedNoRelationshipsFCConcrete.conf \
                  companyAnnotatedNoRelationshipsFCPM.conf \
                  companyAnnotatedNoRelationshipsPCConcrete.conf \
+                 companyAnnotatedNoRelationshipsJPAConcrete.conf \
                  companyAnnotatedNoRelationshipsPCPM.conf \
                  companyAnnotatedNoRelationshipsPIPM.conf \
                  inheritance1.conf \

Modified: db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql?rev=582075&r1=582074&r2=582075&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql (original)
+++ db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql Thu Oct  4 21:27:22 2007
@@ -224,6 +224,7 @@
 DROP TABLE insuranceplans;
 DROP TABLE project_reviewer;
 DROP TABLE project_member;
+DROP TABLE project_member_jpa;
 DROP TABLE employee_phoneno_type;
 DROP TABLE persons;
 DROP TABLE projects;
@@ -311,6 +312,11 @@
 CREATE TABLE project_member (
     PROJID INTEGER REFERENCES projects NOT NULL,
     MEMBER INTEGER REFERENCES persons NOT NULL
+);
+
+CREATE TABLE project_member_jpa (
+    PROJID INTEGER REFERENCES projects NOT NULL,
+    MEMBER_JPA INTEGER REFERENCES persons NOT NULL
 );
 
 CREATE TABLE employee_phoneno_type (



Mime
View raw message