db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r162073 - in /incubator/jdo/trunk/tck20/test: conf/ jdo/applicationidentity/org/apache/jdo/tck/pc/company/ jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/ orm/applicationidentity/org/apache/jdo/tck/pc/company/ sql/derby/
Date Wed, 20 Apr 2005 21:24:42 GMT
Author: mcaisse
Date: Wed Apr 20 14:24:41 2005
New Revision: 162073

URL: http://svn.apache.org/viewcvs?rev=162073&view=rev
Log:
JDO-0 (partial: orm, sql for instancecallbacks); JDO-20 (remove default fields from *.jdo);
JDO19 (Remove PCPoint from schema*.sql); JDO-22 (correct defaults in jdori.properties)

Modified:
    incubator/jdo/trunk/tck20/test/conf/jdori.properties
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
    incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql

Modified: incubator/jdo/trunk/tck20/test/conf/jdori.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/jdori.properties?rev=162073&r1=162072&r2=162073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/jdori.properties (original)
+++ incubator/jdo/trunk/tck20/test/conf/jdori.properties Wed Apr 20 14:24:41 2005
@@ -4,7 +4,6 @@
 #
 # PMF Properties
 javax.jdo.PersistenceManagerFactoryClass=org.jpox.PersistenceManagerFactoryImpl
-org.apache.jdo.ConnectionCreate=true
 javax.jdo.option.ConnectionDriverName=org.apache.derby.jdbc.EmbeddedDriver
 javax.jdo.option.ConnectionURL=jdbc:derby:jdotckdb
 javax.jdo.option.ConnectionUserName=tckuser
@@ -14,16 +13,10 @@
 javax.jdo.option.RestoreValues=false
 javax.jdo.option.Mapping=derby
 
-# Allow selection of JDBC jar - see below
-#maven.jar.override=on
-
-# User Interface
-#maven.xdoc.date=left
-#maven.xdoc.date.format=dd MMMM yyyy HH:mm
-#maven.xdoc.version=${pom.currentVersion}
-
-log4j.configuration=file:${basedir}/test/conf/logging.properties
-maven.jpox.verbose=true
-
-org.jpox.validateTables=true
-org.jpox.validateConstraints=true
+#org.jpox.validateTables=false  # default = true
+org.jpox.validateConstraints=false
+org.jpox.autoCreateSchema=false
+org.jpox.autoCreateTables=false
+org.jpox.autoCreateConstraints=false
+org.jpox.autoCreateColumns=false
+org.jpox.rdbms.CheckExistTablesOrViews=false

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo?rev=162073&r1=162072&r2=162073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
(original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
Wed Apr 20 14:24:41 2005
@@ -9,19 +9,12 @@
 
         <class name="Address">
             <field name="addrid" persistence-modifier="none"/>
-            <field name="street"/>
-            <field name="city"/>
-            <field name="state"/>
-            <field name="zipcode"/>
-            <field name="country"/>
         </class>
 
         <class name="Company"
             identity-type="application"
             objectid-class="org.apache.jdo.tck.pc.company.Company$Oid">
             <field name="companyid" primary-key="true"/>
-            <field name="name"/>
-            <field name="founded"/>
             <field name="address"
                    persistence-modifier="persistent"/>
             <field name="departments" persistence-modifier="persistent">

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo?rev=162073&r1=162072&r2=162073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
(original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
Wed Apr 20 14:24:41 2005
@@ -9,15 +9,11 @@
     <class name="PCPoint"
            identity-type="application" objectid-class="org.apache.jdo.tck.pc.mylib.PCPoint$Oid">
       <field name="id" primary-key="true"/>
-      <field name="x"/>
-      <field name="y"/>
     </class>
 
     <class name="PCPoint2"
            identity-type="application" objectid-class="org.apache.jdo.tck.pc.mylib.PCPoint2$Oid">
       <field name="id" primary-key="true"/>
-      <field name="x"/>
-      <field name="y"/>
       <field name="clearCalled" persistence-modifier="none"/>
       <field name="loadCalled" persistence-modifier="none"/>
       <field name="storeCalled" persistence-modifier="none"/>
@@ -27,34 +23,11 @@
     <class name="PCRect"
            identity-type="application" objectid-class="org.apache.jdo.tck.pc.mylib.PCRect$Oid">
       <field name="id" primary-key="true"/>
-      <field name="lowerRight"/>
-      <field name="upperLeft"/>
     </class>
 
     <class name="PrimitiveTypes" 
            identity-type="application" objectid-class="org.apache.jdo.tck.pc.mylib.PrimitiveTypes$Oid">
       <field name="id" primary-key="true"/>
-      <field name="booleanNotNull"/>
-      <field name="booleanNull"/>
-      <field name="byteNotNull"/>
-      <field name="byteNull"/>
-      <field name="shortNotNull"/>
-      <field name="shortNull"/>
-      <field name="intNotNull"/>
-      <field name="intNull"/>
-      <field name="longNotNull"/>
-      <field name="longNull"/>
-      <field name="floatNotNull"/>
-      <field name="floatNull"/>
-      <field name="doubleNotNull"/>
-      <field name="doubleNull"/>
-      <field name="charNotNull"/>
-      <field name="charNull"/>
-      <field name="dateNull"/>
-      <field name="stringNull"/>
-      <field name="bigDecimal"/>
-      <field name="bigInteger"/>
-      <field name="PrimitiveTypes"/>
     </class>
 
   </package>

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo?rev=162073&r1=162072&r2=162073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
(original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
Wed Apr 20 14:24:41 2005
@@ -9,16 +9,9 @@
 
         <class name="Address">
             <field name="addrid" persistence-modifier="none"/>
-            <field name="street"/>
-            <field name="city"/>
-            <field name="state"/>
-            <field name="zipcode"/>
-            <field name="country"/>
         </class>
 
         <class name="Company" identity-type="datastore">
-            <field name="name"/>
-            <field name="founded"/>
             <field name="address"
                    persistence-modifier="persistent"/>
             <field name="departments" persistence-modifier="persistent">

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo?rev=162073&r1=162072&r2=162073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo
(original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo
Wed Apr 20 14:24:41 2005
@@ -8,14 +8,10 @@
     -->
     <class name="PCPoint" identity-type="datastore">
       <field name="id" persistence-modifier="none"/>
-      <field name="x"/>
-      <field name="y"/>
     </class>
 
     <class name="PCPoint2" identity-type="datastore">
       <field name="id" persistence-modifier="none"/>
-      <field name="x"/>
-      <field name="y"/>
 
       <field name="clearCalled" persistence-modifier="none"/>
       <field name="loadCalled" persistence-modifier="none"/>
@@ -25,33 +21,10 @@
 
     <class name="PCRect" identity-type="datastore">
       <field name="id" persistence-modifier="none"/>
-      <field name="lowerRight"/>
-      <field name="upperLeft"/>
     </class>
 
     <class name="PrimitiveTypes" identity-type="datastore">
       <field name="id" persistence-modifier="none"/>
-      <field name="booleanNotNull"/>
-      <field name="booleanNull"/>
-      <field name="byteNotNull"/>
-      <field name="byteNull"/>
-      <field name="shortNotNull"/>
-      <field name="shortNull"/>
-      <field name="intNotNull"/>
-      <field name="intNull"/>
-      <field name="longNotNull"/>
-      <field name="longNull"/>
-      <field name="floatNotNull"/>
-      <field name="floatNull"/>
-      <field name="doubleNotNull"/>
-      <field name="doubleNull"/>
-      <field name="charNotNull"/>
-      <field name="charNull"/>
-      <field name="dateNull"/>
-      <field name="stringNull"/>
-      <field name="bigDecimal"/>
-      <field name="bigInteger"/>
-      <field name="PrimitiveTypes"/>
     </class>
 
   </package>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm?rev=162073&r1=162072&r2=162073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
Wed Apr 20 14:24:41 2005
@@ -16,9 +16,11 @@
         </class>
 
         <class name="Company" table="companies">
-            <field name="companyid" column="ID" primary-key="true"/>
+            <field name="companyid" primary-key="true"/>
+                <column name="ID"/>
             <field name="name" column="NAME"/>
-            <field name="founded" column="FOUNDEDDATE"/>
+            <field name="founded"/>
+                <column name="FOUNDEDDATE"/>
             <field name="address">
                 <embedded null-indicator-column="COUNTRY">
                     <field name="street" column="STREET"/>

Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql?rev=162073&r1=162072&r2=162073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql Wed Apr 20 14:24:41 2005
@@ -26,11 +26,6 @@
     CONSTRAINT PCRCT_CONST PRIMARY KEY (ID)
 );
 
-CREATE TABLE Point (
-    X INTEGER NOT NULL,
-    Y INTEGER NOT NULL
-);
-
 CREATE TABLE PrimitiveTypes (
     ID BIGINT NOT NULL,
     booleanNotNull CHAR FOR BIT DATA NOT NULL,
@@ -157,6 +152,28 @@
 -------------------------
 --instancecallbacks
 -------------------------
+
+CREATE TABLE ICNonPersistFds (
+    ICKEY INTEGER NOT NULL,
+    D DOUBLE,
+    S SMALLINT,
+    FLOATVAL FLOAT,
+    INTVAL INTEGER,
+    CONSTRAINT ICNP_PK PRIMARY KEY (ICKEY)
+);
+
+CREATE TABLE InstanceCallbacks (
+    ICKEY INTEGER NOT NULL,
+    NAME VARCHAR(64),
+    TIMEDATE TIMESTAMP,
+    NEXTOBJ INTEGER,
+    CHILD INTEGER,
+    INTVAL INTEGER,
+    DOUBLEVAL DOUBLE,
+    CHILD2DEL INTEGER,
+    CHARVAL CHAR(254),
+    CONSTRAINT IC_PK PRIMARY KEY (ICKEY)
+);
 
 -------------------------
 --lifecycle

Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql?rev=162073&r1=162072&r2=162073&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql Wed Apr 20 14:24:41 2005
@@ -26,11 +26,6 @@
     CONSTRAINT PCRCT_CONST PRIMARY KEY (ID)
 );
 
-CREATE TABLE Point (
-    X INTEGER NOT NULL,
-    Y INTEGER NOT NULL
-);
-
 CREATE TABLE PrimitiveTypes (
     ID BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
     booleanNotNull CHAR FOR BIT DATA NOT NULL,
@@ -157,6 +152,28 @@
 -------------------------
 --instancecallbacks
 -------------------------
+
+CREATE TABLE ICNonPersistFds (
+    ICKEY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    D DOUBLE,
+    S SMALLINT,
+    FLOATVAL FLOAT,
+    INTVAL INTEGER,
+    CONSTRAINT ICNP_PK PRIMARY KEY (ICKEY)
+);
+
+CREATE TABLE InstanceCallbacks (
+    ICKEY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    NAME VARCHAR(64),
+    TIMEDATE TIMESTAMP,
+    NEXTOBJ INTEGER,
+    CHILD INTEGER,
+    INTVAL INTEGER,
+    DOUBLEVAL DOUBLE,
+    CHILD2DEL INTEGER,
+    CHARVAL CHAR(254),
+    CONSTRAINT IC_PK PRIMARY KEY (ICKEY)
+);
 
 -------------------------
 --lifecycle



Mime
View raw message