db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/metadata DescriptorRepository.java
Date Wed, 19 Feb 2003 21:13:27 GMT
thma        2003/02/19 13:13:27

  Modified:    src/test/org/apache/ojb/quick-db OJB.script OJB.properties
               src/test/org/apache/ojb Test_ConnectionDescriptor.xml
                        OJB.properties repository.xml
                        Test_ClassDescriptor.xml repository.dtd
               src/java/org/apache/ojb/broker/metadata
                        DescriptorRepository.java
  Log:
  update repository version to 1.0
  
  Revision  Changes    Path
  1.12      +10 -9     db-ojb/src/test/org/apache/ojb/quick-db/OJB.script
  
  Index: OJB.script
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/quick-db/OJB.script,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- OJB.script	2 Feb 2003 10:14:49 -0000	1.11
  +++ OJB.script	19 Feb 2003 21:13:26 -0000	1.12
  @@ -40,8 +40,8 @@
   CREATE TABLE GOURMET(GOURMETID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(60))
   CREATE TABLE GOURMET_FOOD(GOURMET_ID INTEGER NOT NULL,FOOD_ID INTEGER NOT NULL,CONSTRAINT
SYS_PK_GOURMET_FOOD PRIMARY KEY(GOURMET_ID,FOOD_ID))
   CREATE TABLE GUIDTEST(GUID_ VARCHAR(60) NOT NULL PRIMARY KEY,GUIDVALUE VARCHAR(60))
  -CREATE TABLE CONV_REFERER(PK1 INTEGER NOT NULL PRIMARY KEY,REF1 INTEGER)
  -CREATE TABLE CONV_REFERED(PK1 INTEGER NOT NULL PRIMARY KEY)
  +CREATE TABLE CONV_REFERER(PK1 INTEGER NOT NULL PRIMARY KEY,REF1 INTEGER,TEST_ID INTEGER)
  +CREATE TABLE CONV_REFERED(PK1 INTEGER NOT NULL PRIMARY KEY,TEST_ID INTEGER)
   CREATE TABLE SITE(ID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(100),SITEYEAR INTEGER,SEMESTER
INTEGER,CONSTRAINT SYS_CT_3 UNIQUE(NAME))
   CREATE TABLE SM_TAB_A(SM_ID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(250))
   CREATE TABLE SM_TAB_AA(SM_ID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(250))
  @@ -60,7 +60,8 @@
   CREATE TABLE EJB_CATEGORY(CATEGORY_ID INTEGER NOT NULL PRIMARY KEY,CATEGORY_NAME VARCHAR(80),DESCRIPTION
VARCHAR(255))
   CREATE TABLE EJB_ARTICLE(ARTICLE_ID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR(80),PRICE
DECIMAL,DESCRIPTION VARCHAR(255),CATEGORY_ID INTEGER)
   CREATE TABLE EJB_PERSON(PERSON_ID INTEGER NOT NULL PRIMARY KEY,FIRST_NAME VARCHAR(80),LAST_NAME
VARCHAR(80),GRADE VARCHAR(80))
  -CREATE TABLE FIELD_CONVERSION_NODE(NODE_ID DECIMAL NOT NULL PRIMARY KEY,PARENT_UID DECIMAL)
  +CREATE TABLE FIELD_CONVERSION_NODE(NODE_ID DECIMAL NOT NULL,NODE_STATE INTEGER NOT NULL,PARENT_UID
DECIMAL,CONSTRAINT SYS_PK_FIELD_CONVERSION_NODE PRIMARY KEY(NODE_ID,NODE_STATE))
  +CREATE TABLE PERF_ARTICLE(ARTICLE_ID DECIMAL NOT NULL PRIMARY KEY,ARTICLE_NAME VARCHAR(150),MINIMUM_STOCK
INTEGER,PRICE DECIMAL,UNIT VARCHAR(20),STOCK INTEGER,SUPPLIER_ID INTEGER,PRODUCT_GROUP_ID
INTEGER)
   CREATE TABLE OJB_HL_SEQ(TABLENAME VARCHAR(175) NOT NULL,FIELDNAME VARCHAR(70) NOT NULL,MAX_KEY
INTEGER,GRAB_SIZE INTEGER,CONSTRAINT SYS_PK_OJB_HL_SEQ PRIMARY KEY(TABLENAME,FIELDNAME))
   CREATE TABLE OJB_LOCKENTRY(OID_ VARCHAR(250) NOT NULL,TX_ID VARCHAR(50) NOT NULL,TIMESTAMP_
TIMESTAMP,ISOLATIONLEVEL INTEGER,LOCKTYPE INTEGER,CONSTRAINT SYS_PK_OJB_LOCKENTRY PRIMARY
KEY(OID_,TX_ID))
   CREATE TABLE OJB_NRM(NAME VARCHAR(250) NOT NULL PRIMARY KEY,OID_ LONGVARBINARY)
  @@ -270,12 +271,12 @@
   INSERT INTO TASK VALUES(2,2,1,'Initial Spec')
   INSERT INTO TASK VALUES(3,2,2,'Project Cleanup')
   INSERT INTO TASK VALUES(4,2,3,'Testing Scripts')
  -INSERT INTO CONV_REFERER VALUES(1,1)
  -INSERT INTO CONV_REFERER VALUES(2,2)
  -INSERT INTO CONV_REFERER VALUES(3,3)
  -INSERT INTO CONV_REFERED VALUES(1)
  -INSERT INTO CONV_REFERED VALUES(2)
  -INSERT INTO CONV_REFERED VALUES(3)
  +INSERT INTO CONV_REFERER VALUES(1,50,10)
  +INSERT INTO CONV_REFERER VALUES(2,51,11)
  +INSERT INTO CONV_REFERER VALUES(3,52,12)
  +INSERT INTO CONV_REFERED VALUES(50,60)
  +INSERT INTO CONV_REFERED VALUES(51,61)
  +INSERT INTO CONV_REFERED VALUES(52,62)
   INSERT INTO SM_TAB_MAX_A VALUES(120,'A')
   INSERT INTO SM_TAB_MAX_A VALUES(121,'A')
   INSERT INTO SM_TAB_MAX_AA VALUES(101,'AA')
  
  
  
  1.11      +1 -1      db-ojb/src/test/org/apache/ojb/quick-db/OJB.properties
  
  Index: OJB.properties
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/quick-db/OJB.properties,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- OJB.properties	2 Feb 2003 10:14:49 -0000	1.10
  +++ OJB.properties	19 Feb 2003 21:13:26 -0000	1.11
  @@ -1,5 +1,5 @@
   #HSQL database
  -#Sun Feb 02 10:43:07 CET 2003
  +#Wed Feb 19 21:29:33 CET 2003
   sql.strict_fk=true
   readonly=false
   sql.strong_fk=true
  
  
  
  1.2       +1 -1      db-ojb/src/test/org/apache/ojb/Test_ConnectionDescriptor.xml
  
  Index: Test_ConnectionDescriptor.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/Test_ConnectionDescriptor.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Test_ConnectionDescriptor.xml	11 Feb 2003 19:34:44 -0000	1.1
  +++ Test_ConnectionDescriptor.xml	19 Feb 2003 21:13:26 -0000	1.2
  @@ -7,7 +7,7 @@
   <!DOCTYPE descriptor-repository SYSTEM "repository.dtd">
   
   
  -<descriptor-repository version="0.9.9" isolation-level="read-uncommitted">
  +<descriptor-repository version="1.0" isolation-level="read-uncommitted">
   
       <!--
           NOTE: This is a test descriptor used within
  
  
  
  1.40      +2 -2      db-ojb/src/test/org/apache/ojb/OJB.properties
  
  Index: OJB.properties
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/OJB.properties,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- OJB.properties	13 Feb 2003 20:18:07 -0000	1.39
  +++ OJB.properties	19 Feb 2003 21:13:26 -0000	1.40
  @@ -1,6 +1,6 @@
   # OJB.properties -- configuration of the OJB runtime environment
  -# Version: 0.9.9
  -# (c) 2001, 2002, Apache Software Foundation
  +# Version: 1.0
  +# (c) 2001, 2002, 2003 Apache Software Foundation
   # Author: Thomas Mahler and many others
   #
   #----------------------------------------------------------------------------------------
  
  
  
  1.15      +1 -1      db-ojb/src/test/org/apache/ojb/repository.xml
  
  Index: repository.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- repository.xml	10 Feb 2003 18:15:05 -0000	1.14
  +++ repository.xml	19 Feb 2003 21:13:26 -0000	1.15
  @@ -13,7 +13,7 @@
   ]>
   
   
  -<descriptor-repository version="0.9.9" isolation-level="read-uncommitted">
  +<descriptor-repository version="1.0" isolation-level="read-uncommitted">
   
       <!-- include all used database connections -->
       &database;
  
  
  
  1.2       +1 -1      db-ojb/src/test/org/apache/ojb/Test_ClassDescriptor.xml
  
  Index: Test_ClassDescriptor.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/Test_ClassDescriptor.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Test_ClassDescriptor.xml	11 Feb 2003 19:34:44 -0000	1.1
  +++ Test_ClassDescriptor.xml	19 Feb 2003 21:13:26 -0000	1.2
  @@ -9,7 +9,7 @@
   <!DOCTYPE descriptor-repository SYSTEM "repository.dtd">
   
   
  -<descriptor-repository version="0.9.9" isolation-level="read-uncommitted">
  +<descriptor-repository version="1.0" isolation-level="read-uncommitted">
   
      <!-- Definitions for org.apache.ojb.broker.metadata.MetadataTest$CldTestObject -->
       <class-descriptor
  
  
  
  1.33      +2 -2      db-ojb/src/test/org/apache/ojb/repository.dtd
  
  Index: repository.dtd
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository.dtd,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- repository.dtd	14 Feb 2003 20:36:58 -0000	1.32
  +++ repository.dtd	19 Feb 2003 21:13:26 -0000	1.33
  @@ -1,7 +1,7 @@
   <!--
   	ObJectRelationalBridge - Bridging Java objects and relational dabatases
   	This DTD describes the grammar of the Descriptor repository
  -	Author: Thomas Mahler, (c) 2000, 2001, 2002
  +	Author: Thomas Mahler, (c) 2000, 2001, 2002, 2003
     -->
   
   <!--
  @@ -29,7 +29,7 @@
       of the connection).
     -->
   <!ATTLIST descriptor-repository
  -	version (0.9.9) #REQUIRED
  +	version (1.0) #REQUIRED
   	isolation-level (read-uncommitted | read-committed | repeatable-read |
   	                 serializable | optimistic) "read-uncommitted"
   >
  
  
  
  1.32      +2 -2      db-ojb/src/java/org/apache/ojb/broker/metadata/DescriptorRepository.java
  
  Index: DescriptorRepository.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/DescriptorRepository.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- DescriptorRepository.java	31 Jan 2003 17:03:32 -0000	1.31
  +++ DescriptorRepository.java	19 Feb 2003 21:13:27 -0000	1.32
  @@ -85,7 +85,7 @@
        * The version identifier of the Repository.
        * Used to validate repository.xml against the dtd.
        */
  -    private static final String VERSION = "0.9.9";
  +    private static final String VERSION = "1.0";
       /**
        * the default isolation level used for this repository
        */
  
  
  

Mime
View raw message