Author: kwilliams
Date: Mon Nov 6 14:02:07 2006
New Revision: 471891
URL: http://svn.apache.org/viewvc?view=rev&rev=471891
Log:
Fixes for TUSCANY-899: DAS Config model should declare a global element named
*Config*
Modified:
incubator/tuscany/java/das/rdb/src/main/resources/config.xsd
incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml
incubator/tuscany/java/das/rdb/src/test/resources/BooksConfigWithAlias.xml
incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml
incubator/tuscany/java/das/rdb/src/test/resources/CompanyEmployeeConfig.xml
incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter.xml
incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter2.xml
incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml
incubator/tuscany/java/das/rdb/src/test/resources/InvalidConfig1.xml
incubator/tuscany/java/das/rdb/src/test/resources/InvalidConverter.xml
incubator/tuscany/java/das/rdb/src/test/resources/ManagedBooksConfig.xml
incubator/tuscany/java/das/rdb/src/test/resources/OneToOneRestrictedConfig.xml
incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
incubator/tuscany/java/das/rdb/src/test/resources/PartsConfig.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml
incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml
incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml
incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/passiveConnection.xml
incubator/tuscany/java/das/rdb/src/test/resources/staticCustomer.xml
incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml
incubator/tuscany/java/das/rdb/src/test/resources/staticInvalid.xml
incubator/tuscany/java/das/rdb/src/test/resources/storedProcTest.xml
Modified: incubator/tuscany/java/das/rdb/src/main/resources/config.xsd
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/resources/config.xsd?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/resources/config.xsd (original)
+++ incubator/tuscany/java/das/rdb/src/main/resources/config.xsd Mon Nov 6
14:02:07 2006
@@ -20,7 +20,10 @@
<xsd:schema
xmlns:config="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- targetNamespace="http:///org.apache.tuscany.das.rdb/config.xsd";>
+ targetNamespace="http:///org.apache.tuscany.das.rdb/config.xsd";
+ elementFormDefault="qualified">
+
+ <xsd:element name="Config" type="config:Config"/>
<xsd:complexType name="Config">
<xsd:sequence>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
Mon Nov 6 14:02:07 2006
@@ -17,8 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Table tableName="CUSTOMER" typeName="Customer">
<Column columnName="ID" propertyName="ID" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml Mon Nov
6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config 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"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/BooksConfigWithAlias.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/BooksConfigWithAlias.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/BooksConfigWithAlias.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/BooksConfigWithAlias.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Command name="get all books" SQL="SELECT * FROM BOOK" kind="Select"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml Mon Nov
6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Command name="all companies" SQL="select * from COMPANY" kind="Select"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/CompanyEmployeeConfig.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CompanyEmployeeConfig.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CompanyEmployeeConfig.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CompanyEmployeeConfig.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Command name="get all companies" SQL="select * from COMPANY" kind =
"Select"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter.xml
Mon Nov 6 14:02:07 2006
@@ -17,8 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
+<Config 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"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter2.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter2.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter2.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter2.xml
Mon Nov 6 14:02:07 2006
@@ -17,8 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Command name="getFirstCustomer" SQL="Select * from CUSTOMER where ID = 1"
kind="Select"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config 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"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Command name="all customers" SQL="select * from CUSTOMER" kind="Select"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/InvalidConfig1.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/InvalidConfig1.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/InvalidConfig1.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/InvalidConfig1.xml Mon
Nov 6 14:02:07 2006
@@ -17,14 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config 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"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/InvalidConverter.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/InvalidConverter.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/InvalidConverter.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/InvalidConverter.xml Mon
Nov 6 14:02:07 2006
@@ -17,9 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-dataObjectModel="http:///org.apache.tuscany.das.rdb.test/customer.xsd";>
+<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"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/ManagedBooksConfig.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/ManagedBooksConfig.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/ManagedBooksConfig.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/ManagedBooksConfig.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config 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"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/OneToOneRestrictedConfig.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/OneToOneRestrictedConfig.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/OneToOneRestrictedConfig.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/OneToOneRestrictedConfig.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Command name="get all companies" SQL="select * from COMPANY" kind =
"Select"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Table tableName="ORDERDETAILS">
<Column columnName="ORDERID" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/PartsConfig.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/PartsConfig.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/PartsConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/PartsConfig.xml Mon Nov
6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config 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
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Table tableName="COMPANY">
<Column columnName="ID" primaryKey="true" generated="true"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Table tableName="COMPANY">
<Column columnName="ID" primaryKey="true" generated="true"/>
<Column columnName="NAME"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml
Mon Nov 6 14:02:07 2006
@@ -17,9 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
+
+
<Table tableName="CUSTOMER">
<Column columnName="ID" primaryKey="true"/>
<Column columnName="LASTNAME"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Table tableName="CUSTOMER">
<create sql="insert into customer values (?, ?, ?)" parameters="ID
LASTNAME ADDRESS"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
Mon Nov 6 14:02:07 2006
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
+<Config 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"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Table tableName="CUSTOMER">
<create sql="isnert into customer blah values (?, ?, ?)"
parameters="ID LASTNAME ADDRESS"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Table tableName="CUSTOMER">
<Column columnName="ID" primaryKey="true"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml
Mon Nov 6 14:02:07 2006
@@ -17,9 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-dataObjectModel="http:///org.apache.tuscany.das.rdb.test/customer.xsd";>
+<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"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml Mon Nov 6
14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Table tableName="STATES">
<Column columnName="ID" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml Mon
Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Table tableName="COMPANY" typeName="CompanyType">
<Column columnName="ID" primaryKey="true"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/companyMappingWithConverters.xml
Mon Nov 6 14:02:07 2006
@@ -17,9 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-dataObjectModel="org.apache.tuscany.das.rdb.test/company.xsd">
+<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"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml Mon
Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Table tableName="CUSTOMER" typeName="Customer">
<Column columnName="ID" propertyName="id" primaryKey="true"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
Mon Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<Table tableName="CUSTOMER">
<Column columnName="ID" primaryKey="true"/>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/passiveConnection.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/passiveConnection.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/passiveConnection.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/passiveConnection.xml Mon
Nov 6 14:02:07 2006
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";>
<ConnectionInfo managedtx="false"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/staticCustomer.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/staticCustomer.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/staticCustomer.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/staticCustomer.xml Mon
Nov 6 14:02:07 2006
@@ -17,9 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-dataObjectModel="http:///org.apache.tuscany.das.rdb.test/customer.xsd";>
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";
dataObjectModel="http:///org.apache.tuscany.das.rdb.test/customer.xsd";>
</Config>
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/staticCustomerOrder.xml
Mon Nov 6 14:02:07 2006
@@ -17,9 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-dataObjectModel="http:///org.apache.tuscany.das.rdb.test/customer.xsd";>
+<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"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/staticInvalid.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/staticInvalid.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/staticInvalid.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/staticInvalid.xml Mon Nov
6 14:02:07 2006
@@ -17,9 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-dataObjectModel="invalidURI">
+<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd";
dataObjectModel="invalidURI">
</Config>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/storedProcTest.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/storedProcTest.xml?view=diff&rev=471891&r1=471890&r2=471891
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/storedProcTest.xml
(original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/storedProcTest.xml Mon
Nov 6 14:02:07 2006
@@ -18,7 +18,8 @@
under the License.
-->
-<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
