From ad0e368eeedb0454e1dd398bd84c23cbfbd692f8 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 2 Nov 2009 22:23:40 +0000
Subject: Moving das tags

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@832150 13f79535-47bb-0310-9956-ffa450edef68
---
 .../rdb/src/test/resources/1xM_mapping_no_cud.xml  | 36 --------------
 .../rdb/src/test/resources/BooksConfig.xml         | 30 ------------
 .../src/test/resources/BooksConfigWithAlias.xml    | 36 --------------
 .../rdb/src/test/resources/CompanyConfig.xml       | 43 ----------------
 .../src/test/resources/CompanyEmployeeConfig.xml   | 54 --------------------
 .../rdb/src/test/resources/CustomerConfig.xml      | 24 ---------
 .../test/resources/CustomerConfigWithConverter.xml | 33 -------------
 .../resources/CustomerConfigWithConverter2.xml     | 29 -----------
 .../resources/CustomerConfigWithIDConverter.xml    | 32 ------------
 .../src/test/resources/CustomersOrdersConfig.xml   | 51 -------------------
 .../rdb/src/test/resources/InvalidConfig1.xml      | 32 ------------
 .../rdb/src/test/resources/InvalidConverter.xml    | 36 --------------
 .../rdb/src/test/resources/ManagedBooksConfig.xml  | 30 ------------
 .../src/test/resources/MultiSchemaDasConfig1.xml   | 36 --------------
 .../src/test/resources/MultiSchemaDasConfig12.xml  | 33 -------------
 .../src/test/resources/MultiSchemaDasConfig13.xml  | 34 -------------
 .../src/test/resources/MultiSchemaDasConfig14.xml  | 37 --------------
 .../src/test/resources/MultiSchemaDasConfig2.xml   | 45 -----------------
 .../src/test/resources/MultiSchemaDasConfig3.xml   | 32 ------------
 .../src/test/resources/MultiSchemaDasConfig5.xml   | 32 ------------
 .../src/test/resources/MultiSchemaDasConfig6.xml   | 38 ---------------
 .../src/test/resources/MultiSchemaDasConfig7.xml   | 26 ----------
 .../src/test/resources/MultiSchemaDasConfig8.xml   | 34 -------------
 .../src/test/resources/MultiSchemaDasConfig9.xml   | 30 ------------
 .../test/resources/MultiSchemaInvalidDasConfig.xml | 47 ------------------
 .../test/resources/OneToOneRestrictedConfig.xml    | 54 --------------------
 .../test/resources/OrderDetailsAndDescription.xml  | 35 -------------
 .../test/resources/OrdersOrderDetailsConfig.xml    | 36 --------------
 .../rdb/src/test/resources/PartsConfig.xml         | 50 -------------------
 .../resources/basicCompanyDepartmentMapping.xml    | 39 ---------------
 .../rdb/src/test/resources/basicCompanyMapping.xml | 25 ----------
 .../src/test/resources/basicCustomerMapping.xml    | 29 -----------
 .../test/resources/basicCustomerMappingWithCUD.xml | 28 -----------
 .../resources/basicCustomerMappingWithCUD2.xml     | 31 ------------
 .../basicCustomerMappingWithInvalidCUD.xml         | 32 ------------
 .../test/resources/basicCustomerOrderMapping.xml   | 35 -------------
 .../rdb/src/test/resources/basicStaticCustomer.xml | 28 -----------
 .../rdb/src/test/resources/cityStates.xml          | 40 ---------------
 .../rdb/src/test/resources/company.xsd             | 48 ------------------
 .../rdb/src/test/resources/companyMapping.xml      | 42 ----------------
 .../resources/companyMappingWithConverters.xml     | 44 -----------------
 .../companyMappingWithResultDescriptor.xml         | 57 ----------------------
 .../rdb/src/test/resources/customer.xsd            | 43 ----------------
 .../rdb/src/test/resources/customerMapping.xml     | 28 -----------
 .../resources/customerOrderRelationshipMapping.xml | 34 -------------
 .../rdb/src/test/resources/passiveConnection.xml   | 26 ----------
 .../rdb/src/test/resources/staticCustomer.xml      | 23 ---------
 .../rdb/src/test/resources/staticCustomerOrder.xml | 36 --------------
 .../rdb/src/test/resources/staticInvalid.xml       | 23 ---------
 .../rdb/src/test/resources/storedProcTest.xml      | 27 ----------
 50 files changed, 1783 deletions(-)
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/1xM_mapping_no_cud.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/BooksConfig.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/BooksConfigWithAlias.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CompanyConfig.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CompanyEmployeeConfig.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfig.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfigWithConverter.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfigWithConverter2.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomersOrdersConfig.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/InvalidConfig1.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/InvalidConverter.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/ManagedBooksConfig.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig1.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig12.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig13.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig14.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig2.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig3.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig5.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig6.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig7.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig8.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig9.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaInvalidDasConfig.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/OneToOneRestrictedConfig.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/OrderDetailsAndDescription.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/PartsConfig.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCompanyMapping.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMapping.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerOrderMapping.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicStaticCustomer.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/cityStates.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/company.xsd
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/companyMapping.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/companyMappingWithConverters.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/companyMappingWithResultDescriptor.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/customer.xsd
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/customerMapping.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/customerOrderRelationshipMapping.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/passiveConnection.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/staticCustomer.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/staticCustomerOrder.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/staticInvalid.xml
 delete mode 100644 tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/storedProcTest.xml

(limited to 'tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources')

diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/1xM_mapping_no_cud.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/1xM_mapping_no_cud.xml
deleted file mode 100644
index 95267de08b..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/1xM_mapping_no_cud.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-
-  <Table tableName="CUSTOMER" typeName="Customer">
-    <Column columnName="ID" propertyName="ID" primaryKey="true"/>
-  </Table>
-  
-  <Table tableName="ANORDER" typeName="AnOrder">
-  	<Column columnName="CUSTOMER_ID" propertyName="Customer_ID"/>
-    <Column columnName="ID" propertyName="ID" primaryKey="true"/>
-  </Table>
-	
-  <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">
-     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
-  </Relationship>
-  
-</Config>
-
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/BooksConfig.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/BooksConfig.xml
deleted file mode 100644
index 2da86cbdb2..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/BooksConfig.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-
-    <Command name="select book 1" SQL="select * from BOOK where BOOK_ID = 1" kind="Select"/>
-    <Command name="update book 1" SQL="update BOOK set OCC = ? where BOOK_ID = 1" kind="Update"/>
-
-	<Table tableName="BOOK">
-        <Column columnName="BOOK_ID" primaryKey="true"/>
-	    <Column columnName="OCC" collision="true" propertyName="anOccColumn"/>
-    </Table>
-    
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/BooksConfigWithAlias.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/BooksConfigWithAlias.xml
deleted file mode 100644
index 91bdccfac5..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/BooksConfigWithAlias.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-     
-    <Command name="get all books" SQL="SELECT * FROM BOOK" kind="Select"/>
-    
-    <Command name="get Cat in the Hat" SQL="SELECT * FROM BOOK WHERE NAME = 'Cat in the Hat'" kind="Select"/>
-    
-    <Command name="get book by ID" SQL="SELECT * FROM BOOK WHERE BOOK.BOOK_ID = ?" kind="Select"/>
-    
-    
-    
-    <Table tableName="BOOK" typeName="Book">
-        <Column columnName="BOOK_ID" primaryKey="true"/>
-        <Column columnName="AUTHOR" propertyName="Writer"/>
-	    <Column columnName="OCC" collision="true"/>
-    </Table>
-    
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CompanyConfig.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CompanyConfig.xml
deleted file mode 100644
index 793697c314..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CompanyConfig.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-    
-    <Command name="all companies" SQL="select * from COMPANY" kind="Select"/>
-    
-    <Command name="all companies and departments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID" kind="Select"/>
-
-    <Command name="all departments for company" SQL="select * from COMPANY inner join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = ?" kind="Select"/>
-
-    <Command name="company by id with departments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = ?" kind="Select"/>
-
-    <Table tableName="COMPANY">
-        <Column columnName="ID" primaryKey="true" generated="true"/>
-    </Table>
-    
-	<Table tableName="DEPARTMENT">
-		<Column columnName="ID" primaryKey="true" generated="true"/>
-	</Table>
-	
-	<Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT" many="true">
-      <KeyPair primaryKeyColumn="ID" foreignKeyColumn="COMPANYID"/>
-    </Relationship>
-	
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CompanyEmployeeConfig.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CompanyEmployeeConfig.xml
deleted file mode 100644
index 0e25268afa..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CompanyEmployeeConfig.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-		
-	<Command name="get all companies" SQL="select * from COMPANY" kind = "Select"/>
-	
-	<Command name="get named employee" SQL="select * from EMPLOYEE where NAME= ?" kind = "Select"/>
-  	
-	<Command name="get named employee with company" 
-		SQL="select * from EMPLOYEE left outer join COMPANY on EMPLOYEE.ID = COMPANY.EOTMID where EMPLOYEE.NAME= ?" kind = "Select"/>
-
-	<Command name="get employee by ID" SQL="select * from EMPLOYEE where ID= ?" kind = "Select"/>
-  	
-  	<Command name="get all employees" SQL="select * from EMPLOYEE" kind = "Select"/>
-  	
-    <Command name="get companies with employee of the month" 
-		SQL="select * from COMPANY left outer join EMPLOYEE on COMPANY.EOTMID = EMPLOYEE.ID" kind="Select"/>
-
-
-	<Table tableName="COMPANY">
-    	<Column columnName="ID" primaryKey="true" generated="true"/>
-  	</Table>
-  
-  	<Table tableName="DEPARTMENT">
-   		<Column columnName="ID" primaryKey="true" generated="true"/>
-  	</Table>
-  		
-  	<Table tableName="EMPLOYEE">
-  	  	<Column columnName="ID" primaryKey="true" generated="true"/>
-  	</Table>	
-	  	
-	<Relationship name="company->employee" primaryKeyTable="EMPLOYEE" foreignKeyTable="COMPANY" many="false" >
-      	<KeyPair primaryKeyColumn="ID" foreignKeyColumn="EOTMID" />
-  	</Relationship>
-			
-</Config>
-			
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfig.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfig.xml
deleted file mode 100644
index ed544f39dd..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfig.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-	
-  <Command name="getCustomer" SQL="Select * from CUSTOMER where ID = ?" kind="Select"/>
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfigWithConverter.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfigWithConverter.xml
deleted file mode 100644
index b38922b53a..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfigWithConverter.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-	
-	<Command name="testArbitraryConverter" SQL="Select * from CUSTOMER where ID = 1" kind="Select">
- 		<ResultDescriptor columnName="ID" tableName="CUSTOMER" columnType="commonj.sdo.IntObject"/>
- 		<ResultDescriptor columnName="LASTNAME" tableName="CUSTOMER" columnType="commonj.sdo.Date"/>
- 		<ResultDescriptor columnName="ADDRESS" tableName="CUSTOMER" columnType="commonj.sdo.String"/>
- 	</Command>
- 	
-  <Table tableName="CUSTOMER">
-	<Column columnName="ID" primaryKey="true"/>
-    <Column columnName="LASTNAME" converterClassName="org.apache.tuscany.das.rdb.test.mappings.SillyDateStringConverter"/>
-  </Table>
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfigWithConverter2.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfigWithConverter2.xml
deleted file mode 100644
index bb49a414c4..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfigWithConverter2.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-	
-  <Command name="getFirstCustomer" SQL="Select * from CUSTOMER where ID = 1" kind="Select"/>
-
-  <Table tableName="CUSTOMER">
-	<Column columnName="ID" primaryKey="true"/>
-    <Column columnName="LASTNAME" converterClassName="org.apache.tuscany.das.rdb.test.mappings.StringObfuscationConverter"/>
-  </Table>
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfigWithIDConverter.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
deleted file mode 100644
index 9a567b7ea8..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-
- 	<Command name="literal" SQL="Select 99, 'Roosevelt', '1600 Pennsylvania Avenue' from customer" kind="Select">
- 		<ResultDescriptor columnName="ID" tableName="CUSTOMER" columnType="commonj.sdo.Long"/>
- 		<ResultDescriptor columnName="LASTNAME" tableName="CUSTOMER" columnType="commonj.sdo.String"/>
- 		<ResultDescriptor columnName="ADDRESS" tableName="CUSTOMER" columnType="commonj.sdo.String"/>
- 	</Command>
- 	
-  <Table tableName="CUSTOMER">
-    <Column columnName="ID" converterClassName="org.apache.tuscany.das.rdb.test.mappings.StringToLongConverter"/>
-  </Table>
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomersOrdersConfig.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomersOrdersConfig.xml
deleted file mode 100644
index 323c8cb6ba..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/CustomersOrdersConfig.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-    
-    <Command name="all customers" SQL="select * from CUSTOMER" kind="Select"/>
-    
-    <Command name="customer and orders"
-        SQL="select * from CUSTOMER left join ANORDER on CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?"
-        kind="Select">    
-    </Command>
-    
-    <Command name="order by id" SQL="select * from ANORDER where ANORDER.ID = ?"
-        kind="Select">       
-    </Command>
-    
-    <Command name="update customer"
-        SQL="update CUSTOMER set LASTNAME = 'Pavick' where ID = ?"
-        kind="Update">
-    </Command>  
-     
-    <Table tableName="CUSTOMER">
-        <Column columnName="ID" primaryKey="true"/>
-    </Table>
-    
-    <Table tableName="ANORDER">
-        <Column columnName="ID" primaryKey="true"/>
-    </Table>
-    
-    <Relationship name="orders" primaryKeyTable="CUSTOMER"
-        foreignKeyTable="ANORDER" many="true">
-        <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
-    </Relationship>
-    
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/InvalidConfig1.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/InvalidConfig1.xml
deleted file mode 100644
index fa1e353281..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/InvalidConfig1.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-	
-    <Table tableName="ORDERDETAILS">
-        <Column columnName="ORDERID" primaryKey="true"/>
-        <Column columnName="PRODUCTID" primaryKey="true"/>
-    </Table>
-  
-    <Relationship name="ORDERDETAILS" primaryKeyTable="xxx"
-        foreignKeyTable="ORDERDETAILS" many="true">
-        <KeyPair primaryKeyColumn="ID" foreignKeyColumn="ORDERID"/>
-    </Relationship>
-    
-</Config>
\ No newline at end of file
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/InvalidConverter.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/InvalidConverter.xml
deleted file mode 100644
index e6c15ad11f..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/InvalidConverter.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd" dataObjectModel="http:///org.apache.tuscany.das.rdb.test/customer.xsd">
-
-  <Table tableName="CUSTOMER" typeName="Customer">
-    <Column columnName="ID"  primaryKey="true" converterClassName="not.a.valid.class"/>
-  </Table>
-  
-  <Table tableName="ANORDER" typeName="AnOrder">
-  	<Column columnName="CUSTOMER_ID"/>
-    <Column columnName="ID"  primaryKey="true"/>
-  </Table>
-	
-  <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">
-     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
-  </Relationship>
-  
-</Config>
-
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/ManagedBooksConfig.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/ManagedBooksConfig.xml
deleted file mode 100644
index c2b833d2bf..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/ManagedBooksConfig.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-
-    <Command name="select book 1" SQL="select * from BOOK where BOOK_ID = 1" kind="Select"/>
-    <Command name="update book 1" SQL="update BOOK set OCC = ? where BOOK_ID = 1" kind="Update"/>
-
-	<Table tableName="BOOK">
-        <Column columnName="BOOK_ID" primaryKey="true"/>
-	    <Column columnName="OCC" collision="true" managed="true"/>
-    </Table>
-    
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig1.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig1.xml
deleted file mode 100644
index 2555a9ed64..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig1.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
- <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"  databaseSchemaNameSupported="true"> 
-    
-    <Command name="SelectDASTEST1CUSTOMER" SQL="select * from DASTEST1.CUSTOMER" kind="Select"/>
-            
-	<Command name="InsertDASTEST1CUSTOMER" 
-	SQL="INSERT INTO DASTEST1.CUSTOMER VALUES (4, 'JENNYDAS', 'UKDAS')"
-	kind="Insert" />
-		
-	<Command name="DeleteDASTEST1CUSTOMER" 
-	SQL="DELETE FROM DASTEST1.CUSTOMER WHERE ID=4"
-	kind="Delete" />
-                            
-    <Table tableName="CUSTOMER" schemaName="DASTEST1" typeName="DASTEST1_CUSTOMER">
-        <Column columnName="ID" primaryKey="true"/>
-    </Table>
-  
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig12.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig12.xml
deleted file mode 100644
index 63ac8230ce..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig12.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
- <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"  databaseSchemaNameSupported="true"> 
-    
-	<Command name="testArbitraryConverter" SQL="Select * from DASTEST1.EMPLOYEE where ID = 1" kind="Select">
- 		<ResultDescriptor columnName="ID" schemaName="DASTEST1" tableName="EMPLOYEE" columnType="commonj.sdo.IntObject"/>
- 		<ResultDescriptor columnName="LASTNAME" schemaName="DASTEST1" tableName="EMPLOYEE" columnType="commonj.sdo.Date"/>
- 		<ResultDescriptor columnName="ADDRESS" schemaName="DASTEST1" tableName="EMPLOYEE" columnType="commonj.sdo.String"/>
- 	</Command>
- 	
-  <Table tableName="EMPLOYEE" schemaName="DASTEST1">
-	<Column columnName="ID" primaryKey="true"/>
-    <Column columnName="LASTNAME" converterClassName="org.apache.tuscany.das.rdb.test.mappings.SillyDateStringConverter"/>
-  </Table>  
-  
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig13.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig13.xml
deleted file mode 100644
index 6458108a63..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig13.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
- <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"  databaseSchemaNameSupported="true"> 
-            	
-    <Table tableName="ACCOUNT" schemaName="DASTEST2" >
-        <Column columnName="ACCOUNT_ID" primaryKey="true"/>
-    </Table>
-                            
-    <Table tableName="CUSTOMER" schemaName="DASTEST1" typeName="DASTEST1_CUSTOMER">
-        <Column columnName="ID" primaryKey="true"/>
-    </Table>
-                     
-  <Relationship name="accounts" primaryKeyTable="DASTEST1.CUSTOMER" foreignKeyTable="DASTEST2.ACCOUNT" many="true">
-     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
-  </Relationship>
-  
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig14.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig14.xml
deleted file mode 100644
index 4b37a11138..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig14.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
- <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"  databaseSchemaNameSupported="true"> 
-    
-  <Table tableName="ORDERDETAILS" schemaName="DASTEST1">
-  	<Column columnName="PRODUCTID" primaryKey="true"/>
- 	<Column columnName="ORDERID" primaryKey="true"/>
-  </Table>
-  
-  <Table tableName="ORDERDETAILSDESC" schemaName="DASTEST3">
-  	<Column columnName="ID" primaryKey="true"/>
-  </Table>
-     
-  <Relationship name="orderDetailsDesc" primaryKeyTable="DASTEST1.ORDERDETAILS" foreignKeyTable="DASTEST3.ORDERDETAILSDESC" many="true">
-     <KeyPair primaryKeyColumn="ORDERID" foreignKeyColumn="ORDERID"/>
-     <KeyPair primaryKeyColumn="PRODUCTID" foreignKeyColumn="PRODUCTID"/>
-  </Relationship>	
-                
-  
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig2.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig2.xml
deleted file mode 100644
index d055735590..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig2.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
- <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"  databaseSchemaNameSupported="true"> 
-    
-	<Command name="SelectDASTEST2ACCOUNT" 
-	SQL="SELECT * FROM DASTEST1.CUSTOMER LEFT JOIN DASTEST2.ACCOUNT ON DASTEST1.CUSTOMER.ID = DASTEST2.ACCOUNT.CUSTOMER_ID"	
-          kind="Select" />
-				
-	<Command name="InsertDASTEST2ACCOUNT" 
-	SQL="INSERT INTO DASTEST2.ACCOUNT VALUES (50, 2, 304)"
-	kind="Insert" />
-		
-	<Command name="DeleteDASTEST2ACCOUNT" 
-	SQL="DELETE FROM DASTEST2.ACCOUNT WHERE ACCOUNT_ID=50" kind="Delete" />
- 
-     <Table tableName="CUSTOMER" schemaName="DASTEST1" typeName="DASTEST1_CUSTOMER">
-         <Column columnName="ID" primaryKey="true"/>
-     </Table>
-
-    <Table tableName="ACCOUNT" schemaName="DASTEST2" >
-        <Column columnName="ACCOUNT_ID" primaryKey="true"/>
-    </Table>
-                            
-   <Relationship name="accounts" primaryKeyTable="DASTEST1.CUSTOMER" foreignKeyTable="DASTEST2.ACCOUNT" many="true">
-     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
-  </Relationship>
- 
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig3.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig3.xml
deleted file mode 100644
index 06727c6a79..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig3.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
- <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"  databaseSchemaNameSupported="true"> 
-      
- 	<Command name="SelectDASTEST1CITY" 
- 	SQL="SELECT INDX, NAME FROM DASTEST1.CITY"	kind="Select" />
- 				
- 	<Command name="InsertDASTEST1CITY" 
- 	SQL="INSERT INTO DASTEST1.CITY VALUES (3, 'New York')"
- 	kind="Insert" />
- 		
- 	<Command name="DeleteDASTEST1CITY" 
- 	SQL="DELETE FROM DASTEST1.CITY WHERE INDX=3" kind="Delete" />
- 	
- </Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig5.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig5.xml
deleted file mode 100644
index 6915c69576..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig5.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
- <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"  databaseSchemaNameSupported="true"> 
-    
-            
-	<Command name="Select2SchemasWithOneSchemaNotInConfig" 
-	SQL="SELECT DASTEST1.CUSTOMER.ID, DASTEST2.CUSTOMER.ID FROM DASTEST1.CUSTOMER, DASTEST2.CUSTOMER where DASTEST1.CUSTOMER.ID = DASTEST2.CUSTOMER.ID"
-	kind="Select" />
-	
-						                                            
-    <Table tableName="CUSTOMER" schemaName="DASTEST1" typeName="DASTEST1_CUSTOMER">
-        <Column columnName="ID" primaryKey="true"/>
-    </Table>
-  
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig6.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig6.xml
deleted file mode 100644
index fd3d177ad4..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig6.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
- <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"  databaseSchemaNameSupported="true"> 
-    
-
-	<Command name="Select2IDsBothInConfig" 
-	SQL="SELECT DASTEST1.CUSTOMER.ID, DASTEST3.CUSTOMER.ID FROM DASTEST1.CUSTOMER, DASTEST3.CUSTOMER where DASTEST1.CUSTOMER.ID = DASTEST3.CUSTOMER.ID"
-	kind="Select" />
-
-						                
-    <Table tableName="CUSTOMER" schemaName="DASTEST3" typeName="DASTEST3_CUSTOMER">
-        <Column columnName="ID" primaryKey="true"/>
-    </Table>
-                									                
-                            
-    <Table tableName="CUSTOMER" schemaName="DASTEST1" typeName="DASTEST1_CUSTOMER">
-        <Column columnName="ID" primaryKey="true"/>
-    </Table>
-
-  
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig7.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig7.xml
deleted file mode 100644
index eab57c759e..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig7.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
- <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"  databaseSchemaNameSupported="true"> 
-    
-	<Command name="Select2CitiesNoneInConfig"
-	SQL="SELECT DASTEST1.CITY.INDX, DASTEST1.CITY.NAME, DASTEST2.CITY.INDX, DASTEST2.CITY.NAME FROM DASTEST1.CITY, DASTEST2.CITY where DASTEST1.CITY.INDX = DASTEST2.CITY.INDX"
-	kind="Select" />
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig8.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig8.xml
deleted file mode 100644
index 205010c5c6..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig8.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
- <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"  databaseSchemaNameSupported="true"> 
-    
-	<Command name="ResultDescriptorAccountSelect" 
-	SQL="SELECT * FROM DASTEST2.ACCOUNT"	
-	kind="Select" >
-   		<ResultDescriptor columnName="ACCOUNT_ID" tableName="ACCOUNT" schemaName="DASTEST2" columnType="commonj.sdo.IntObject"/>
- 		<ResultDescriptor columnName="CUSTOMER_ID" tableName="ACCOUNT" schemaName="DASTEST2" columnType="commonj.sdo.IntObject"/>
- 		<ResultDescriptor columnName="BALANCE" tableName="ACCOUNT" schemaName="DASTEST2" columnType="commonj.sdo.IntObject"/>
-	</Command>
-
-    <Table tableName="ACCOUNT" schemaName="DASTEST2" >
-        <Column columnName="ACCOUNT_ID" primaryKey="true"/>
-    </Table>
-
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig9.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig9.xml
deleted file mode 100644
index 84a10531aa..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaDasConfig9.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
- <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"  databaseSchemaNameSupported="true"> 
-    
-	<Command name="ImpliedRelationshipSelect" 
-	SQL="SELECT DASTEST2.CUSTOMER.ID, DASTEST2.ACCOUNT.CUSTOMER_ID, DASTEST2.ACCOUNT.ACCOUNT_ID FROM DASTEST2.CUSTOMER, DASTEST2.ACCOUNT where DASTEST2.CUSTOMER.ID = DASTEST2.ACCOUNT.CUSTOMER_ID"
-	kind="Select" />
-						                
-	<Table tableName="ACCOUNT" schemaName="DASTEST2" >
-	<Column columnName="ACCOUNT_ID" primaryKey="true"/>
-	</Table>                            
-  
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaInvalidDasConfig.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaInvalidDasConfig.xml
deleted file mode 100644
index 4658493dbd..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/MultiSchemaInvalidDasConfig.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
- <Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"  databaseSchemaNameSupported="true"> 
-			
-	<!-- table without schema name -->
-    <Table tableName="CUSTORDER"  >
-        <Column columnName="ID" primaryKey="true"/>
-    </Table>
-        	
-    <Table tableName="STUDENT"  schemaName="DASTEST1">
-        <Column columnName="ID" primaryKey="true"/>
-    </Table>
-            	        
-    <Table tableName="ACCOUNT" schemaName="DASTEST2" >
-        <Column columnName="ACCOUNT_ID" primaryKey="true"/>
-    </Table>
-            
-    <Table tableName="CUSTOMER" schemaName="DB2ADMIN" typeName="DB2ADMIN_CUSTOMER">
-        <Column columnName="ID" primaryKey="true"/>
-    </Table>
-                
-    <Table tableName="CUSTOMER" schemaName="DASTEST1" typeName="DASTEST1_CUSTOMER">
-        <Column columnName="ID" primaryKey="true"/>
-    </Table>
-                
-  <!--<Relationship name="customers" primaryKeyTable="DASTEST1.CUSTOMER" foreignKeyTable="DASTEST2.ACCOUNT" many="true">
-     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
-  </Relationship>	-->
-  	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/OneToOneRestrictedConfig.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/OneToOneRestrictedConfig.xml
deleted file mode 100644
index 82956b5b1d..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/OneToOneRestrictedConfig.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-		
-	<Command name="get all companies" SQL="select * from COMPANY" kind = "Select"/>
-	
-	<Command name="get named employee" SQL="select * from EMPLOYEE where NAME= ?" kind = "Select"/>
-  	
-	<Command name="get named employee with company" 
-		SQL="select * from EMPLOYEE left outer join COMPANY on EMPLOYEE.ID = COMPANY.EOTMID where EMPLOYEE.NAME= ?" kind = "Select"/>
-
-	<Command name="get employee by ID" SQL="select * from EMPLOYEE where ID= ?" kind = "Select"/>
-  	
-  	<Command name="get all employees" SQL="select * from EMPLOYEE" kind = "Select"/>
-  	
-    <Command name="get companies with employee of the month" 
-		SQL="select * from COMPANY left outer join EMPLOYEE on COMPANY.EOTMID = EMPLOYEE.ID" kind="Select"/>
-
-
-	<Table tableName="COMPANY">
-    	<Column columnName="ID" primaryKey="true" generated="true"/>
-  	</Table>
-  
-  	<Table tableName="DEPARTMENT">
-   		<Column columnName="ID" primaryKey="true" generated="true"/>
-  	</Table>
-  		
-  	<Table tableName="EMPLOYEE">
-  	  	<Column columnName="ID" primaryKey="true" generated="true"/>
-  	</Table>	
-	  	
-	<Relationship name="company" primaryKeyTable="EMPLOYEE" foreignKeyTable="COMPANY" many="false" keyRestricted="true">
-      	<KeyPair primaryKeyColumn="ID" foreignKeyColumn="EOTMID" />
-  	</Relationship>
-			
-</Config>
-			
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/OrderDetailsAndDescription.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/OrderDetailsAndDescription.xml
deleted file mode 100644
index d5bc8d44a8..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/OrderDetailsAndDescription.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-  
-  <Table tableName="ORDERDETAILS">
-  	<Column columnName="PRODUCTID" primaryKey="true"/>
- 	<Column columnName="ORDERID" primaryKey="true"/>
-  </Table>
-  
-  <Table tableName="ORDERDETAILSDESC">
-  	<Column columnName="ID" primaryKey="true"/>
-  </Table>
-     
-  <Relationship name="orderDetailsDesc" primaryKeyTable="ORDERDETAILS" foreignKeyTable="ORDERDETAILSDESC" many="true">
-     <KeyPair primaryKeyColumn="ORDERID" foreignKeyColumn="ORDERID"/>
-     <KeyPair primaryKeyColumn="PRODUCTID" foreignKeyColumn="PRODUCTID"/>
-  </Relationship>	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/OrdersOrderDetailsConfig.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
deleted file mode 100644
index 2e998ee57e..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-	
-	<Table tableName="ORDERDETAILS">
-        <Column columnName="ORDERID" primaryKey="true"/>
-        <Column columnName="PRODUCTID" primaryKey="true"/>
-    </Table>
- 
- 	<Table tableName="ANORDER">
- 		<Column columnName="ID" primaryKey="true"/>
- 	</Table>
-	   
-    <Relationship name="ORDERDETAILS" primaryKeyTable="ANORDER"
-        foreignKeyTable="ORDERDETAILS" many="true">
-        <KeyPair primaryKeyColumn="ID" foreignKeyColumn="ORDERID"/>
-    </Relationship>
-    
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/PartsConfig.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/PartsConfig.xml
deleted file mode 100644
index b1809079d6..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/PartsConfig.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-  	
-  <Command name="readEngineParts" kind="Select" SQL="SELECT P1.*, P2.*, P3.* FROM PART AS P1 
-  				LEFT JOIN PART AS P2 ON P1.ID = P2.PARENT_ID 
-  					LEFT JOIN PART AS P3 on P2.ID = P3.PARENT_ID WHERE P1.ID = 1">
-  					<ResultDescriptor columnName="ID" columnType="commonj.sdo.IntObject" tableName="PART"/>
-  					<ResultDescriptor columnName="NAME" columnType="commonj.sdo.String" tableName="PART"/>
-  					<ResultDescriptor columnName="QUANTITY" columnType="commonj.sdo.IntObject" tableName="PART"/>
-  					<ResultDescriptor columnName="PARENT_ID" columnType="commonj.sdo.IntObject" tableName="PART"/>
-  					
-  					<ResultDescriptor columnName="ID" columnType="commonj.sdo.IntObject" tableName="PART"/>
-  					<ResultDescriptor columnName="NAME" columnType="commonj.sdo.String" tableName="PART"/>
-  					<ResultDescriptor columnName="QUANTITY" columnType="commonj.sdo.IntObject" tableName="PART"/>
-  					<ResultDescriptor columnName="PARENT_ID" columnType="commonj.sdo.IntObject" tableName="PART"/>
-  					
-  					<ResultDescriptor columnName="ID" columnType="commonj.sdo.IntObject" tableName="PART"/>
-  					<ResultDescriptor columnName="NAME" columnType="commonj.sdo.String" tableName="PART"/>
-  					<ResultDescriptor columnName="QUANTITY" columnType="commonj.sdo.IntObject" tableName="PART"/>
-  					<ResultDescriptor columnName="PARENT_ID" columnType="commonj.sdo.IntObject" tableName="PART"/>
-  					
-  </Command>
-  
-  <Table tableName="PART">
-  	<Column columnName="ID" primaryKey="true"/>
-  </Table>
-  
-  <Relationship name="subparts" primaryKeyTable="PART" foreignKeyTable="PART" many="true">
-     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="PARENT_ID"/>
-  </Relationship>	
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCompanyDepartmentMapping.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
deleted file mode 100644
index bd648cd2ef..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-  
-	<Table tableName="COMPANY">
-		<Column columnName="ID" primaryKey="true" generated="true"/>
-		<Column columnName="NAME"/>
-	</Table>
-	
-	<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">
-      <KeyPair primaryKeyColumn="ID" foreignKeyColumn="COMPANYID"/>
-    </Relationship>
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCompanyMapping.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCompanyMapping.xml
deleted file mode 100644
index b6ca4f9feb..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCompanyMapping.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-	<Table tableName="COMPANY">
-		<Column columnName="ID" primaryKey="true" generated="true"/>
-		<Column columnName="NAME"/>
-	</Table>
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMapping.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMapping.xml
deleted file mode 100644
index a81ca90f8e..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMapping.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-
-	  
-  <Table tableName="CUSTOMER">
-    <Column columnName="ID" primaryKey="true"/>
-    <Column columnName="LASTNAME"/>
-    <Column columnName="ADDRESS"/> 
-  </Table>
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMappingWithCUD.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
deleted file mode 100644
index c3e31c1d98..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-
-  <Table tableName="CUSTOMER">  		 
-	  <create sql="insert into customer values (?, ?, ?)" parameters="ID LASTNAME ADDRESS"/>
-	  <update sql="update customer set lastname = ?, address = ? where ID = ?" parameters="LASTNAME ADDRESS ID"/>
-      <delete sql="delete from customer where ID = ?" parameters="ID"/>
-  </Table>
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
deleted file mode 100644
index 8673559b5d..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-	
-  <Table tableName="CUSTOMER">
-	  <create sql="insert into customer values (?, ?, ?)" parameters="ID LASTNAME ADDRESS"/>
-	  <update sql="update customer set lastname = ? where ID = ?" parameters="LASTNAME ID"/>
-      <delete sql="delete from customer where ID = ?" parameters="ID"/>
-      <Column columnName="ID" primaryKey="true"/>
-      <Column columnName="LASTNAME"/>
-      <Column columnName="ADDRESS"/> 
-  </Table>
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
deleted file mode 100644
index 5d63fb2fab..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-
-  <Table tableName="CUSTOMER">
-	  <create sql="isnert into customer blah values (?, ?, ?)" parameters="ID LASTNAME ADDRESS"/>
-	  <update sql="udpate customer blah set lastname = ?, address = ? where ID = ?" parameters="LASTNAME ADDRESS ID"/>
-      <delete sql="dleete from customer blah where ID = ?" parameters="ID"/>
-     
-    <Column columnName="ID" primaryKey="true"/>
-    <Column columnName="LASTNAME"/>
-    <Column columnName="ADDRESS"/> 
-  </Table>
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerOrderMapping.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerOrderMapping.xml
deleted file mode 100644
index c03d9392ed..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicCustomerOrderMapping.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-	
-  <Table tableName="CUSTOMER">
-  	<Column columnName="ID" primaryKey="true"/>
-  </Table>
-  <Table tableName="ANORDER">
-  	<Column columnName="ID" primaryKey="true"/>
-  	<Column columnName="CUSTOMER_ID"/>
-  </Table>
-	
-  <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">
-     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
-  </Relationship>	
-  
-</Config>
-
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicStaticCustomer.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicStaticCustomer.xml
deleted file mode 100644
index c4b4fe56af..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/basicStaticCustomer.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd" dataObjectModel="http:///org.apache.tuscany.das.rdb.test/customer.xsd">
-  
- <Table tableName="CUSTOMER" typeName="Customer">
-   <Column columnName="ID" primaryKey="true"/>
-    <Column columnName="LASTNAME"/>
-    <Column columnName="ADDRESS"/> 
-  </Table>
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/cityStates.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/cityStates.xml
deleted file mode 100644
index 1908ba4268..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/cityStates.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
- 
-	<Table tableName="STATES">
-		<Column columnName="ID" primaryKey="true"/>
-		<Column columnName="NAME"/>
-	</Table>
-	
-	<Table tableName="CITIES">
-		
-		<Column columnName="ID" primaryKey="true"/>
-		<Column columnName="NAME"/>
-		<Column columnName="STATE_ID"/>
-	
-	</Table>
-	
-  <Relationship name="cities" primaryKeyTable="STATES" foreignKeyTable="CITIES" many="true">
-     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="STATE_ID"/>
-  </Relationship>	
-	
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/company.xsd b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/company.xsd
deleted file mode 100644
index a7118ec808..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/company.xsd
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
- -->
-<xsd:schema targetNamespace="org.apache.tuscany.das.rdb.test/company.xsd" 
-	xmlns:company="org.apache.tuscany.das.rdb.test/company.xsd" 
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">		
-	
-      <xsd:element name="company" type="company:CompanyType"/>
-      
-      <xsd:complexType name="CompanyType">
-        <xsd:sequence>
-          <xsd:element maxOccurs="unbounded" name="departments" type="company:DepartmentType"/>
-        </xsd:sequence>
-        <xsd:attribute name="name" type="xsd:string"/>
-        <xsd:attribute name="employeeOfTheMonth" type="xsd:IDREF" ecore:reference="EmployeeType"/>
-      </xsd:complexType>
-      
-      <xsd:complexType name="DepartmentType">
-        <xsd:sequence>
-          <xsd:element maxOccurs="unbounded" name="employees" type="company:EmployeeType"/>
-        </xsd:sequence>
-        <xsd:attribute name="name" type="xsd:string"/>
-        <xsd:attribute name="location" type="xsd:string"/>
-        <xsd:attribute name="number" type="xsd:int"/>
-      </xsd:complexType>
-      <xsd:complexType name="EmployeeType">
-        <xsd:attribute name="name" type="xsd:string"/>
-        <xsd:attribute name="SN" type="xsd:ID"/>
-        <xsd:attribute name="manager" type="xsd:boolean"/>
-      </xsd:complexType>
-    </xsd:schema>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/companyMapping.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/companyMapping.xml
deleted file mode 100644
index 9388cf8264..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/companyMapping.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-  
-  <Table tableName="COMPANY" typeName="CompanyType">
-    <Column columnName="ID" primaryKey="true"/>
-  </Table>
-  
-  <Table tableName="DEPARTMENT" typeName="DepartmentType">
-    <Column columnName="ID" primaryKey="true"/>
-  </Table>
-
-  <Table tableName="EMPLOYEE" typeName="EmployeeType">
-  	  <Column columnName="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>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/companyMappingWithConverters.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/companyMappingWithConverters.xml
deleted file mode 100644
index 74c6e0619f..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/companyMappingWithConverters.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd" dataObjectModel="org.apache.tuscany.das.rdb.test/company.xsd">
-  
-  <Table tableName="COMPANY" typeName="CompanyType">
-    <Column columnName="ID" primaryKey="true"/>
-  </Table>
-  
-  <Table tableName="DEPARTMENT" typeName="DepartmentType">
-    <Column columnName="ID" primaryKey="true"/>
-    <Column columnName="DEPNUMBER" propertyName="NUMBER" converterClassName="org.apache.tuscany.das.rdb.test.mappings.StringToIntegerConverter"/>
-  </Table>
-
-  <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">
-     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="COMPANYID"/>
-  </Relationship>	
-
-  <Relationship name="employees" primaryKeyTable="DEPARTMENT" foreignKeyTable="EMPLOYEE" many="true">
-     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="DEPARTMENTID"/>
-  </Relationship>	
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/companyMappingWithResultDescriptor.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/companyMappingWithResultDescriptor.xml
deleted file mode 100644
index 419f27eca3..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/companyMappingWithResultDescriptor.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-  <Command name="testFullOuterJoinRelationship" SQL="select * from DEPARTMENT left join EMPLOYEE on DEPARTMENT.ID = EMPLOYEE.DEPARTMENTID UNION select * from DEPARTMENT right join EMPLOYEE on DEPARTMENT.ID = EMPLOYEE.DEPARTMENTID WHERE  employee.DepartmentID IS NULL" kind="Select">
- 		<ResultDescriptor columnName="ID" tableName="DEPARTMENT" columnType="commonj.sdo.IntObject"/>
- 		<ResultDescriptor columnName="NAME" tableName="DEPARTMENT" columnType="commonj.sdo.String"/>
- 		<ResultDescriptor columnName="LOCATION" tableName="DEPARTMENT" columnType="commonj.sdo.String"/>
- 		<ResultDescriptor columnName="DEPNUMBER" tableName="DEPARTMENT" columnType="commonj.sdo.String"/>
- 		<ResultDescriptor columnName="COMPANYID" tableName="DEPARTMENT" columnType="commonj.sdo.IntObject"/>
-  		
- 		<ResultDescriptor columnName="ID" tableName="EMPLOYEE" columnType="commonj.sdo.IntObject"/>
- 		<ResultDescriptor columnName="NAME" tableName="EMPLOYEE" columnType="commonj.sdo.String"/>
- 		<ResultDescriptor columnName="SN" tableName="EMPLOYEE" columnType="commonj.sdo.String"/>
- 		<ResultDescriptor columnName="MANAGER" tableName="EMPLOYEE" columnType="commonj.sdo.IntObject"/>
- 		<ResultDescriptor columnName="DEPARTMENTID" tableName="EMPLOYEE" columnType="commonj.sdo.IntObject"/>
-  </Command>
-
-  <Command name="testEmployeesFromDepartment" SQL="select * from DEPARTMENT left join EMPLOYEE on DEPARTMENT.ID = EMPLOYEE.DEPARTMENTID where DEPARTMENT.NAME = ?" kind="Select"/>
-      
-  <Table tableName="COMPANY">
-    <Column columnName="ID" primaryKey="true"/>
-  </Table>
-  
-  <Table tableName="DEPARTMENT">
-    <Column columnName="ID" primaryKey="true"/>
-  </Table>
-
-  <Table tableName="EMPLOYEE">
-  	  <Column columnName="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>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/customer.xsd b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/customer.xsd
deleted file mode 100644
index e5482ae3a0..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/customer.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
- -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:this="http:///org.apache.tuscany.das.rdb.test/customer.xsd" targetNamespace="http:///org.apache.tuscany.das.rdb.test/customer.xsd">
-	
-	  <xsd:complexType name="Customer">
-       <xsd:sequence>
-          <xsd:element name="ID" nillable="false" type="xsd:int"/>
-          <xsd:element name="lastName" type="xsd:string"/>
-          <xsd:element name="address" type="xsd:string"/>  
-          <xsd:element maxOccurs="unbounded" name="orders" type="this:AnOrder"/> 
-       </xsd:sequence>
-  	 </xsd:complexType>
-   
-   
-   <!-- An Order -->
-   	<xsd:complexType name="AnOrder">
-   		<xsd:sequence>
-   			<xsd:element name="ID" nillable="false" type="xsd:int"/>
-   			<xsd:element name="Product" type="xsd:string"/>
-   			<xsd:element name="Quantity" type="xsd:int"/>
-   			<xsd:element name="Customer_ID" type="xsd:int"/>
-   		</xsd:sequence>
-   	</xsd:complexType>
-   	
-   
-</xsd:schema>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/customerMapping.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/customerMapping.xml
deleted file mode 100644
index 3de367e0c6..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/customerMapping.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-
-  <Table tableName="CUSTOMER" typeName="Customer">
-    <Column columnName="ID" propertyName="id" primaryKey="true"/>
-    <Column columnName="LASTNAME" propertyName="lastname"/>
-    <Column columnName="ADDRESS" propertyName="address"/>
-  </Table>
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/customerOrderRelationshipMapping.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/customerOrderRelationshipMapping.xml
deleted file mode 100644
index ed931e03cd..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/customerOrderRelationshipMapping.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-  
-  <Table tableName="CUSTOMER">
-  	<Column columnName="ID" primaryKey="true"/>
-  </Table>
-  <Table tableName="ANORDER">
-  	<Column columnName="ID" primaryKey="true"/>
-  </Table>
-  
-  <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">
-     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
-  </Relationship>	
-	
-</Config>
-
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/passiveConnection.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/passiveConnection.xml
deleted file mode 100644
index 6a23200d49..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/passiveConnection.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-
-	<ConnectionInfo managedtx="false"/>
-	
-	<Command name="get a customer" SQL="Select * from CUSTOMER where ID = 1" kind="select"/>
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/staticCustomer.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/staticCustomer.xml
deleted file mode 100644
index 705e4b34a9..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/staticCustomer.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd" dataObjectModel="http:///org.apache.tuscany.das.rdb.test/customer.xsd">
-  
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/staticCustomerOrder.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/staticCustomerOrder.xml
deleted file mode 100644
index afbe2a8cfb..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/staticCustomerOrder.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd" dataObjectModel="http:///org.apache.tuscany.das.rdb.test/customer.xsd">
-
-  <Command name="Customer and Orders" SQL="SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?" kind="Select"/>
-		
-  <Table tableName="CUSTOMER" typeName="Customer">
-  	<Column columnName="ID" primaryKey="true"/>
-  </Table>
-  <Table tableName="ANORDER" typeName="AnOrder">
-  	<Column columnName="ID" primaryKey="true"/>
-  	<Column columnName="CUSTOMER_ID"/>
-  </Table>
-	
-  <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">
-     <KeyPair primaryKeyColumn="ID" foreignKeyColumn="CUSTOMER_ID"/>
-  </Relationship>	
-  
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/staticInvalid.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/staticInvalid.xml
deleted file mode 100644
index 965c99717f..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/staticInvalid.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd" dataObjectModel="invalidURI">
-  
-	
-</Config>
diff --git a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/storedProcTest.xml b/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/storedProcTest.xml
deleted file mode 100644
index beb1ca34ac..0000000000
--- a/tags/java/das/1.0-incubating-beta1-rc4/rdb/src/test/resources/storedProcTest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  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.
- -->
-
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-
-	<Command name="getNamedCustomers" SQL="{call GETNAMEDCUSTOMERS(?,?)}" kind="procedure">		
-		<Parameter direction="OUT" index="2" columnType="commonj.sdo.IntObject"/>
-	</Command>
-
-</Config>
-- 
cgit v1.2.3