tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwilli...@apache.org
Subject svn commit: r375694 - /incubator/tuscany/java/das/rdb/src/test/resources/
Date Tue, 07 Feb 2006 20:44:08 GMT
Author: kwilliams
Date: Tue Feb  7 12:44:03 2006
New Revision: 375694

URL: http://svn.apache.org/viewcvs?rev=375694&view=rev
Log:
Clean-up and changes to conform to latest config xsd

Added:
    incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
      - copied, changed from r374903, incubator/tuscany/java/das/rdb/src/test/resources/1xM_uni_mapping_no_cud.xml
Removed:
    incubator/tuscany/java/das/rdb/src/test/resources/1xM_uni_mapping.xml
    incubator/tuscany/java/das/rdb/src/test/resources/1xM_uni_mapping_no_cud.xml
    incubator/tuscany/java/das/rdb/src/test/resources/1xm_uni.xml
Modified:
    incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml
    incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml
    incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
    incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml
    incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml
    incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
    incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
    incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml
    incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml
    incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml
    incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml
    incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml

Copied: incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml (from r374903,
incubator/tuscany/java/das/rdb/src/test/resources/1xM_uni_mapping_no_cud.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml?p2=incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml&p1=incubator/tuscany/java/das/rdb/src/test/resources/1xM_uni_mapping_no_cud.xml&r1=374903&r2=375694&rev=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/1xM_uni_mapping_no_cud.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml Tue Feb  7 12:44:03
2006
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<Config>
- <!-- <connection>
-  	<URL>jdbc:db2:DASTEST</URL>
-  	<driverName>com.ibm.db2.jcc.DB2Driver</driverName>
-  </connection> -->
-  
-  <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">
-  	<KeyPair>
-        <primaryKeyColumn>ID</primaryKeyColumn>
-        <foreignKeyColumn>CUSTOMER_ID</foreignKeyColumn>
-      </KeyPair>
-  </Relationship>
-  
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
   <Table name="CUSTOMER" propertyName="Customer">
     <Column name="ID" propertyName="iD" primaryKey="true"/>
   </Table>
@@ -20,6 +9,10 @@
   	<Column name="CUSTOMER_ID" propertyName="customerID"/>
     <Column name="ID" propertyName="iD" primaryKey="true"/>
   </Table>
+	
+  <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">
+     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
+  </Relationship>
   
 </Config>
 

Modified: incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml?rev=375694&r1=375693&r2=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml Tue Feb
 7 12:44:03 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/dasmodel3.xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     
     <Command name="all customers" SQL="select * from CUSTOMER" kind="Select"/>
     

Modified: incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml?rev=375694&r1=375693&r2=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml Tue Feb  7
12:44:03 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/dasmodel3.xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     
     <Command name="all customers" SQL="select * from CUSTOMER" kind="Select"/>
     

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml?rev=375694&r1=375693&r2=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml Tue
Feb  7 12:44:03 2006
@@ -1,12 +1,11 @@
-<Config>
-  <Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT"
many="true">
-      <KeyPair primaryKeyColumn="ID" foreignKeyColumn="COMPANYID"/>
-  </Relationship>
+<?xml version="1.0" encoding="ASCII"?>
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
 	<Table name="COMPANY">
 		<Column name="ID" primaryKey="true" generated="true"/>
 		<Column name="NAME"/>
 	</Table>
+	
 	<Table name="DEPARTMENT">
 		<Column name="ID" primaryKey="true" generated="true"/>
 		<Column name="NAME"/>
@@ -14,4 +13,9 @@
 		<Column name="COMPANYID"/>
 		<Column name="EOTM"/>
 	</Table>
+	
+	<Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT"
many="true">
+      <KeyPair primaryKeyColumn="ID" foreignKeyColumn="COMPANYID"/>
+    </Relationship>
+	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml?rev=375694&r1=375693&r2=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml Tue Feb  7 12:44:03
2006
@@ -1,4 +1,5 @@
-<Config>
+<?xml version="1.0" encoding="ASCII"?>
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<Table name="COMPANY">
 		<Column name="ID" primaryKey="true" generated="true"/>
 		<Column name="NAME"/>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml?rev=375694&r1=375693&r2=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml Tue Feb  7
12:44:03 2006
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="ASCII"?>
-<Config>
-<!--  <connection>
-  	<URL>jdbc:db2:DASTEST</URL>
-  	<driverName>com.ibm.db2.jcc.DB2Driver</driverName>
-  </connection> -->
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
   <Table name="CUSTOMER">
     <Column name="ID" primaryKey="true"/>
     <Column name="LASTNAME"/>
     <Column name="ADDRESS"/> 
   </Table>
+	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml?rev=375694&r1=375693&r2=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml Tue
Feb  7 12:44:03 2006
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="ASCII"?>
-<Config>
-<!--  <connection>
-  	<URL>jdbc:db2:DASTEST</URL>
-  	<driverName>com.ibm.db2.jcc.DB2Driver</driverName>
-  </connection> -->
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
-  <Table name="CUSTOMER">
+  <Table name="CUSTOMER"
+	  create="insert into customer values (:ID, :LASTNAME, :ADDRESS)"
+	  update="update customer set lastname = :LASTNAME, address = :ADDRESS where ID = :ID"
+      delete="delete from customer where ID = :ID">
     <Column name="ID" primaryKey="true"/>
     <Column name="LASTNAME"/>
     <Column name="ADDRESS"/> 
-    <create>insert into customer values (:ID, :LASTNAME, :ADDRESS)</create>
-    <update>update customer set lastname = :LASTNAME, address = :ADDRESS where ID =
:ID</update>
-    <delete>delete from customer where ID = :ID</delete>
   </Table>
+	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml?rev=375694&r1=375693&r2=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
Tue Feb  7 12:44:03 2006
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="ASCII"?>
-<Config>
-  <Table name="CUSTOMER">
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <Table name="CUSTOMER"
+	  create="insert into customer blah values (:ID, :LASTNAME, :ADDRESS)"
+	  update="update customer blah set lastname = :LASTNAME, address = :ADDRESS where ID = :ID"
+      delete="delete from customer blah where ID = :ID">
     <Column name="ID" primaryKey="true"/>
     <Column name="LASTNAME"/>
-    <Column name="ADDRESS"/>
-    <create>insert into customer values blah (:ID, :LASTNAME, :ADDRESS)</create>
-    <update>update customer set blah lastname = :LASTNAME, address = :ADDRESS where
ID = :ID</update>
-    <delete>delete from customer blah where ID = :ID</delete>
+    <Column name="ADDRESS"/> 
   </Table>
+	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml?rev=375694&r1=375693&r2=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml Tue Feb
 7 12:44:03 2006
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<Config>
-  <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">
-      <KeyPair>
-        <primaryKeyColumn>ID</primaryKeyColumn>
-        <foreignKeyColumn>CUSTOMER_ID</foreignKeyColumn>
-      </KeyPair>
-  </Relationship>
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	
   <Table name="CUSTOMER">
   	<Column name="ID" primaryKey="true"/>
   </Table>
@@ -13,6 +8,10 @@
   	<Column name="ID" primaryKey="true"/>
   	<Column name="CUSTOMER_ID"/>
   </Table>
+	
+  <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">
+     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
+  </Relationship>	
   
 </Config>
 

Modified: incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml?rev=375694&r1=375693&r2=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml Tue Feb  7 12:44:03 2006
@@ -1,11 +1,6 @@
-<Config>
-  <Relationship name="cities" primaryKeyTable="STATES" foreignKeyTable="CITIES" many="true">
-      <KeyPair>
-        <primaryKeyColumn>ID</primaryKeyColumn>
-        <foreignKeyColumn>STATE_ID</foreignKeyColumn>
-      </KeyPair>
-  </Relationship>
-  
+<?xml version="1.0" encoding="ASCII"?>
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ 
 	<Table name="STATES">
 		<Column name="ID" primaryKey="true"/>
 		<Column name="NAME"/>
@@ -18,4 +13,10 @@
 		<Column name="STATE_ID"/>
 	
 	</Table>
+	
+  <Relationship name="cities" primaryKeyTable="STATES" foreignKeyTable="CITIES" many="true">
+     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="STATE_ID"/>
+  </Relationship>	
+	
+	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml?rev=375694&r1=375693&r2=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml Tue Feb  7 12:44:03
2006
@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<Config>
-
-  <Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT"
many="true">
-      <KeyPair>
-        <primaryKeyColumn>ID</primaryKeyColumn>
-        <foreignKeyColumn>COMPANYID</foreignKeyColumn>
-      </KeyPair>
-  </Relationship>
-  
-  <Relationship name="employees" primaryKeyTable="DEPARTMENT" foreignKeyTable="EMPLOYEE"
many="true">
-  		<KeyPair>
-  			<primaryKeyColumn>ID</primaryKeyColumn>
-  			<foreignKeyColumn>DEPARTMENTID</foreignKeyColumn>
-  		</KeyPair>
-  </Relationship>
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
   <Table name="COMPANY" propertyName="CompanyType">
     <Column name="ID" primaryKey="true"/>
@@ -26,4 +12,12 @@
   	  <Column name="ID" primaryKey="true"/>
   </Table>
   
+  <Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT"
many="true">
+     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="COMPANYID"/>
+  </Relationship>	
+
+  <Relationship name="employees" primaryKeyTable="DEPARTMENT" foreignKeyTable="EMPLOYEE"
many="true">
+     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="DEPARTMENTID"/>
+  </Relationship>	
+	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml?rev=375694&r1=375693&r2=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml Tue Feb  7 12:44:03
2006
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="ASCII"?>
-<Config>
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
   <Table name="CUSTOMER" propertyName="Customer">
     <Column name="ID" propertyName="id" primaryKey="true"/>
     <Column name="LASTNAME" propertyName="lastname"/>
     <Column name="ADDRESS" propertyName="address"/>
   </Table>
+	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml?rev=375694&r1=375693&r2=375694&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
Tue Feb  7 12:44:03 2006
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<Config>
-  <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">
-      <KeyPair>
-        <primaryKeyColumn>ID</primaryKeyColumn>
-        <foreignKeyColumn>CUSTOMER_ID</foreignKeyColumn>
-      </KeyPair>
-  </Relationship>
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
   <Table name="CUSTOMER">
   	<Column name="ID" primaryKey="true"/>
@@ -14,5 +8,9 @@
   	<Column name="ID" primaryKey="true"/>
   </Table>
   
+  <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">
+     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
+  </Relationship>	
+	
 </Config>
 



Mime
View raw message