tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwilli...@apache.org
Subject svn commit: r412513 [2/2] - in /incubator/tuscany/java: das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/ das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/ das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl...
Date Wed, 07 Jun 2006 20:00:49 GMT
Modified: incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml Wed Jun  7 13:00:47
2006
@@ -16,9 +16,9 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     
-    <Table name="BOOK">
-        <Column name="BOOK_ID" primaryKey="true"/>
-	    <Column name="OCC" collision="true"/>
+    <Table tableName="BOOK">
+        <Column columnName="BOOK_ID" primaryKey="true"/>
+	    <Column columnName="OCC" collision="true"/>
     </Table>
     
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml Wed Jun  7 13:00:47
2006
@@ -29,15 +29,12 @@
 -->  
 
 
-    <ConnectionProperties driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
-        driverURL="jdbc:derby:dastest"/>
-
-    <Table name="COMPANY">
-        <Column name="ID" primaryKey="true" generated="true"/>
+    <Table tableName="COMPANY">
+        <Column columnName="ID" primaryKey="true" generated="true"/>
     </Table>
     
-	<Table name="DEPARTMENT">
-		<Column name="ID" primaryKey="true" generated="true"/>
+	<Table tableName="DEPARTMENT">
+		<Column columnName="ID" primaryKey="true" generated="true"/>
 	</Table>
 	
 	<Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT"
many="true">

Modified: incubator/tuscany/java/das/rdb/src/test/resources/CompanyEmployeeConfig.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CompanyEmployeeConfig.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CompanyEmployeeConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CompanyEmployeeConfig.xml Wed Jun  7
13:00:47 2006
@@ -44,19 +44,17 @@
   	</Command>
 	-->
   	
-    <ConnectionProperties driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
-        driverURL="jdbc:derby:dastest"/>
 
-	<Table name="COMPANY">
-    	<Column name="ID" primaryKey="true" generated="true"/>
+	<Table tableName="COMPANY">
+    	<Column columnName="ID" primaryKey="true" generated="true"/>
   	</Table>
   
-  	<Table name="DEPARTMENT">
-   		<Column name="ID" primaryKey="true" generated="true"/>
+  	<Table tableName="DEPARTMENT">
+   		<Column columnName="ID" primaryKey="true" generated="true"/>
   	</Table>
   		
-  	<Table name="EMPLOYEE">
-  	  	<Column name="ID" primaryKey="true" generated="true"/>
+  	<Table tableName="EMPLOYEE">
+  	  	<Column columnName="ID" primaryKey="true" generated="true"/>
   	</Table>	
 	  	
 	<Relationship name="company->employee" primaryKeyTable="EMPLOYEE" foreignKeyTable="COMPANY"
many="false" >

Modified: incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml Wed Jun
 7 13:00:47 2006
@@ -40,17 +40,14 @@
         SQL="update CUSTOMER set LASTNAME = 'Pavick' where ID = :ID"
         kind="Update">
         <Parameter name=":ID"/>
-    </Command>
+    </Command>      
     
-    <ConnectionProperties driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
-        driverURL="jdbc:derby:dastest"/>
-    
-    <Table name="CUSTOMER">
-        <Column name="ID" primaryKey="true"/>
+    <Table tableName="CUSTOMER">
+        <Column columnName="ID" primaryKey="true"/>
     </Table>
     
-    <Table name="ANORDER">
-        <Column name="ID" primaryKey="true"/>
+    <Table tableName="ANORDER">
+        <Column columnName="ID" primaryKey="true"/>
     </Table>
     
     <Relationship name="orders" primaryKeyTable="CUSTOMER"

Modified: incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter.xml Wed
Jun  7 13:00:47 2006
@@ -16,9 +16,9 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <Table name="CUSTOMER">
-	<Column name="ID" primaryKey="true"/>
-    <Column name="LASTNAME" converterClassName="org.apache.tuscany.das.rdb.test.mappings.SillyDateStringConverter"/>
+  <Table tableName="CUSTOMER">
+	<Column columnName="ID" primaryKey="true"/>
+    <Column columnName="LASTNAME" converterClassName="org.apache.tuscany.das.rdb.test.mappings.SillyDateStringConverter"/>
   </Table>
 	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml Wed
Jun  7 13:00:47 2006
@@ -16,8 +16,8 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <Table name="CUSTOMER">
-    <Column name="ID" converterClassName="org.apache.tuscany.das.rdb.test.mappings.StringToLongConverter"/>
+  <Table tableName="CUSTOMER">
+    <Column columnName="ID" converterClassName="org.apache.tuscany.das.rdb.test.mappings.StringToLongConverter"/>
   </Table>
 	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml Wed Jun  7
13:00:47 2006
@@ -29,12 +29,12 @@
         <Parameter name=":ID"/>
     </Command>
     
-    <Table name="CUSTOMER">
-        <Column name="ID" primaryKey="true"/>
+    <Table tableName="CUSTOMER">
+        <Column columnName="ID" primaryKey="true"/>
     </Table>
     
-    <Table name="ANORDER">
-        <Column name="ID" primaryKey="true"/>
+    <Table tableName="ANORDER">
+        <Column columnName="ID" primaryKey="true"/>
     </Table>
     
     <Relationship name="orders" primaryKeyTable="CUSTOMER"

Modified: incubator/tuscany/java/das/rdb/src/test/resources/InvalidConfig1.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/InvalidConfig1.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/InvalidConfig1.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/InvalidConfig1.xml Wed Jun  7 13:00:47
2006
@@ -16,9 +16,9 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	
-    <Table name="ORDERDETAILS">
-        <Column name="ORDERID" primaryKey="true"/>
-        <Column name="PRODUCTID" primaryKey="true"/>
+    <Table tableName="ORDERDETAILS">
+        <Column columnName="ORDERID" primaryKey="true"/>
+        <Column columnName="PRODUCTID" primaryKey="true"/>
     </Table>
  
 	   

Modified: incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml Wed Jun
 7 13:00:47 2006
@@ -16,9 +16,9 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	
-	<Table name="ORDERDETAILS">
-        <Column name="ORDERID" primaryKey="true"/>
-        <Column name="PRODUCTID" primaryKey="true"/>
+	<Table tableName="ORDERDETAILS">
+        <Column columnName="ORDERID" primaryKey="true"/>
+        <Column columnName="PRODUCTID" primaryKey="true"/>
     </Table>
  
 	   

Modified: incubator/tuscany/java/das/rdb/src/test/resources/PartsConfig.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/PartsConfig.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/PartsConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/PartsConfig.xml Wed Jun  7 13:00:47
2006
@@ -16,8 +16,8 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
-  <Table name="PART">
-  	<Column name="ID" primaryKey="true"/>
+  <Table tableName="PART">
+  	<Column columnName="ID" primaryKey="true"/>
   </Table>
   
   <Relationship name="subparts" primaryKeyTable="PART" foreignKeyTable="PART" many="true">

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml Wed
Jun  7 13:00:47 2006
@@ -16,17 +16,17 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/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 tableName="COMPANY">
+		<Column columnName="ID" primaryKey="true" generated="true"/>
+		<Column columnName="NAME"/>
 	</Table>
 	
-	<Table name="DEPARTMENT">
-		<Column name="ID" primaryKey="true" generated="true"/>
-		<Column name="NAME"/>
-		<Column name="NUMBER"/>
-		<Column name="COMPANYID"/>
-		<Column name="EOTM"/>
+	<Table tableName="DEPARTMENT">
+		<Column columnName="ID" primaryKey="true" generated="true"/>
+		<Column columnName="NAME"/>
+		<Column columnName="NUMBER"/>
+		<Column columnName="COMPANYID"/>
+		<Column columnName="EOTM"/>
 	</Table>
 	
 	<Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT"
many="true">

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml Wed Jun  7 13:00:47
2006
@@ -15,8 +15,8 @@
   limitations under the License.
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/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 tableName="COMPANY">
+		<Column columnName="ID" primaryKey="true" generated="true"/>
+		<Column columnName="NAME"/>
 	</Table>
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml Wed Jun  7
13:00:47 2006
@@ -16,10 +16,10 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/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 tableName="CUSTOMER">
+    <Column columnName="ID" primaryKey="true"/>
+    <Column columnName="LASTNAME"/>
+    <Column columnName="ADDRESS"/> 
   </Table>
 	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml Wed
Jun  7 13:00:47 2006
@@ -16,13 +16,13 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <Table name="CUSTOMER"
+  <Table tableName="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"/> 
+    <Column columnName="ID" primaryKey="true"/>
+    <Column columnName="LASTNAME"/>
+    <Column columnName="ADDRESS"/> 
   </Table>
 	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml Wed
Jun  7 13:00:47 2006
@@ -16,13 +16,13 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <Table name="CUSTOMER"
+  <Table tableName="CUSTOMER"
 	  create="insert into customer values (:ID, :LASTNAME, :ADDRESS)"
 	  update="update customer set lastname = :LASTNAME where ID = :ID"
       delete="delete from customer where ID = :ID">
-    <Column name="ID" primaryKey="true"/>
-    <Column name="LASTNAME"/>
-    <Column name="ADDRESS"/> 
+    <Column columnName="ID" primaryKey="true"/>
+    <Column columnName="LASTNAME"/>
+    <Column columnName="ADDRESS"/> 
   </Table>
 	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
Wed Jun  7 13:00:47 2006
@@ -16,13 +16,13 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <Table name="CUSTOMER"
+  <Table tableName="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"/> 
+    <Column columnName="ID" primaryKey="true"/>
+    <Column columnName="LASTNAME"/>
+    <Column columnName="ADDRESS"/> 
   </Table>
 	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml Wed Jun
 7 13:00:47 2006
@@ -16,12 +16,12 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	
-  <Table name="CUSTOMER">
-  	<Column name="ID" primaryKey="true"/>
+  <Table tableName="CUSTOMER">
+  	<Column columnName="ID" primaryKey="true"/>
   </Table>
-  <Table name="ANORDER">
-  	<Column name="ID" primaryKey="true"/>
-  	<Column name="CUSTOMER_ID"/>
+  <Table tableName="ANORDER">
+  	<Column columnName="ID" primaryKey="true"/>
+  	<Column columnName="CUSTOMER_ID"/>
   </Table>
 	
   <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">

Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml Wed Jun  7 13:00:47
2006
@@ -16,10 +16,10 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
-  <Table name="CUSTOMER" propertyName="Customer">
-    <Column name="ID" primaryKey="true"/>
-    <Column name="LASTNAME"/>
-    <Column name="ADDRESS"/> 
+  <Table tableName="CUSTOMER" typeName="Customer">
+    <Column columnName="ID" primaryKey="true"/>
+    <Column columnName="LASTNAME"/>
+    <Column columnName="ADDRESS"/> 
   </Table>
 	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml Wed Jun  7 13:00:47 2006
@@ -16,16 +16,16 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  
-	<Table name="STATES">
-		<Column name="ID" primaryKey="true"/>
-		<Column name="NAME"/>
+	<Table tableName="STATES">
+		<Column columnName="ID" primaryKey="true"/>
+		<Column columnName="NAME"/>
 	</Table>
 	
-	<Table name="CITIES">
+	<Table tableName="CITIES">
 		
-		<Column name="ID" primaryKey="true"/>
-		<Column name="NAME"/>
-		<Column name="STATE_ID"/>
+		<Column columnName="ID" primaryKey="true"/>
+		<Column columnName="NAME"/>
+		<Column columnName="STATE_ID"/>
 	
 	</Table>
 	

Modified: incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml Wed Jun  7 13:00:47
2006
@@ -16,16 +16,16 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
-  <Table name="COMPANY" propertyName="CompanyType">
-    <Column name="ID" primaryKey="true"/>
+  <Table tableName="COMPANY" typeName="CompanyType">
+    <Column columnName="ID" primaryKey="true"/>
   </Table>
   
-  <Table name="DEPARTMENT" propertyName="DepartmentType">
-    <Column name="ID" primaryKey="true"/>
+  <Table tableName="DEPARTMENT" typeName="DepartmentType">
+    <Column columnName="ID" primaryKey="true"/>
   </Table>
 
-  <Table name="EMPLOYEE" propertyName="EmployeeType">
-  	  <Column name="ID" primaryKey="true"/>
+  <Table tableName="EMPLOYEE" typeName="EmployeeType">
+  	  <Column columnName="ID" primaryKey="true"/>
   </Table>
   
   <Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT"
many="true">

Modified: incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml Wed
Jun  7 13:00:47 2006
@@ -16,18 +16,18 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
-  <Table name="COMPANY" propertyName="CompanyType">
-    <Column name="ID" primaryKey="true"/>
+  <Table tableName="COMPANY" typeName="CompanyType">
+    <Column columnName="ID" primaryKey="true"/>
   </Table>
   
-  <Table name="DEPARTMENT" propertyName="DepartmentType">
-    <Column name="ID" primaryKey="true"/>
-    <Column name="NUMBER" converterClassName="org.apache.tuscany.das.rdb.test.mappings.StringToIntegerConverter"/>
+  <Table tableName="DEPARTMENT" typeName="DepartmentType">
+    <Column columnName="ID" primaryKey="true"/>
+    <Column columnName="NUMBER" converterClassName="org.apache.tuscany.das.rdb.test.mappings.StringToIntegerConverter"/>
   </Table>
 
-  <Table name="EMPLOYEE" propertyName="EmployeeType">
-  	  <Column name="ID" primaryKey="true"/>
-  	  <Column name="MANAGER" converterClassName="org.apache.tuscany.das.rdb.test.mappings.IntegerToBooleanConverter"/>
+  <Table tableName="EMPLOYEE" typeName="EmployeeType">
+  	  <Column columnName="ID" primaryKey="true"/>
+  	  <Column columnName="MANAGER" converterClassName="org.apache.tuscany.das.rdb.test.mappings.IntegerToBooleanConverter"/>
   </Table>	
 	
   <Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT"
many="true">

Modified: incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml Wed Jun  7 13:00:47
2006
@@ -16,10 +16,10 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/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 tableName="CUSTOMER" typeName="Customer">
+    <Column columnName="ID" propertyName="id" primaryKey="true"/>
+    <Column columnName="LASTNAME" propertyName="lastname"/>
+    <Column columnName="ADDRESS" propertyName="address"/>
   </Table>
 	
 </Config>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
Wed Jun  7 13:00:47 2006
@@ -16,11 +16,11 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
-  <Table name="CUSTOMER">
-  	<Column name="ID" primaryKey="true"/>
+  <Table tableName="CUSTOMER">
+  	<Column columnName="ID" primaryKey="true"/>
   </Table>
-  <Table name="ANORDER">
-  	<Column name="ID" primaryKey="true"/>
+  <Table tableName="ANORDER">
+  	<Column columnName="ID" primaryKey="true"/>
   </Table>
   
   <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">

Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/DasAccountConfiguration.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/DasAccountConfiguration.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/DasAccountConfiguration.xml
(original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/DasAccountConfiguration.xml
Wed Jun  7 13:00:47 2006
@@ -16,51 +16,51 @@
  -->
 <Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
-  <Table name="CUSTOMERS" propertyName="CustomerProfileData">
+  <Table tableName="CUSTOMERS" typeName="CustomerProfileData">
     <!-- Column name="firstName" primaryKey="true"/ -->
-    <Column name="FIRSTNAME"/>
-    <Column name="LASTNAME"/> 
-    <Column name="ADDRESS"/> 
-    <Column name="EMAIL"/>
-     <Column name="LOGINID"/> 
-     <Column name="PASSWORD"/> 
-      <Column name="ID"/> 
+    <Column columnName="FIRSTNAME"/>
+    <Column columnName="LASTNAME"/> 
+    <Column columnName="ADDRESS"/> 
+    <Column columnName="EMAIL"/>
+     <Column columnName="LOGINID"/> 
+     <Column columnName="PASSWORD"/> 
+      <Column columnName="ID"/> 
   </Table>
   
-  <Table name="ACCOUNTS" propertyName="AccountSummary">
+  <Table tableName="ACCOUNTS" typeName="AccountSummary">
     <!-- Column name="firstName" primaryKey="true"/ -->
-    <Column name="ACCOUNTNUMBER"/>
-    <Column name="BALANCE"/> 
+    <Column columnName="ACCOUNTNUMBER"/>
+    <Column columnName="BALANCE"/> 
   </Table>
 
 
 
-  <Table name="STOCKS" propertyName="StockSummary" >
-    <Column name="ID"/>
-    <Column name="Symbol"/>
-    <Column name="quantity"/>
-    <Column name="purchasePrice"/>
-    <Column name="PURCHASEDATE" converterClassName="bigbank.account.services.accountdata.AccountDataServiceDASImpl$DateConverter"/>
+  <Table tableName="STOCKS" typeName="StockSummary" >
+    <Column columnName="ID"/>
+    <Column columnName="Symbol"/>
+    <Column columnName="quantity"/>
+    <Column columnName="purchasePrice"/>
+    <Column columnName="PURCHASEDATE" converterClassName="bigbank.account.services.accountdata.AccountDataServiceDASImpl$DateConverter"/>
   </Table>
 
 	
-  <Table name="ACCTLOG" propertyName="AccountLogEntry">
-    <Column name="logSeqNo"/>
-    <Column name="ID"/> 
-    <Column name="ACCOUNTNUMBER"/>
-    <Column name="ACTIONTYPE"/>
-    <Column name="AMOUNT"/> 
+  <Table tableName="ACCTLOG" typeName="AccountLogEntry">
+    <Column columnName="logSeqNo"/>
+    <Column columnName="ID"/> 
+    <Column columnName="ACCOUNTNUMBER"/>
+    <Column columnName="ACTIONTYPE"/>
+    <Column columnName="AMOUNT"/> 
   </Table>
 
 
 
-  <Table name="STOCKLOG" propertyName="StockLogEntry" >
-    <Column name="logSeqNo"/>
-    <Column name="ID"/>
-    <Column name="Symbol"/>
-    <Column name="quantity"/>
-    <Column name="actionType"/>
-    <Column name="purchaseLotNumber"/>
+  <Table tableName="STOCKLOG" typeName="StockLogEntry" >
+    <Column columnName="logSeqNo"/>
+    <Column columnName="ID"/>
+    <Column columnName="Symbol"/>
+    <Column columnName="quantity"/>
+    <Column columnName="actionType"/>
+    <Column columnName="purchaseLotNumber"/>
   </Table>
 
 	

Modified: incubator/tuscany/java/samples/das/companyweb/src/main/resources/CompanyConfig.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/das/companyweb/src/main/resources/CompanyConfig.xml?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/samples/das/companyweb/src/main/resources/CompanyConfig.xml (original)
+++ incubator/tuscany/java/samples/das/companyweb/src/main/resources/CompanyConfig.xml Wed
Jun  7 13:00:47 2006
@@ -14,7 +14,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  -->
-<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    dataSource="java:comp/env/jdbc/dastest">
     
     <Command name="all companies" SQL="select * from COMPANY" kind="Select"/>
     
@@ -24,20 +25,13 @@
 
     <Command name="company by id with departments" SQL="select * from COMPANY left outer
join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = :ID" kind="Select"/>
 	
-
-	   <ConnectionProperties dataSource="java:comp/env/jdbc/dastest"/>
  
-
-<!--
-    <ConnectionProperties driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
-        driverURL="jdbc:derby:dastest"/>
---> 
-    <Table name="COMPANY">
-        <Column name="ID" primaryKey="true" generated="true"/>
+    <Table tableName="COMPANY">
+        <Column columnName="ID" primaryKey="true" generated="true"/>
     </Table>
     
-	<Table name="DEPARTMENT">
-		<Column name="ID" primaryKey="true" generated="true"/>
+	<Table tableName="DEPARTMENT">
+		<Column columnName="ID" primaryKey="true" generated="true"/>
 	</Table>
 	
 	<Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT"
many="true">



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message